Tue Feb 14 17:45:41 UTC 2006

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='${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/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/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/kdeartwork/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/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/kdeartwork/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/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/kdeartwork/debian/patches/common/07_disable-visibility.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/07_disable-visibility.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/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/kdeartwork/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/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/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/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/kdeartwork/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/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/kdeartwork/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdeartwork/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeartwork/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
+
+clean::
+	rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png
+	rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png


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

Modified: people/jriddell/KDE/3.5/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/KUBUNTU-DEBIAN-CHANGES	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/KUBUNTU-DEBIAN-CHANGES	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1,2 +1,4 @@
 debian/edit-as-root.desktop and binary-install/konqueror::
 debuild-dep s/dbus-qt-1-dev/libdbus-qt-1-dev/  add x11proto-kb-dev, libxkbfile-dev, xmkmf, bdftopcf
+Do not install System.desktop or Home.desktop kdesktop icons
+don't build-dep on xlibs-static-pic

Modified: people/jriddell/KDE/3.5/kdebase/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/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/kdebase/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/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/kdebase/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1,3 +1,178 @@
+kdebase (4:3.5.1-0ubuntu5) dapper; urgency=low
+
+  * Fix install path for Home.desktop and System.desktop
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  9 Feb 2006 16:22:53 +0000
+
+kdebase (4:3.5.1-0ubuntu4) dapper; urgency=low
+
+  * Do install System.desktop or Home.desktop kdesktop icons and add
+    kubuntu_46_no_desktop_files.diff to hide them 
+    (makes it easier to turn them back on)
+  * Add kubuntu_47_autostart_kdeonly.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  9 Feb 2006 13:26:36 +0000
+
+kdebase (4:3.5.1-0ubuntu3) dapper; urgency=low
+
+  * Add kubuntu_45_kxkb_xx_XX_layouts.diff fix support for 
+    xx_XX layouts in kxkb
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  3 Feb 2006 11:41:13 +0000
+
+kdebase (4:3.5.1-0ubuntu2) dapper; urgency=low
+
+  * Added a desktop file for kdcop and added a line to
+    debian/kdebase-bin.install to install it in the system
+    (Closes : Malone #30112)
+  * Patch from RaphaÃ«l Pinson <raphink at raphink.net>
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 31 Jan 2006 02:14:55 +0100
+
+kdebase (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Add kubuntu_44_systray_show.diff, advised by upstream to 
+    ensure systray apps dock properly
+  * Lower dbus build-dep for backporting
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
+
+kdebase (4:3.5.0-0ubuntu16) dapper; urgency=low
+
+  * Add kubuntu_43_kdesu_terminal_output.diff to make kdesu
+    have terminal output
+  * Remove xlibs-static-pic from build-deps
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2006 15:13:49 +0000
+
+kdebase (4:3.5.0-0ubuntu15) dapper; urgency=low
+
+  * kcontrol replaces old kdebase-bin for kcm_kdnssd.desktop
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Jan 2006 15:20:42 +0000
+
+kdebase (4:3.5.0-0ubuntu14) dapper; urgency=low
+
+  * Remove /usr/share/apps/konsole/fonts/fonts.dir from konsole.install
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 20:28:48 +0000
+
+kdebase (4:3.5.0-0ubuntu13) dapper; urgency=low
+
+  * Tighten build-dep to kdelibs 4:3.5.0-0ubuntu9
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 18:22:00 +0000
+
+kdebase (4:3.5.0-0ubuntu12) dapper; urgency=low
+
+  * Tighten build-dep to kdelibs 4:3.5.0-0ubuntu8
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 15:34:03 +0000
+
+kdebase (4:3.5.0-0ubuntu11) dapper; urgency=low
+
+  * Add kubuntu_42_konsole_root_shell.diff for a working root shell via sudo
+    (Closes: ubuntu bugzilla #12343)
+
+ -- Stephan Hermann <sh at sourcecode.de>  Wed, 11 Jan 2006 18:42:39 +0100
+
+kdebase (4:3.5.0-0ubuntu10) dapper; urgency=low
+
+  * Remove kubuntu_41_kcmdnssd_friendly_name.diff, which shouldn't
+    have been there
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 11 Jan 2006 14:48:28 +0000
+
+kdebase (4:3.5.0-0ubuntu9) dapper; urgency=low
+
+  * Add kubuntu_40_xmkmf.diff for new imake/xmkmf path
+  * Install kcm_kdnssd in kcontrol
+  * Add kubuntu_41_kcmdnssd_name_icon.diff to make kcontrol module
+    more recognisable
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 10 Jan 2006 23:51:15 +0000
+
+kdebase (4:3.5.0-0ubuntu8) dapper; urgency=low
+
+  * Change xmkmf build-dep to imake
+  * Remove build-dep on xutils (was for imake)
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 10 Jan 2006 22:16:38 +0000
+
+kdebase (4:3.5.0-0ubuntu7) dapper; urgency=low
+
+  * Update 10_kdmrc_defaults_kubuntu.diff changing Debian to Kubuntu
+    and rename to kubuntu_10_kdmrc_defaults_kubuntu.diff
+  * Remove kdm dependency on kubuntu-default-settings, setting KDM 
+    theme now scripted in kubuntu-default-settings
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 10 Jan 2006 00:26:23 +0000
+
+kdebase (4:3.5.0-0ubuntu6) dapper; urgency=low
+
+  * Add kubuntu_39_konqueror_focus_location_bar.diff fix 
+    http://bugs.kde.org/117031
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  6 Jan 2006 00:49:25 +0000
+
+kdebase (4:3.5.0-0ubuntu5) dapper; urgency=low
+
+  * rebuild against latest dbus, updated dependencies
+
+ -- Michael Vogt <michael.vogt at ubuntu.com>  Tue, 20 Dec 2005 22:05:42 +0100
+
+kdebase (4:3.5.0-0ubuntu4) dapper; urgency=low
+
+  * Remove printmgr.desktop from install target
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 17 Dec 2005 22:29:48 +0000
+
+kdebase (4:3.5.0-0ubuntu3) dapper; urgency=low
+
+  * Add kubuntu_38_ksysguard_pot.diff fix ksysguard .pot generation
+  * Edit kde.mk to allow for fail on gettext
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 17 Dec 2005 18:21:40 +0000
+
+kdebase (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Do not install System.desktop or Home.desktop kdesktop icons
+  * Add kubuntu_34_no_duplicate_desktop_file.diff for 
+    duplicate printer .desktop files
+  * Add kubuntu_35_hide_klipper_menu_entry.diff autostarts by default
+  * Add kubuntu_36_hide_kjobviewer_menu_entry.diff starts when printing
+  * Add kubuntu_37_hide_kdeprintfax_menu_entry.diff kdeprintfax 
+    is available when printing with Print to Fax
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 14 Dec 2005 21:51:29 +0000
+
+kdebase (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:27:26 +0000
+
+kdebase (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+
+  * Tighten build-dep to pick up new kdelibs4-dev with libattr1-dev
+    and libacl1-dev
+  * Remove gettext-kde and kdesdk-scripts from build-dep, now in kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 26 Nov 2005 00:22:58 +0000
+
+kdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Tighten kdelibs-dev build-dep for libstdc++ transition
+  * kdm depends on xauth not xbase-clients
+  * Update 18_default_fonts.diff
+  * Generate .pot files
+  * Remove kubuntu_26_startkde.diff, no need to start ivman in 3.5
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 17:46:39 +0000
+
 kdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low
 
   * New upstream pre-release
@@ -95,7 +270,7 @@
     This had resulted in kcontrol breaking and other assorted issues.
     (Closes: #325592)
 
-  +++ Changes by Adeodato SimÃ³:
+  +++ Changes by Adeodato SimÂÃ³:
 
   * Build with g++-3.4 on arm, m68k and hppa; kdebase also makes gcc 4.0 ICE
     as described in #323133.
@@ -355,7 +530,7 @@
       obvious corruption. (Closes: #289468)
 
   * Converted packaging to CDBS (initial version by Daniel Schepler, further
-    changes by Christopher Martin and Adeodato SimÃ³).
+    changes by Christopher Martin and Adeodato SimÂÃ³).
 
   +++ Changes by Christopher Martin:
 
@@ -398,7 +573,7 @@
   * Add manpages for kdialog (thanks to Bastian Kleineidam for tracking it
     down) and my own manpage for kdesu/kdesud. (Closes: #239945)
 
-  +++ Changes by Adeodato SimÃ³:
+  +++ Changes by Adeodato SimÂÃ³:
 
   * After clearing up some issues with multiple de.po files being sent for
     inclusion, include an updated German po-debconf translation sent by
@@ -431,7 +606,7 @@
   * Fix debian/copyright to refer to License rather than to Copyright
     when discussing KDE's licenses.
 
-  +++ Changes by Adeodato SimÃ³:
+  +++ Changes by Adeodato SimÂÃ³:
 
   * debian/control:
     - make kdebase-dev depend on kwin for the libkdecorations.so ->
@@ -680,7 +855,7 @@
 
 kdebase (4:3.3.1-4) unstable; urgency=high
 
-  +++ Changes by Adeodato SimÃ³:
+  +++ Changes by Adeodato SimÂÃ³:
 
   * High urgency upload to fix security vulnerability in sarge.
 
@@ -699,7 +874,7 @@
   * Include patch to fix CAN-2004-1171 ("plain text password exposure").
     Closes half of #285126.
 
- -- Adeodato SimÃ³ <asp16 at alu.ua.es>  Fri, 10 Dec 2004 22:28:25 +0100
+ -- Adeodato SimÂÃ³ <asp16 at alu.ua.es>  Fri, 10 Dec 2004 22:28:25 +0100
 
 kdebase (4:3.3.1-2) unstable; urgency=low
 

Modified: people/jriddell/KDE/3.5/kdebase/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -3,7 +3,7 @@
 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: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5-rc1), libdbus-qt-1-dev, libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, xutils, xlibs-static-pic, libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-dev, sharutils, texinfo, x11proto-kb-dev, libxkbfile-dev, xmkmf, bdftopcf
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.1), libdbus-qt-1-dev (>= 0.36), libldap2-dev, libhal-dev, libhal-storage-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, libxss-dev, libxxf86misc-dev, libxau-dev, libxdmcp-dev, libxcomposite-dev, libxdamage-dev, sharutils, texinfo, x11proto-kb-dev, libxkbfile-dev, imake, bdftopcf
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
 Build-Conflicts: nvidia-glx
 Standards-Version: 3.6.2
@@ -74,7 +74,7 @@
 Recommends: udev | hotplug
 Suggests: khelpcenter
 Conflicts: kdebase-libs (<< 4:3.0.0)
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.5.0), kdebase-data (<< 4:3.5.0), kdebase-kio-plugins (<< 4:3.5.0)
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.5.0), kdebase-data (<< 4:3.5.0), kdebase-kio-plugins (<< 4:3.5.0), kdebase-bin (<< 4:3.5.0)
 Description: control center for KDE
  The KDE Control Center provides you with a centralized and convenient
  way to configure all of your KDE settings.
@@ -223,7 +223,7 @@
 Package: kdm
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Version2}.90), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
+Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Version2}.90), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xauth
 Recommends: logrotate
 Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version})
 Provides: x-display-manager

Modified: people/jriddell/KDE/3.5/kdebase/debian/kcontrol.install
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/kcontrol.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/kcontrol.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1036,3 +1036,7 @@
 debian/icons/kcontrol-16.xpm		/usr/share/pixmaps
 debian/icons/kinfocenter.xpm		/usr/share/pixmaps
 debian/icons/kinfocenter-16.xpm		/usr/share/pixmaps
+
+debian/tmp/usr/lib/kde3/kcm_kdnssd.so
+debian/tmp/usr/lib/kde3/kcm_kdnssd.la
+debian/tmp/usr/share/applications/kde/kcm_kdnssd.desktop

Modified: people/jriddell/KDE/3.5/kdebase/debian/kdebase-bin.install
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/kdebase-bin.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/kdebase-bin.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -37,8 +37,8 @@
 debian/tmp/usr/lib/kde3/kgreet_winbind.so
 debian/tmp/usr/lib/kde3/khotkeys.la
 debian/tmp/usr/lib/kde3/khotkeys.so
-debian/tmp/usr/lib/kde3/khotkeys_shared_arts.la
-debian/tmp/usr/lib/kde3/khotkeys_shared_arts.so
+debian/tmp/usr/lib/kde3/khotkeys_arts.la
+debian/tmp/usr/lib/kde3/khotkeys_arts.so
 debian/tmp/usr/lib/kde3/kxkb.la
 debian/tmp/usr/lib/kde3/kxkb.so
 debian/tmp/usr/lib/libkdeinit_kcminit.so
@@ -94,3 +94,4 @@
 debian/tmp/usr/share/icons/hicolor/scalable/apps/knetattach.svgz
 debian/tmp/usr/share/services/kded/khotkeys.desktop
 debian/tmp/usr/share/services/kxkb.desktop
+debian/kdcop.desktop /usr/share/applications/kde

Modified: people/jriddell/KDE/3.5/kdebase/debian/kdeprint.install
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/kdeprint.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/kdeprint.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -16,7 +16,6 @@
 debian/tmp/usr/share/applications/kde/kdeprintfax.desktop
 debian/tmp/usr/share/applications/kde/kjobviewer.desktop
 debian/tmp/usr/share/applications/kde/printers.desktop
-debian/tmp/usr/share/applnk/Settingsmenu/printmgr.desktop
 debian/tmp/usr/share/apps/kdeprintfax/anytops
 debian/tmp/usr/share/apps/kdeprintfax/faxfilters
 debian/tmp/usr/share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png

Modified: people/jriddell/KDE/3.5/kdebase/debian/kdesktop.install
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/kdesktop.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/kdesktop.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -8,12 +8,12 @@
 debian/tmp/usr/lib/kde3/kdesktop.la
 debian/tmp/usr/lib/kde3/kdesktop.so
 debian/tmp/usr/lib/libkdeinit_kdesktop.so
-debian/tmp/usr/share/apps/kdesktop/DesktopLinks/Home.desktop
-debian/tmp/usr/share/apps/kdesktop/DesktopLinks/System.desktop
 debian/tmp/usr/share/apps/kdesktop/directory.autostart
 debian/tmp/usr/share/apps/kdesktop/directory.desktop
 debian/tmp/usr/share/apps/kdesktop/directory.templates
 debian/tmp/usr/share/apps/kdesktop/directory.trash
+debian/tmp/usr/share/apps/kdesktop/DesktopLinks/System.desktop
+debian/tmp/usr/share/apps/kdesktop/DesktopLinks/Home.desktop
 debian/tmp/usr/share/apps/kdesktop/patterns/fish.desktop
 debian/tmp/usr/share/apps/kdesktop/patterns/fish.png
 debian/tmp/usr/share/apps/kdesktop/patterns/flowers.desktop

Modified: people/jriddell/KDE/3.5/kdebase/debian/konsole.install
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/konsole.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/konsole.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -22,7 +22,6 @@
 debian/tmp/usr/share/apps/konsole/Example.Schema
 debian/tmp/usr/share/apps/konsole/fonts/9x15.pcf.gz
 debian/tmp/usr/share/apps/konsole/fonts/console8x16.pcf.gz
-debian/tmp/usr/share/apps/konsole/fonts/fonts.dir
 debian/tmp/usr/share/apps/konsole/GreenOnBlack.schema
 debian/tmp/usr/share/apps/konsole/GreenTint_MC.schema
 debian/tmp/usr/share/apps/konsole/GreenTint.schema

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/18_default_fonts.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/18_default_fonts.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -9,15 +9,6 @@
    excludeFrom->setValue(8.0);
    excludeTo->setValue(15.0);
    useSubPixel->setChecked(false);
-@@ -656,7 +656,7 @@
-   for ( int i = 0; i < (int) fontUseList.count(); i++ )
-     fontUseList.at( i )->setDefault();
- 
--  useAA = false;
-+  useAA = true;
-   cbAA->setChecked(useAA);
-   aaSettings->defaults();
-   emit changed(true);
 --- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml
 +++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
 @@ -113,12 +113,12 @@

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/22_default_backgrounds.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/22_default_backgrounds.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/22_default_backgrounds.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -28,7 +28,7 @@
  			kdesktopconf->writeEntry("WallpaperMode", "Scaled");
  			//here we change the kdesktop font color to white as it fits better
  			// to the KDE34png.png gray background
-@@ -697,7 +697,7 @@
+@@ -689,7 +689,7 @@
  	st_UserWallpaper.MultiWallpaperMode = kdesktopconf->readEntry("MultiWallpaperMode", "NoMulti");
  	st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "Scaled");
  	st_UserWallpaper.Wallpaper = kdesktopconf->readPathEntry("Wallpaper", "NoWallpaper");

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  InitialPreference=8
  X-DCOP-ServiceType=Multi
  Categories=Qt;KDE;TextEditor;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  GenericName[zu]=Amafayela Omuntu siqu
  Categories=Qt;KDE;Core;
  OnlyShowIn=KDE;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  X-KDE-StartupNotify=true
  OnlyShowIn=KDE;
  Categories=Qt;KDE;Settings;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  X-DCOP-ServiceType=Multi
  Categories=Qt;KDE;Settings;
  OnlyShowIn=KDE;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  Name[zh_CN]=èœå•æ›´æ–°å·¥å…·
  X-DCOP-ServiceType=Multi
  Categories=Qt;KDE;Settings;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_12_hide_krandrtray_menu_entry.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_12_hide_krandrtray_menu_entry.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_12_hide_krandrtray_menu_entry.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  Type=Application
  OnlyShowIn=KDE;
  Categories=Qt;KDE;System;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  Name[zh_CN]=ç»ˆç«¯ç¨‹åº - è¶…çº§ç”¨æˆ·æ¨¡å¼
  X-KDE-AuthorizeAction=shell_access
  Categories=Qt;KDE;System;TerminalEmulator;X-KDE-More;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  
  
  Categories=Qt;KDE;System;X-KDE-More;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  Terminal=false
  InitialPreference=1
  Categories=Qt;KDE;Utility;X-KDE-More;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  X-KDE-StartupNotify=false
  X-DCOP-ServiceType=Unique
  Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_17_hide_desktop_trash.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_17_hide_desktop_trash.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_17_hide_desktop_trash.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,7 +4,7 @@
  Encoding=UTF-8
  Icon=trashcan_full
  EmptyIcon=trashcan_empty
-+Hidden=true
++NoDisplay=true
  Name=Trash
  Name[af]=Gemors
  Name[ar]=Ø³Ù„Ø© Ø§Ù„Ù†ÙØ§ÙŠØ§Øª

Modified: people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_25_kcontrol_only_in_kde.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_25_kcontrol_only_in_kde.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/patches/kubuntu_25_kcontrol_only_in_kde.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -4,4 +4,4 @@
  X-DCOP-ServiceType=Unique
  Categories=Qt;KDE;Core;
  OnlyShowIn=KDE;
-+Hidden=true
++NoDisplay=true

Modified: people/jriddell/KDE/3.5/kdebase/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdebase/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebase/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -28,19 +28,6 @@
 DEB_DH_MAKESHLIBS_ARGS_kwin		:= -V'kwin (>= 4:3.5-rc1-1)'
 DEB_DH_MAKESHLIBS_ARGS_libkonq4		:= -V'libkonq4 (>= 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.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 
@@ -63,6 +50,8 @@
 
 binary-install/konqueror::
 	install -p -D -m644 debian/edit-as-root.desktop debian/konqueror/usr/share/apps/konqueror/servicemenus/edit-as-root.desktop
+	cp debian/konqueror/usr/share/apps/konqueror/konqueror.rc debian/konqueror/usr/share/apps/konqueror/konqueror-orig.rc
+	install -p -D -m644 debian/konqueror.rc debian/konqueror/usr/share/apps/konqueror/konqueror.rc
 
 binary-install/kcontrol::
 	install -p -D -m755 kcontrol/input/consoleUserPerms debian/kcontrol/etc/hotplug/usb/logitechmouse

Added: people/jriddell/KDE/3.5/kdebindings/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/cdbs/kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,88 @@
+# -*- 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-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
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif

Added: people/jriddell/KDE/3.5/kdebindings/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,565 @@
+kdebindings (4:3.5.1-0ubuntu2) dapper; urgency=low
+
+  * Remove gtk dependency
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  2 Feb 2006 22:50:05 +0000
+
+kdebindings (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
+
+kdebindings (4:3.5.0-0ubuntu4) dapper; urgency=low
+
+  * Fix kdelibs build-dep version to 3.5.0
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 14 Dec 2005 14:28:05 +0000
+
+kdebindings (4:3.5.0-0ubuntu3) dapper; urgency=low
+
+  * Add debian/patches/kubuntu_01_dcopjava_paths.diff and add back
+    dcopjava packages
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 13 Dec 2005 18:35:38 +0000
+
+kdebindings (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Fix 016_QPointArray_begin_end_jlong.diff for 64-bit
+    architectures
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 13 Dec 2005 13:20:38 +0000
+
+kdebindings (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 12 Dec 2005 20:18:59 +0000
+
+kdebindings (4:3.4.3-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Fix a debian/rules bashism which resulted in some extra files being
+    installed, which led to conflicts. (Closes: #341789)
+
+  * Bump DH_COMPAT to 5. No changes required.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun,  4 Dec 2005 09:56:22 -0500
+
+kdebindings (4:3.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Luk Claes:
+
+  * Added me to Uploaders.
+
+  * 015-smokekde_ignore_KEditToolbarWidget_moveActive_r437699: upstream so
+    removed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri,  2 Dec 2005 09:22:27 +0100
+
+kdebindings (4:3.4.2-2) unstable; urgency=low
+
+  * The "I love the smell of 6 FTBFS first thing in the morning" release.
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Java bindings handling:
+    - do not build them on m68k, ecj-bootstrap does not work there.
+    - restrict the java-gcj-compat-dev build-dependency to the arches where it
+      will be used, since on some it is available but uninstallable.
+
+    This takes care of arm and m68k failures.
+
+  * Apply patch from Steve Langasek (thaaaanks!) to use jlong for
+    QPointArray::begin() and ::end() on 64-bit architectures, since JNI
+    doesn't have an integer type that's right-sized for pointers.
+
+    This takes care of alpha and ia64 failures.
+
+  * Do not use --enable-final in the kdejava/koala/kdejava directory, since
+    compiling libkdejava_la.all_cpp.cpp requires an incredible amount of
+    memory and time. (For the record, --enable-final does the equivalent of
+    "cat *.cpp >>all.cpp; g++ -c all.cpp".)
+
+    This takes care of powerpc (timeout) and s390 (OOM) failures.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Oct 2005 19:53:18 +0200
+
+kdebindings (4:3.4.2-1) unstable; urgency=low
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * New upstream release:
+    - QtRuby no longer pollutes the Module namespace. (Closes: #303608)
+
+    Also, this upload is compiled against c++-transitioned Qt and KDE
+    libraries, so closes: #327558, #327948.
+
+    And this version compiles fine on mipsen machines, so closes: #282134.
+    (No need to use -xgot, even.)
+
+  * Compile with g++ 3.4 on arm, m68k, and hppa (g++ 4.0 ICEs).
+
+  * Build-depend on java-gcj-compat-dev, and pass
+    --with-java=/usr/lib/jvm/java-gcj to ./configure; necessary because
+    libgcj6-dev no longer provides /usr/include/jni.h. Remove the rest of
+    java-related build-depends, because j-g-c-d pulls all we need. Also, this
+    upload closes: #332864, since we no longer build-depend on unavailable
+    libgcj4-dev.
+
+  * Do not build the Java bindings arm and hppa in addition to mips, since gij
+    (needed to execute ecj) fails there. Other interpreters than gij may work
+    there, but this will need time to investigate. Ideally, j-g-c-d above, or
+    some other meta-package, should take care of linking java and javac to the
+    right binaries...
+
+    Loose debian/mipsen.mk, because setting -Npackage in DH_OPTIONS no longer
+    works with cdbs (since dh_foo -Npackage -ppackage fails). Instead, list
+    allowed arches in debian/control, and use dh_listpackages -s to determine
+    whether to build java or not.
+
+  * Build-depend on python-dev instead of python2.3-dev, and determine
+    dependencies of python-dcop with dh_python's ${python:Depends}, so that a
+    simple rebuild is enough to transition to a new default python version.
+    Introduce a wilcard in the .install file, and don't pass a hardcoded path
+    to ./configure.
+
+  * Work under patches/, each fixing a different FTBFS:
+
+    - Further improve 030-koala-makefile-too-much-arguments.diff to do test -n
+      "$<" instead of "$?", to avoid new "Argument list too long" errors.
+
+    - Added 013-kdejava_qtjava_objdir_classpath.diff to look for compiled
+      classes in the appropriate dir now that srcdir != builddir.
+
+    - Added 014_kdejava_link_qtjava.la_not_-lqtjava.diff to make libkdejava
+      link against libqtjava.la instead of -lqtjava.
+
+    - Added 015-smokekde_ignore_KEditToolbarWidget_moveActive_r437699.diff to
+      ignore KEditToolbarWidget::moveActive(), since it fails to link.
+
+  * Install python-dcop examples. (Closes: #303654)
+
+  * CDBSized debian/rules, to match the rest of KDE packages.
+
+  * Removed some not needed build-dependencies (binutils-dev, sharutils, perl,
+    libglib1.2-dev).
+
+  * Updated Standards-Version to 3.6.2 (no changes needed).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Oct 2005 05:01:59 +0200
+
+kdebindings (4:3.4.3-0ubuntu2) breezy; urgency=low
+
+  * Stop installing Qt.rb to both libkorundum0-ruby1.8 and libqt0-ruby1.8,
+    since the former depends on the latter, and having them conflict is bad.
+  * Move the dirty Qt.rb /usr/local -> /usr move hack from install:: to the
+    make-install:: target, so it triggers before dh_install, fixing FTBFS.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Mon, 10 Oct 2005 01:00:23 +1000
+
+kdebindings (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build with GCC 3.4 on hppa etc
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat,  8 Oct 2005 20:05:45 +0000
+
+kdebindings (4:3.4.2-0ubuntu3) breezy; urgency=low
+
+  * Fix python-dcop.install to install pydcop.py
+    http://bugzilla.ubuntu.com/13286
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  2 Sep 2005 22:44:19 +0100
+
+kdebindings (4:3.4.2-0ubuntu2) breezy; urgency=low
+
+  * Rebuilt to pick up xorg -> mesa transition and new shlibdeps.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Fri, 19 Aug 2005 14:03:23 +1000
+
+kdebindings (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 27 Jul 2005 11:29:28 +0000
+
+kdebindings (4:3.4.1-0ubuntu3) breezy; urgency=low
+
+  * Add Ruby bindings back since Ruby is in main
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 23 Jun 2005 21:27:36 +0000
+
+kdebindings (4:3.4.1-0ubuntu2) breezy; urgency=low
+
+  * Rebuild to get proper libglu1c2 shlibs dependencies.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Fri, 17 Jun 2005 07:36:32 +0000
+
+kdebindings (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+  * Change dependencies on python-dcop to be Python 2.4
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 00:27:38 +0000
+
+kdebindings (4:3.4.1-0ubuntu0pre2) breezy; urgency=low
+
+  * Add build-dep on automake1.9
+
+ -- Jonathan Riddell <jr at jriddell.org>  Sat, 28 May 2005 18:52:42 +0000
+
+kdebindings (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jr at jriddell.org>  Fri, 27 May 2005 12:01:17 +0000
+
+kdebindings (4:3.4.0-0ubuntu3) breezy; urgency=low
+
+  * Add kubuntu-01-pykde-gcc4.diff fix compiler error with GCC 4
+  * Add kubuntu-02-gcc4-cast.diff to fix compile on 64 bit platforms
+  * Change Python from 1.5 to 2.4 in dcoppython/configure.in.in and admin/acinclude.m4.in
+  * Remove python, qtjava and kdejava from subdirs
+
+ -- Jonathan Riddell <jr at jriddell.org>  Sat, 21 May 2005 15:44:10 +0000
+
+kdebindings (4:3.4.0-0ubuntu2) breezy; urgency=low
+
+  * Rebuild with tighened build dependencies.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 20 May 2005 22:09:41 +0000
+
+kdebindings (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * New upstream release
+  * Migrate packaging to cdbs based package system
+  * Disable ruby and java bindings, since they cannot be built without pulling
+    in extra packages
+
+ -- Chris Halls <chris.halls at credativ.co.uk>  Tue, 29 Mar 2005 11:52:26 +0100
+
+kdebindings (4:3.3.2-1) unstable; urgency=low
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * New upstream release.
+
+  * Added section to libqt3-java.README.Debian about generating native
+    executables. (Closes: #282483)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  3 Feb 2005 21:41:17 +0100
+
+kdebindings (4:3.3.1-2) unstable; urgency=low
+
+  * Don't build java packages on mipsen, since gcj is not available there (and
+    gcj-3.4 will be removed soon). Changes needed:
+
+    - debian/control: add "[!mips !mipsel]" stanzas to Build-Depends entries
+      for gij, gcj, libgcj4-dev and fastjar.
+
+    - debian/rules:
+      + include debian/mipsen.mk (see below).
+      + define WITH_JAVA := --with-java=/usr and let CONFIGURE_FLAGS use that,
+        so that it can be overriden to --without-java inside mipsen.mk.
+
+    - debian/mipsen.mk:
+      + new makefile snippet.
+      + check if DEB_HOST_ARCH is in FUCKED_GCJ_ARCHS and, if so, define
+        WITHOUT_JAVA, redefine WITH_JAVA and override DH_OPTIONS adding -N
+        arguments for all seven java packages.
+
+  * Fix build failure on machines with a lower limit on argument list length,
+    e.g. q650 on the m68k buildd network. Modify the already existing patch
+    030-koala-makefile-too-much-arguments.diff to apply the same changes to
+    qtjava/javalib/org/kde/qt/Makefile.in.
+
+ -- Adeodato SimÃ³ <asp16 at alu.ua.es>  Sun, 14 Nov 2004 03:38:05 +0100
+
+kdebindings (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release plus KDE_3_3_BRANCH update.
+
+  * Correct install paths for ruby packages not to be i386-specific, thus
+    fixing FTBFS on architectures other than i386. (Closes: #278834)
+
+  * New qtruby designer library, adjusted install files and modified
+    026-install-qtruby-and-korundum-in-usr.diff accordingly.
+
+  * Added debian/patches/040-configure-give-kde_java_libgcjdir.diff:
+    - prevents configure from doing a find over /usr just to find out
+      that gcj libraries are installed in /usr/lib.
+
+  * ChangeLogs get now installed with policy-compliant name.
+
+  * Built using an experimental debian/common directory:
+    - debian/rules rewritten accordingly.
+    - use ${package:arch} substvars for dependencies in debian/control.
+
+ -- Adeodato SimÃ³ <asp16 at alu.ua.es>  Sun, 07 Nov 2004 07:24:56 +0100
+
+kdebindings (4:3.3.0-2) unstable; urgency=low
+
+  * Clean Version Number
+
+ -- Riku Voipio <riku.voipio at iki.fi>  Fri,  8 Oct 2004 08:20:25 +0000
+
+kdebindings (4:3.3.0-1~kalyxo2) unstable; urgency=low
+
+  * New upstream version packaged. (Closes: #274709)
+
+  * New team of maintainers (closes: #274816). Thanks to Dominique
+    Devriese for all his previous (great) work in the package.
+
+  * debian/kjscmd.menu: 
+    - fix command invocation and improve title. (Closes: #275170)
+
+  * debian/patches/:
+    - added 030-koala-makefile-too-much-arguments.diff to fix a build
+      failure ("Argument list too long").
+    - added 001-automake-1.9.diff for maintainer's convenience; build
+      system now properly detects automake-1.9 and uses it if available.
+
+  * debian/control:
+    - added ruby1.8-dev to Build-Depends.
+    - conflict with libqt-perl <= 3.008-1 (half of the fix for #274816).
+    - added to some packages' description a paragraph noting that it includes
+      examples and/or documentation.
+    - added libqt0-ruby1.8 as a Dependency: of libkorundum0-ruby1.8.
+    - bump Build-Depends to kdelibs4-dev (>= 4:3.3.0-1) and libqt3-compat-headers
+      (>= 3:3.3.3).
+
+  * debian/rules:
+    - don't use -s for dh_installdirs.
+    - call to dh_link right after dh_installdirs.
+    - use the "dist" target of admin/Makefile.common.
+    - added some more suffixes to exclude from dh_compress.
+    - add "-l debian/$somepackages/usr/lib" parameter to dh_shlibdeps.
+
+  * Some other boring changes:
+    - libqt3-jni.install: added missing libqtjavasupport.{la,so}.
+    - libkjsembed-dev.docs: added lots of available documentation.
+    - added missing README, NEWS, TODO and ChangeLog files to *.docs.
+    - moved contents from *.examples to *.docs.
+
+  * Made half usr/share/doc/$package into symlinks.
+
+ -- Adeodato SimÃ³ <asp16 at alu.ua.es>  Thu, 07 Oct 2004 20:37:00 +0200
+
+kdebindings (4:3.2.92-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff,
+    debian/patches/019-libqtjavasupport_la.diff,
+    debian/patches/020-cleanjarfiles.diff: Accepted upstream, removed.
+  * debian/patches/017-install-jnilibs-in-lib-jni.diff: updated.
+  * debian/control: made libqt3-java suggest juic.
+  * debian/control: removed the obsolete libkdec1 and libqtc1 packages.
+  * debian/local/kjscmd.1, debian/kjscmd.manpages: removed kjscmd.1 which
+    was accepted upstream.
+  * debian/libkjsembed1.install: install the qprocess kjsembed plugin.
+  * debian/rules: disable the python directory, as sip, pyqt and
+    pykde are all packaged in Debian already.
+  * debian/control: added the libsmokekde1, libsmokekde-dev,
+    libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream
+    additions.
+  * debian/control: fix libsmokeqt-dev to depend on libsmokeqt1.
+    (Closes: #274989)
+
+ -- Dominique Devriese <devriese at kde.org>  Thu,  5 Aug 2004 21:08:08 +0200
+
+kdebindings (4:3.2.3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Change maintainer address to "Debian Qt/KDE Maintainers
+    <debian-qt-kde at lists.debian.org>" and list me as uploader.
+  * Fix a simple bug in juic: juic: Incorrect code generated in polish()
+    (closes: 254882)
+
+ -- Dominique Devriese <devriese at kde.org>  Thu, 17 Jun 2004 23:05:27 +0200
+
+kdebindings (4:3.2.2-5) unstable; urgency=low
+
+  * qtjava/designer/juic/lib: remove the two xml parsers, so they don't bloat the package and the diff.gz
+  * debian/rules: make it clean properly by using builddir!=srcdir
+
+ -- Dominique Devriese <devriese at kde.org>  Sat, 22 May 2004 20:39:58 +0200
+
+kdebindings (4:3.2.2-4) unstable; urgency=low
+
+  * debian/control: Removed Build-Depends on autoconf and automake.
+  * debian/control: Added Build-Depends on sharutils for uudecode.
+
+ -- Dominique Devriese <devriese at kde.org>  Wed,  5 May 2004 23:04:44 +0200
+
+kdebindings (4:3.2.2-3) unstable; urgency=low
+
+  * debian/dirs: removed, no longer necessary.
+  * debian/compat, debian/rules: Replaced DH_COMPAT envvar with the
+    debian/compat file.
+  * debian/rules: cosmetic improvements, removed cruft.
+  * debian/rules: fixed the version number of the qtjava and koala jar
+    files.  The rules file now gets it automatically from the changelog,
+    so I can't forget to change it again.
+
+ -- Dominique Devriese <devriese at kde.org>  Tue, 13 Apr 2004 14:45:19 +0200
+
+kdebindings (4:3.2.2-2) unstable; urgency=low
+
+  * Added a lot of documentation and examples about the use of the kde and
+    qt java bindings.
+  * Removed the python-dcop overrides file.
+
+ -- Dominique Devriese <devriese at kde.org>  Fri,  9 Apr 2004 03:15:36 +0200
+
+kdebindings (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules: stopped running make in the disabled dcopperl directory.
+  * debian/rules: explicitly disabled all the directories that aren't
+    packaged.
+
+ -- Dominique Devriese <devriese at kde.org>  Thu,  8 Apr 2004 21:43:08 +0200
+
+kdebindings (4:3.2.1-5) unstable; urgency=low
+
+  * Added a patch that makes sure the .jar files are cleaned properly on
+    debian/rules clean.
+  * debian/rules: make the clean target run "make distclean" in all
+    directories that the build target ran "make" in.
+
+ -- Dominique Devriese <devriese at kde.org>  Tue,  6 Apr 2004 22:16:02 +0200
+
+kdebindings (4:3.2.1-4) unstable; urgency=low
+
+  * Added a manual page for kjscmd ( from CVS HEAD ).
+  * Moved manpages into debian/local.
+  * Disable libdcop-perl, it's not usable atm.
+  * debian/kjscmd.menu: removed obsolete kderemove tag.
+  * debian/local/juic.1, debian/juic.manpages: added a manpage for the
+    juic program.
+  * debian/rules: fix lintian postinst-has-useless-call-to-ldconfig
+    warnings.
+  * debian/patches/019-libqtjavasupport_la.diff: Added a library
+    libqtjavasupport.la, and made both libqtjava and libkdejava link
+    against it, to remove the dependency of libkdejava on libqtjava, and
+    the accompanying rpathing problem.
+  * debian/control: Added a Build-Depends on libqt3-compat-headers after a
+    chroot test.
+
+ -- Dominique Devriese <devriese at kde.org>  Tue,  6 Apr 2004 19:59:28 +0200
+
+kdebindings (4:3.2.1-3) unstable; urgency=low
+
+  * Package juic, the ui compiler for java.
+  * Debug build.
+  * Make sure the qtjava and kdejava think they're installed in the
+    location they really are installed.
+  * debian/rules: update the patch code snippets to the code from recent
+    kdelibs.
+  * Remove some patches that have been accepted upstream.
+
+ -- Dominique Devriese <devriese at kde.org>  Sun,  4 Apr 2004 21:00:22 +0200
+
+kdebindings (4:3.2.1-2) unstable; urgency=low
+
+  * Fix qtjava install locations, and library naming.
+
+ -- Dominique Devriese <devriese at kde.org>  Mon, 29 Mar 2004 11:42:59 +0200
+
+kdebindings (4:3.2.1-1) unstable; urgency=low
+
+  * New maintainer.
+  * Updated packaging for the KDE 3.1.5 upstream release
+  * debian/control: Fixed the descriptions of the packages.
+  * debian/control: Removed the kdexparts, xparts-notepad, kmozilla packages,
+    as they are unusable, and not supported upstream.
+  * debian/control: Removed kalyptus as it is not useful at the moment
+  * debian/control: Split the *java packages into *-java *-jni *-doc as
+    required by the Debian Java Policy and the Debian policy
+  * Fixed the dcopperl package to conform to the Debian Perl Policy; renamed
+    it to libdcop-perl, added ${perl:Depends} to Depends,
+    added a Build-Depends on perl.
+  * Fixed the dcoppython package to conform to the Debian Python Policy;
+    renamed it to python-dcop, added a proper versioned dependency on python
+  * Don't install the Qt and KDE JNI headers they are only meant for
+    internal use.
+  * Java packages are now built with gij/gcj.
+
+ -- Dominique Devriese <devriese at kde.org>  Wed, 24 Mar 2004 21:46:29 +0100
+
+kdebindings (4:3.0.9+cvs20030112-0woody1) unstable; urgency=low
+
+  * Major cleanup of kdebindings using Karolina's build sources and merged in 
+    standard KDE debian stuff to make things work the same across KDE modules 
+  * builddir != srcdir not possible due to kdejava exceeding the possible argument
+    list of 32 k on Linux with its target. This happens if builddir != srcdir where
+    the strings of pathes to the compile directory are included in the build string 
+  * moved libkdexparts-data to xpart-notepad; added kmozilla and kalyptus as well as 
+    libsmokeqt1 and libsmokeqt-dev
+
+ -- Ralf Nolden (KDE) <nolden at kde.org>  Sun, 12 Jan 2003 17:22:38 +0100 
+
+kdebindings (4:3.1.0+rc5+kl-1) unstable; urgency=low
+
+  * New upstreams versions kde 3.1.0 (rc5)
+  * Changed the shlibs handling in the rules file
+  * Changed MAKE_COMMON_DOC_LINKS to MAKE_STANDARD_DOC_LINKS
+
+ -- Karolina Lindqvist <pgd-karolinali at algonet.se>  Sun, 15 Dec 2002 12:29:24 +0100
+
+kdebindings (4:3.0.98-1) experimental; urgency=low
+
+  * kde 3.1 rc2
+  * Moved common functions from "rules" to debian/debianrules
+  * Changed order so that the "kdebindings" package is the main package
+  * Changed dependencies in "kdebindings" to (>= ${Source-Version}) instead of (= ${Source-Version}) 
+
+ -- Karolina Lindqvist <pgd-karolinali at algonet.se>  Sun, 10 Nov 2002 09:58:10 +0100
+
+kdebindings (4:3.0.9.cvs20021101-1) experimental; urgency=low
+
+  * kde 3.1 rc1, with tag HEAD to get updates
+  * bild-dependencies updated
+
+ -- Karolina Lindqvist <pgd-karolinali at algonet.se>  Fri,  1 Nov 2002 10:36:22 +0100
+
+kdebindings (4:3.0.8.cvs20021020-1) experimental; urgency=low
+
+  * New version from CVS
+  * Removed references to CVS from the build files
+  * More cleanup in control file dependencies, conflicts etc.
+
+ -- Karolina Lindqvist <pgd-karolinali at algonet.se>  Wed, 23 Oct 2002 10:19:33 +0200
+
+kdebindings (4:3.0.8.cvs20020930-1) experimental; urgency=low
+
+  * KDE 3.1 beta 2
+  * Fixed conflicts and dependancies with kde-2 and kde-3.0
+  * General overhaul of package division and package names
+
+ -- Karolina Lindqvist <pgd-karolinali at algonet.se>  Thu, 19 Sep 2002 12:49:16 +0200
+
+kdebindings (4:3.0.7-1) unstable; urgency=low
+
+  * Version: KDE 3.1 beta 1
+
+ -- Karolina Lindqvist <pgd-karolinali at algonet.se>  Tue, 13 Aug 2002 08:16:36 +0200
+
+kdebindings (4:3.0.6-1) unstable; urgency=low
+
+  * Bumped the version number
+
+ -- Karolina Lindqvist <pgd-karolinali at algonet.se>  Sat,  6 Jul 2002 09:15:39 +0200
+
+kdebindings (2.1-final-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 01:21:35 -0700
+
+

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

Added: people/jriddell/KDE/3.5/kdebindings/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,248 @@
+Source: kdebindings
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.0), gawk, gettext, java-gcj-compat-dev [alpha amd64 i386 ia64 powerpc s390 sparc], kdelibs4-dev (>= 4:3.5.1), python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
+Section: devel
+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 net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
+Standards-Version: 3.6.2
+
+Package: kdebindings-java
+Section: libs
+Architecture: all
+Depends: libdcop3-java (= ${Source-Version}), libqt3-java (= ${Source-Version}), libkde3-java (= ${Source-Version})
+Description: KDE Java bindings metapackage
+ A metapackage containing dependencies on all KDE, Qt and DCOP
+ bindings libraries to the Java language.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libdcop3-java
+Architecture: all
+Section: libs
+Depends: libdcop3-jni (>> ${KDE-Version3}), libdcop3-jni (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
+Description: DCOP bindings for Java
+ This package contains the Java classes necessary to run Java programs
+ using the Java DCOP bindings. DCOP is the KDE Desktop COmmunications
+ Protocol, used for communicating with running KDE applications.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libdcop3-jni
+Architecture: alpha amd64 i386 ia64 powerpc s390 sparc
+Section: libs
+Depends: ${shlibs:Depends}
+Description: DCOP bindings for Java ( Native libraries )
+ This package contains the shared libraries and scripts necessary to
+ run programs using the Java DCOP bindings.  DCOP is the KDE Desktop
+ COmmunications Protocol, used for communicating with running KDE
+ applications.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libdcop3-java-dev
+Architecture: alpha amd64 i386 ia64 powerpc s390 sparc
+Section: libdevel
+Depends: libdcop3-java (>> ${KDE-Version3}), libdcop3-java (<< ${KDE-Next-Version3})
+Description: DCOP bindings for Java (dcopidl2java program)
+ This package contains the dcopidl2java program which generates Java 
+ stubs from DCOP IDL files, necessary to do development with the DCOP Java
+ bindings. DCOP is the KDE Desktop COmmunications Protocol, used for
+ communicating with running KDE applications.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libqt3-java
+Architecture: all
+Section: libs
+Depends: libqt3-jni (>> ${KDE-Version3}), libqt3-jni (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
+Suggests: juic
+Description: Java bindings for Qt
+ This package contains the Java classes necessary to run Java programs
+ using the Java Qt bindings. Qt is a very popular GUI toolkit, used by
+ the KDE desktop environment.
+ .
+ It also includes many example programs that make use of these bindings,
+ plus many of the Qt Tutorial examples translated into Java.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libqt3-jni
+Architecture: alpha amd64 i386 ia64 powerpc s390 sparc
+Section: libs
+Depends: ${shlibs:Depends}
+Description: Java bindings for Qt ( Native libraries )
+ This package contains the shared libraries necessary to run Java
+ programs using the Java Qt bindings. Qt is a very popular GUI
+ toolkit, used by the KDE desktop environment.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libkde3-java
+Architecture: all
+Section: libs
+Depends: libkde3-jni (>> ${KDE-Version3}), libkde3-jni (<< ${KDE-Next-Version3}), gij | java1-runtime | java2-runtime
+Description: kdelibs bindings for Java
+ This package contains the Java classes necessary to run Java programs
+ using the Java kdelibs bindings. KDE is the K Desktop Environment, a
+ very popular UNIX Desktop Environment.
+ .
+ It also includes some example applications that use these Java
+ classes, and multiple usage samples of the most common KDE classes.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libkde3-jni
+Architecture: alpha amd64 i386 ia64 powerpc s390 sparc
+Section: libs
+Depends: ${shlibs:Depends}
+Description: kdelibs bindings for java ( Native libraries )
+ This package contains the shared libraries necessary to run Java
+ programs using the Java kdelibs bindings. KDE is the K Desktop
+ Environment, a very popular UNIX Desktop Environment.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libsmokeqt1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libqt-perl (<= 3.008-1)
+Description: SMOKE Binding Library to Qt
+ The "Scripting Meta Object Kompiler Engine" library is used by
+ various KDE language bindings packages to provide interfaces to the
+ Qt library.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libsmokeqt-dev
+Architecture: any
+Section: libdevel
+Depends: libsmokeqt1 (= ${Source-Version})
+Conflicts: libqt-perl (<= 3.008-1)
+Description: SMOKE Binding Library to Qt - Development Files
+ The "Scripting Meta Object Kompiler Engine" library is used by
+ various KDE language bindings packages to provide interfaces to the
+ Qt library. This package contains the development files for the
+ library.
+ .
+ If you are a normal Debian user, you probably don't need this
+ package.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libsmokekde1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: SMOKE Binding Library to KDE
+ The "Scripting Meta Object Kompiler Engine" library is used by
+ various KDE language bindings packages to provide interfaces to the
+ KDE libraries.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libsmokekde-dev
+Architecture: any
+Section: libdevel
+Depends: libsmokekde1 (= ${Source-Version})
+Description: SMOKE Binding Library to KDE - Development Files
+ The "Scripting Meta Object Kompiler Engine" library is used by
+ various KDE language bindings packages to provide interfaces to the
+ Qt and KDE libraries. This package contains the development files for
+ the library.
+ .
+ If you are a normal Debian user, you probably don't need this
+ package.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: python-dcop
+Architecture: any
+Section: python
+Depends: ${python:Depends}, ${shlibs:Depends}
+Replaces: dcoppython
+Conflicts: dcoppython
+Description: DCOP bindings for Python
+ This package contains the shared libraries necessary to run and
+ develop Python programs using the Python DCOP bindings
+ libraries. DCOP is the KDE Desktop COmmunications Protocol, used for
+ communicating with running KDE applications.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libkjsembed1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: Embedded JavaScript library
+ This package contains the shared libraries necessary to run programs
+ linked with the KJSEmbed library.  This library provides JavaScript
+ embedded scripting facilities to KDE applications.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libkjsembed-dev
+Architecture: any
+Section: libdevel
+Depends: libkjsembed1 (= ${Source-Version})
+Description: Embedded JavaScript library (Development files)
+ This package contains the header files and symbolic links necessary
+ to develop and compile programs using the KJSEmbed library.  This
+ library provides JavaScript embedded scripting facilities to KDE
+ applications.
+ .
+ It also includes lots of example programs that make use of these
+ bindings, plus comprehensive documentation of the bindings.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: kjscmd
+Architecture: any
+Section: interpreters
+Depends: ${shlibs:Depends}
+Description: A script interpreter using the KDE JavaScript library
+ This package contains the kjscmd program, which is a standalone
+ JavaScript interpreter using the KJSEmbed library.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: juic
+Architecture: all
+Section: libdevel
+Depends: xsltproc
+Recommends: libqt3-java
+Suggests: qt3-designer
+Description: The Qt Java UI Compiler
+ This package contains the juic program, which is used to convert
+ a UI description file generated by the Qt Designer, and converts
+ it into a Qt Java class.  It is necessary for compiling and 
+ developing programs using the Qt Java bindings together with Qt
+ Designer.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libkorundum0-ruby1.8
+Architecture: any
+Section: interpreters
+Depends: libqt0-ruby1.8 (= ${Source-Version}), ${shlibs:Depends}
+Description: KDE bindings for Ruby
+ This package contains the files necessary for running and developing
+ Ruby code using the Korundum KDE Ruby bindings.
+ .
+ It also includes some example programs and templates that make use of
+ these bindings.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libqt0-ruby1.8
+Architecture: any
+Section: interpreters
+Depends: ruby1.8, ${shlibs:Depends}
+Description: Qt bindings for Ruby
+ This package contains the files necessary for running and developing
+ Ruby code using the Qt Ruby bindings.
+ .
+ It also includes some example programs that make use of these bindings,
+ plus many of the Qt Tutorial examples translated into Ruby.
+ .
+ This package is part of the official KDE bindings module.

Added: people/jriddell/KDE/3.5/kdebindings/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,102 @@
+This package also modified by Peter Hawkins <peterh at debian.org>
+This package was further debianized by Dominique Devriese <devriese at kde.org>.
+This package was also debianized by Ivan E. Moore II <rkrusty at debian.org>.
+This package was modified by Karolina Lindqvist <pgd-karolinali at algonet.se>
+
+It was downloaded via cvs from ftp.kde.org
+
+Copyright:
+Unless noted below, all libraries are under the GNU Library General Public
+License and all programs are under the GNU General Public License.
+
+On a debian system, copies of both licenses can be found in the directory
+/usr/share/common-licenses/
+
+See the file AUTHORS for authors and copyright holders.
+
+ 
+Copyright (c) 2000 Simon Hausmann <hausmann at kde.org>
+Copyright (c) 2000 Lars Knoll <knoll at kde.org>
+Copyright (c) 1999 Preston Brown <pbrown at kde.org>
+Copyright (c) 1999, 2000 Matthias Ettrich <ettrich at kde.org>
+ 
+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.
+
+
+
+libqtc:
+/***************************************************************************
+ *      (C) 2000-2001 Lost Highway Ltd. All rights reserved.                   *
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+libkdec:
+/***************************************************************************
+ *      (C) 2000-2002 Lost Highway Ltd. All rights reserved.                   *
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+libqt-java:
+/***************************************************************************
+ *      (C) 2000-2002 Lost Highway Ltd. All rights reserved.               *
+ *                                                                         *
+ *   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.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+
+libkde-java:
+/***************************************************************************
+ *      (C) 2000-2002 Lost Highway Ltd. All rights reserved.               *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Library General Public License as       *
+ *   published by the Free Software Foundation; either version 2 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+xparts:
+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.
+
+Authors:
+Matthias Ettrich <ettrich at kde.org>
+Simon Hausmann <hausmann at kde.org>
+Lars Knoll <knoll at kde.org>
+
+kjsembed:
+Copyright (C) 2001-2002, Richard J. Moore <rich at kde.org>
+(GPL)
+

Added: people/jriddell/KDE/3.5/kdebindings/debian/juic.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/juic.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/juic.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+qtjava/designer/juic/bin/juic	usr/bin
+qtjava/designer/juic/common/*.xml	usr/share/juic/common
+qtjava/designer/juic/common/*.xsl	usr/share/juic/common
+qtjava/designer/juic/java/*.xml	usr/share/juic/java
+qtjava/designer/juic/java/*.xsl	usr/share/juic/java
+qtjava/designer/juic/juic.xsl	usr/share/juic

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

Added: people/jriddell/KDE/3.5/kdebindings/debian/kdebindings-java.links
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/kdebindings-java.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/kdebindings-java.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libkde3-java usr/share/doc/kdebindings-java

Added: people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+debian/tmp/usr/bin/kjscmd
+debian/tmp/usr/share/applications/kde/kjscmd.desktop
+debian/tmp/usr/share/man/man1/kjscmd.1

Added: people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.links
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libkjsembed1 usr/share/doc/kjscmd

Added: people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.menu
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/kjscmd.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+?package(kjscmd):\
+	needs="X11"\
+	section="Apps/Programming"\
+	hints="KDE"\
+	title="KDE JavaScript Console"\
+	command="/usr/bin/kjscmd --console --exec"

Added: people/jriddell/KDE/3.5/kdebindings/debian/konqueror-kjsembed-plugin.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/konqueror-kjsembed-plugin.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/konqueror-kjsembed-plugin.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/kde3/libjsconsoleplugin.la
+debian/tmp/usr/lib/kde3/libjsconsoleplugin.so

Added: people/jriddell/KDE/3.5/kdebindings/debian/libdcop-perl.docs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libdcop-perl.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libdcop-perl.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+dcopperl/AUTHORS
+dcopperl/README
+dcopperl/TODO

Added: people/jriddell/KDE/3.5/kdebindings/debian/libdcop-perl.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libdcop-perl.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libdcop-perl.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/perl5/auto/DCOP/*
+debian/tmp/usr/lib/perl5/DCOP.pm
+debian/tmp/usr/lib/perl5/DCOP/*
+debian/tmp/usr/share/man/man3/DCOP.3pm

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

Added: people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java-dev.links
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java-dev.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java-dev.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libdcop3-java usr/share/doc/libdcop3-java-dev

Added: people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java-dev.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java-dev.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java-dev.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/local/dcopidl2java.1

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

Added: people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java.links
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-java.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libdcop3-jni usr/share/doc/libdcop3-java

Added: people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-jni.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-jni.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libdcop3-jni.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libjavadcop.la /usr/lib/jni
+debian/tmp/usr/lib/libjavadcop.so /usr/lib/jni

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Developing and using KDE based applications written in Java
+===========================================================
+
+This document explains how to develop and use KDE based programs
+written in Java.  This is what the KDE java bindings from the package
+libkde3-java are designed to accomplish.
+
+Please read the document /usr/share/doc/libqt3-java/README.Debian.
+Mostly everything mentionned there applies here as well, with the
+addition that you should also add "/usr/share/java/koala.jar" to your
+CLASSPATH for compiling and using (in addition to qtjava.jar, and
+possibly others).

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.dirs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.dirs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.dirs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libkde3-jni

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.docs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+kdejava/koala/examples
+kdejava/koala/test

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

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.links
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkde3-java.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libkde3-jni usr/share/doc/libkde3-java

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkde3-jni.docs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkde3-jni.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkde3-jni.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+kdejava/AUTHORS
+kdejava/NEWS
+kdejava/README
+kdejava/TODO

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkde3-jni.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkde3-jni.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkde3-jni.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+debian/tmp/usr/lib/jni/libkdejava.so.1
+debian/tmp/usr/lib/jni/libkdejava.la
+debian/tmp/usr/lib/jni/libkdejava.so
+debian/tmp/usr/lib/jni/libkdejava.so.1.0.0
+
+kdejava/ChangeLog usr/share/doc/libkde3-jni

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.dirs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.dirs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.dirs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libkjsembed1

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.docs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+kjsembed/docs/*.css
+kjsembed/docs/*.html
+kjsembed/docs/examples
+kjsembed/docs/classdocs
+kjsembed/docs/jsref
+kjsembed/docs/tutorial
+

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+debian/tmp/usr/include/kde/kjsembed/*
+debian/tmp/usr/lib/libkjsembed.so
+debian/tmp/usr/lib/libkjsembed.la
+
+kjsembed/plugins/customobject_plugin.cpp		usr/share/doc/libkjsembed-dev/plugin-examples/customobject/
+kjsembed/plugins/customobject_plugin.h			usr/share/doc/libkjsembed-dev/plugin-examples/customobject/
+kjsembed/plugins/customobject_plugin.desktop		usr/share/doc/libkjsembed-dev/plugin-examples/customobject/
+kjsembed/plugins/customqobject_plugin.cpp		usr/share/doc/libkjsembed-dev/plugin-examples/customqobject/
+kjsembed/plugins/customqobject_plugin.h			usr/share/doc/libkjsembed-dev/plugin-examples/customqobject/
+kjsembed/plugins/customqobject_plugin.desktop		usr/share/doc/libkjsembed-dev/plugin-examples/customqobject/
+
+kjsembed/docs/embedding/simple-embed/	usr/share/doc/libkjsembed-dev/embedding-examples/simple-embed/

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.links
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed-dev.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libkjsembed1 usr/share/doc/libkjsembed-dev

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

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed1.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkjsembed1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,35 @@
+debian/tmp/usr/lib/libkjsembed.so.1.0.0
+debian/tmp/usr/lib/libkjsembed.so.1
+
+debian/tmp/usr/lib/kde3/libimagefxplugin.la
+debian/tmp/usr/lib/kde3/libimagefxplugin.so
+debian/tmp/usr/share/services/imagefx_plugin.desktop
+
+debian/tmp/usr/lib/kde3/libqprocessplugin.so
+debian/tmp/usr/lib/kde3/libqprocessplugin.la
+debian/tmp/usr/share/services/qprocess_plugin.desktop
+
+debian/tmp/usr/lib/kde3/libfileitemplugin.la
+debian/tmp/usr/lib/kde3/libfileitemplugin.so
+debian/tmp/usr/share/services/kfileitem_plugin.desktop
+
+debian/tmp/usr/share/apps/kjsembed/cmdline.js
+debian/tmp/usr/share/servicetypes/binding_type.desktop
+
+debian/tmp/usr/bin/embedjs
+debian/tmp/usr/share/apps/embedjs/embedjsui.rc
+debian/tmp/usr/share/applnk/Utilities/embedjs.desktop
+debian/tmp/usr/share/icons/hicolor/16x16/apps/embedjs.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/embedjs.png
+
+debian/tmp/usr/lib/kde3/libjavascript.la
+debian/tmp/usr/lib/kde3/libjavascript.so
+debian/tmp/usr/share/apps/kate/scripts/swaptabs.js
+debian/tmp/usr/share/apps/kate/scripts/swaptabs.ui
+debian/tmp/usr/share/apps/kate/scripts/swaptabs.desktop
+debian/tmp/usr/share/services/javascript.desktop
+
+debian/tmp/usr/lib/kde3/libjsconsoleplugin.la
+debian/tmp/usr/lib/kde3/libjsconsoleplugin.so
+
+kjsembed/docs/ChangeLog usr/share/doc/libkjsembed1

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.docs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+korundum/AUTHORS
+korundum/README
+korundum/rubylib/examples
+korundum/rubylib/templates

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+debian/tmp/usr/bin/rbkdesh
+debian/tmp/usr/bin/rbkdeapi
+debian/tmp/usr/bin/krubyinit
+debian/tmp/usr/bin/rbkconfig_compiler
+
+debian/tmp/usr/lib/ruby/1.8/Korundum.rb
+debian/tmp/usr/lib/ruby/1.8/KDE/korundum.rb
+
+debian/tmp/usr/lib/ruby/1.8/*/korundum.so*
+debian/tmp/usr/lib/ruby/1.8/*/korundum.la
+
+korundum/ChangeLog /usr/share/doc/libkorundum0-ruby1.8

Added: people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libkorundum0-ruby1.8.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+debian/local/krubyinit.1
+debian/local/rbkdesh.1
+debian/local/rbkdeapi.1

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.docs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+qtruby/AUTHORS
+qtruby/README
+qtruby/README.1st
+qtruby/TODO
+qtruby/rubylib/examples
+qtruby/rubylib/tutorial
+qtruby/rubylib/designer/examples

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+debian/tmp/usr/bin/rbqtsh
+debian/tmp/usr/bin/rbqtapi
+debian/tmp/usr/bin/rbuic
+debian/tmp/usr/bin/qtrubyinit
+
+debian/tmp/usr/lib/ruby/1.8/Qt/qtruby.rb
+debian/tmp/usr/lib/ruby/1.8/Qt.rb
+
+debian/tmp/usr/lib/ruby/1.8/*/qtruby.so*
+debian/tmp/usr/lib/ruby/1.8/*/qtruby.la
+
+debian/tmp/usr/lib/ruby/1.8/*/qui.so*
+debian/tmp/usr/lib/ruby/1.8/*/qui.la
+
+qtruby/ChangeLog /usr/share/doc/libqt0-ruby1.8

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt0-ruby1.8.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+debian/local/qtrubyinit.1
+debian/local/rbqtsh.1
+debian/local/rbqtapi.1
+debian/local/rbuic.1

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,64 @@
+Developing and using Qt based applications written in Java
+==========================================================
+
+This document explains how to develop and use Qt based programs
+written in Java.  This is what the Qt java bindings from the package
+libqt3-java are designed to accomplish.
+
+Firstly, the bindings should work with any java compiler and VM
+properly implementing the JNI interface, but they have only been
+tested with the GCJ compiler and GIJ interpreter from the GCC suite.
+Note that the bindings are not compiled to native code, using GCJ's
+unique capability to do this, they are simply compiled to .class
+files, and interpreted, in the classical Java manner.
+
+Secondly, when compiling and running apps using the Qt Java bindings,
+you need to add "/usr/share/java/qtjava.jar" to the CLASSPATH.  E.g.
+
+	export CLASSPATH="/usr/share/java/qtjava.jar:/usr/share/java:."
+	javac Whatever.java
+	java Whatever
+
+And, that's basically the hard part of it all.  For the rest,
+developing Qt Java apps is much like Qt C++ apps, except that working
+with slots is easier, and compiles may be faster as well.  The API
+should be completely similar to the Qt C++ API, so the standard Qt
+docs should translate pretty easily.  There are a lot of Qt Java usage
+examples in /usr/share/doc/libqt3-java/examples.
+
+If you're interested in developing KDE applications using Java, look
+at the libkde3-java package.
+
+
+Generating native executables
+-----------------------------
+
+It is also possible to produce native executables with the following gcj
+invocation:
+
+	export CLASSPATH="/usr/share/java/qtjava.jar:/usr/share/java:."
+	gcj -fjni Somefile.java /usr/share/java/qtjava.jar --main=Somefile
+	LD_LIBRARY_PATH=/usr/lib/jni ./a.out
+
+As this will compile the full qtjava.jar into native code, the resulting
+executable will be rather large. If you plan on having several of these
+executables, it may be worth creating a shared qtjava library, like
+this:
+
+	gcj -fjni -shared /usr/share/java/qtjava.jar -o libqtjava-shared.so
+
+And then, after you put libqtjava-shared.so in /usr/lib or similar, you
+can go like:
+
+	gcj -fjni Somefile.java --main=Somefile -lqtjava-shared
+	LD_LIBRARY_PATH=/usr/lib/jni ./a.out
+
+In the future, I'll investigate the possibility of shipping the
+qtjava-shared library in the Debian packages.
+
+Also, in order to avoid the necessity of setting the LD_LIBRARY_PATH
+environment variable, the option -Djava.library.path=/usr/lib/jni can be
+passed to the gcj invocation. There is, however, a bug [1] in gcj that
+prevents this from working, and it's only fixed in gcj-4.0.
+
+    [1] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=18234

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.dirs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.dirs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.dirs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libqt3-jni

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.docs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+qtjava/javalib/examples
+qtjava/javalib/tutorial
+qtjava/javalib/test

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/java/qtjava*.jar
+debian/tmp/usr/share/doc/kde/HTML/en/javalib/*.html /usr/share/doc/libqt3-java/html

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.links
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt3-java.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libqt3-jni usr/share/doc/libqt3-java

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt3-jni.docs
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt3-jni.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt3-jni.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+qtjava/AUTHORS
+qtjava/NEWS
+qtjava/README
+qtjava/TODO

Added: people/jriddell/KDE/3.5/kdebindings/debian/libqt3-jni.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libqt3-jni.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libqt3-jni.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+debian/tmp/usr/lib/libqtjavasupport.la
+debian/tmp/usr/lib/libqtjavasupport.so
+debian/tmp/usr/lib/libqtjavasupport.so.1
+debian/tmp/usr/lib/libqtjavasupport.so.1.0.0
+
+debian/tmp/usr/lib/jni/libqtjava.la
+debian/tmp/usr/lib/jni/libqtjava.so
+debian/tmp/usr/lib/jni/libqtjava.so.1
+debian/tmp/usr/lib/jni/libqtjava.so.1.0.0
+
+qtjava/ChangeLog /usr/share/doc/libqt3-jni

Added: people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libsmokekde.so
+debian/tmp/usr/lib/libsmokekde.la

Added: people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde-dev.links
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde-dev.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde-dev.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libsmokekde1 usr/share/doc/libsmokekde-dev

Added: people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde1.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libsmokekde1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libsmokekde.so.1.2.2
+debian/tmp/usr/lib/libsmokekde.so.1

Added: people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/kde/smoke.h
+debian/tmp/usr/lib/libsmokeqt.so
+debian/tmp/usr/lib/libsmokeqt.la

Added: people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt-dev.links
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt-dev.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt-dev.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/doc/libsmokeqt1 usr/share/doc/libsmokeqt-dev

Added: people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt1.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/libsmokeqt1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libsmokeqt.so.1.2.2
+debian/tmp/usr/lib/libsmokeqt.so.1

Added: people/jriddell/KDE/3.5/kdebindings/debian/local/dcopidl2java.1
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/local/dcopidl2java.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/local/dcopidl2java.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,28 @@
+.TH LIBDCOP-JAVA 1 "July 31, 2002"
+.SH NAME
+dcopidl2java \- Convert a DCOP IDL file to Java language stubs
+.SH SYNOPSIS
+.B dcopidl2java
+.RI " [ " --no-skel " ]  [ " --no-stub " ]  [ " --package " " java-package " ] " file
+.SH DESCRIPTION
+This manual page documents briefly the
+.B dcopidl2java
+command.
+.PP
+\fBdcopidl2java\fP is a program that generates Java stubs from a DCOP IDL file,
+for use with the libdcop-java Java DCOP bindings.
+
+.SH OPTIONS
+A summary of options is included below.
+.TP
+.B --no-skel
+Do not generate skeleton code.
+.TP
+.B --no-stub
+Do not generate stub implementation code.
+.TP
+.B --package java-package 
+Set the name of the Java package to use in the generated code.
+.SH AUTHOR
+This manual page was written by Peter Hawkins <peterh at debian.org>
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdebindings/debian/local/juic.1
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/local/juic.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/local/juic.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,39 @@
+.TH JUIC 1 "Apr 2004" "K Desktop Environment" "Qt Java UI Compiler Manual"
+.SH NAME
+juic \- The Qt Java UI Compiler
+.SH SYNOPSIS
+.B juic
+[options] uifile
+.SH DESCRIPTION
+Juic is the Qt Java UI Compiler.  It generates Java\*(tm code from a
+XML UI Description file.  This XML UI Description file can be
+generated by Qt Designer, Qt's graphical UI designer.  Juic is the
+Java\*(tm equivalent for the C++ uic program.
+
+Juic generates Java code for the Qt UI Description File passed to it,
+and outputs it on standard output.
+.SH OPTIONS
+.TP
+.B \-proc   <xsltproc|xalan|saxon>
+Tells juic which xslt processor to use internally.  Possible values
+are "xsltproc", "xalan", "saxon".  The processor you specify must be
+available in the PATH or juic will give an error.  The default is to
+use xsltproc if it's available, and use saxon otherwise.
+.TP
+.B \-package   <the.package.for.the.class>
+Tells juic to add the given package declaration to the generated java
+class.
+.TP
+.B \-abstract   <true|false>
+Tells juic whether or not to define slots as abstract.
+.TP
+.B \-images   <dir>
+Tells juic where to find the images used in the given ui file.
+Default is "images".
+.TP
+.B \-os   <unix|msdos|mac>
+Tells juic what newline style to use in the generated java file.  Possible values are "unix", "msdos" and "mac", for UNIX, DOS and MacOS style newlines respectively.
+.SH AUTHOR
+Marco Ladermann
+.SH SEE ALSO
+uic(1)

Added: people/jriddell/KDE/3.5/kdebindings/debian/local/krubyinit.1
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/local/krubyinit.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/local/krubyinit.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+.TH KRUBYINIT 1 "Aug 2004" "K Desktop Environment" "KRubyInit Manual"
+.SH NAME
+krubyinit \- Start Korundum Ruby Scripts Faster
+.SH SYNOPSYS
+.B krubyinit
+[switches] [--] [programfile] [arguments]
+.SH DESCRIPTION
+Krubyinit is a wrapper around the ruby interpreter for executing Ruby
+scripts using the Korundum library ( the Ruby KDE bindings ).  It uses
+the kdeinit system to start the app so that they start a little bit
+faster when started in a running KDE session.
+
+The script takes exactly the same options as the ruby(1) program.
+Therefore, its options aren't documented here, please refer to the
+ruby(1) manpage.
+
+This script is part of Korundum, which is part of the KDE Bindings
+module.
+.SH OPTIONS
+Krubyinit takes exactly the same options as the ruby(1) program and
+they have exactly the same meaning.  Please refer to its manpage.
+.SH AUTHOR
+Alexander Kellett
+.SH SEE ALSO
+ruby(1)

Added: people/jriddell/KDE/3.5/kdebindings/debian/local/qtrubyinit.1
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/local/qtrubyinit.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/local/qtrubyinit.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+.TH QTRUBYINIT 1 "Aug 2004" "K Desktop Environment" "QtRubyInit Manual"
+.SH NAME
+qtrubyinit \- Start Qt Ruby Scripts Faster
+.SH SYNOPSYS
+.B qtrubyinit
+[switches] [--] [programfile] [arguments]
+.SH DESCRIPTION
+Qtrubyinit is a wrapper around the ruby interpreter for executing Ruby
+scripts using the QtRuby library.  It uses the kdeinit system to start
+the app so that they start a little bit faster when started in a
+running KDE session.
+
+The script takes exactly the same options as the ruby(1) program.
+Therefore, its options aren't documented here, please refer to the
+ruby(1) manpage.
+
+This script is part of QtRuby, which is part of the KDE Bindings
+module.
+.SH OPTIONS
+Qtrubyinit takes exactly the same options as the ruby(1) program and
+they have exactly the same meaning.  Please refer to its manpage.
+.SH AUTHOR
+Alexander Kellett
+.SH SEE ALSO
+ruby(1)

Added: people/jriddell/KDE/3.5/kdebindings/debian/local/rbkdeapi.1
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/local/rbkdeapi.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/local/rbkdeapi.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+.TH RBKDEAPI 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
+.SH NAME
+rbkdeapi \- A Korundum KDE Ruby Introspection Tool
+.SH SYNOPSIS
+.B rbkdeapi
+[options] [<class>]
+.SH DESCRIPTION
+Rbkdeapi is a Korundum KDE Ruby Introspection Tool, similar to
+javap(1).  Use it to find a list of method for a certain Korundum class.
+.SH OPTIONS
+.TP 
+.B \-r <re>
+Find all functions matching regular expression/keyword <re>
+.TP
+.B \-i
+Perform a case insensitive search ( only meaningful in combination with -r )
+.TP
+.B \-p
+Display also inherited methods.
+.TP
+.B \-v
+Print QtRuby and Qt versions.
+.TP
+.B \-h
+Print a help message.
+.SH AUTHOR
+Alexander Kellett
+.SH SEE ALSO
+rbqtapi(1)

Added: people/jriddell/KDE/3.5/kdebindings/debian/local/rbkdesh.1
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/local/rbkdesh.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/local/rbkdesh.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+.TH RBKDESH 1 "Aug 2004" "K Desktop Environment" "Korundum KDE Ruby Bindings Manual"
+.SH NAME
+rbkdesh \- An Interactive Korundum Shell
+.SH SYNOPSIS
+.B rbkdesh
+[options]
+.SH DESCRIPTION
+Rbkdesh is an interactive Korundum shell.  It shows a GUI dialog box
+where you can enter Ruby code using the Korundum KDE Ruby bindings
+library.
+.SH OPTIONS
+This program takes no options.
+.SH AUTHOR
+Germain Garand
+Alexander Kellett
+.SH SEE ALSO
+rbqtsh(1)

Added: people/jriddell/KDE/3.5/kdebindings/debian/local/rbqtapi.1
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/local/rbqtapi.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/local/rbqtapi.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+.TH RBQTAPI 1 "Aug 2004" "K Desktop Environment" "Qt Ruby Bindings Manual"
+.SH NAME
+rbqtapi \- A QtRuby Introspection Tool
+.SH SYNOPSIS
+.B rbqtapi
+[options] [<class>]
+.SH DESCRIPTION
+Rbqtapi is a QtRuby Introspection Tool, similar to javap(1).  Use it
+to find a list of method for a certain QtRuby class.
+.SH OPTIONS
+.TP 
+.B \-r <re>
+Find all functions matching regular expression/keyword <re>
+.TP
+.B \-i
+Perform a case insensitive search ( only meaningful in combination with -r )
+.TP
+.B \-p
+Display also inherited methods.
+.TP
+.B \-v
+Print QtRuby and Qt versions.
+.TP
+.B \-h
+Print a help message.
+.SH AUTHOR
+Alexander Kellett
+.SH SEE ALSO
+rbkdeapi(1)

Added: people/jriddell/KDE/3.5/kdebindings/debian/local/rbqtsh.1
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/local/rbqtsh.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/local/rbqtsh.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+.TH RBQTSH 1 "Aug 2004" "K Desktop Environment" "Qt Ruby Bindings Manual"
+.SH NAME
+rbqtsh \- An Interactive QtRuby Shell
+.SH SYNOPSIS
+.B rbqtsh
+[options]
+.SH DESCRIPTION
+Rbqtsh is an interactive QtRuby shell.  It shows a GUI dialog box
+where you can enter Ruby code using the QtRuby library.
+.SH OPTIONS
+This program takes no options.
+.SH AUTHOR
+Germain Garand
+Alexander Kellett
+.SH SEE ALSO
+rbkdesh(1)

Added: people/jriddell/KDE/3.5/kdebindings/debian/local/rbuic.1
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/local/rbuic.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/local/rbuic.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,64 @@
+.TH RBUIC 1 "Apr 2004" "K Desktop Environment" "Qt Ruby UI Compiler Manual"
+.SH NAME
+rbuic \- The Qt Ruby UI Compiler
+.SH SYNOPSIS
+Generate implementation:
+.B rbuic
+[options] uifile
+.LP
+Generate subclass implementation:
+.B rbuic
+[options] -subimpl <classname> <uifile>
+.LP
+Generate image collection:
+.B rbuic
+[options] -embed <project> <image1> <image2> <image3> ...
+.SH DESCRIPTION
+Rbuic is the Qt Ruby UI Compiler.  It generates Ruby code from a XML
+UI Description file.  This XML UI Description file can be generated by
+Qt Designer, Qt's graphical UI designer.  Rbuic is the Ruby equivalent
+for the C++ uic program.
+
+When invoked to generate an implementation, rbuic generates Ruby code
+for the Qt UI Description File passed to it, and outputs it on
+standard output.
+
+When invoked to generate a subclass implementation, rbuic generates
+template Ruby code for a subclass of the widget in the Qt UI
+Description File passed to it, and outputs it on standard output.
+
+When invoked to generate an image collection, rbuic generates Ruby
+code containing the image data in strings.  This is useful to avoid
+having to distribute image files along with your application.  It is
+arguably more useful for C++ ( where the image strings can be compiled
+into an executable ), but still, it is available for Ruby as well.
+.SH OPTIONS
+.TP
+.B \-o <file>
+Write output to file rather than stdout.
+.TP
+.B \-p <indent>
+Set the indent in spaces (0 to use a tab)
+.TP
+.B \-nofwd
+Omit imports of custom widgets
+.TP
+.B \-kde
+Use kde widgets, require 'Korundum' extension
+.TP
+.B \-tr <func>
+Use func(...) rather than trUtf8(...) for i18n
+.TP
+.B \-x
+Generate extra code to test the class
+.TP
+.B \-version
+Print the Rbuic and Qt versions
+.TP
+.B \-help
+Display some help information.
+.SH AUTHOR
+Germain Garand
+Phil Thompson
+.SH SEE ALSO
+uic(1)

Added: 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/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/011-kdejava_koala_org_kde_koala_Makefile.am-encoding.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+--- kdebindings/kdejava/koala/org/kde/koala/Makefile.am
++++ kdebindings/kdejava/koala/org/kde/koala/Makefile.am
+@@ -12,6 +12,6 @@
+ 
+ JAVAROOT = ../../..
+ CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
+-JAVACFLAGS = -classpath $(CLASSPATH)
++JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
+ # Prevent stupid automake from putting JAVAC=javac in Makefile.in
+ JAVAC = @JAVAC@

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/012-dcoppython_lib_Makefile.am-sitepackages.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/012-dcoppython_lib_Makefile.am-sitepackages.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/012-dcoppython_lib_Makefile.am-sitepackages.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+--- kdebindings/dcoppython/lib/Makefile.am
++++ kdebindings/dcoppython/lib/Makefile.am
+@@ -1,4 +1,4 @@
+ 
+ pyt_DATA = pydcop.py 
+-pytdir = $(PYTHONMODDIR)
++pytdir = $(PYTHONMODDIR)/site-packages
+ 

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/013-kdejava_qtjava_objdir_classpath.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+--- kdebindings/qtjava/javalib/org/kde/qt/Makefile.am
++++ kdebindings/qtjava/javalib/org/kde/qt/Makefile.am
+@@ -11,7 +11,7 @@
+ #install-data-hook:	uninstall-javaJAVA
+ 
+ JAVAROOT = ../../..
+-CLASSPATH = $(srcdir)/../../..
++CLASSPATH = ../../..
+ JAVACFLAGS = -classpath $(CLASSPATH)
+ # Prevent stupid automake from putting JAVAC=javac in Makefile.in
+ JAVAC = @JAVAC@
+--- kdebindings/kdejava/koala/org/kde/koala/Makefile.am
++++ kdebindings/kdejava/koala/org/kde/koala/Makefile.am
+@@ -11,7 +11,7 @@
+ #install-data-hook:	uninstall-javaJAVA
+ 
+ JAVAROOT = ../../..
+-CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
++CLASSPATH = ../../..:../../../../../qtjava/javalib/qtjava.jar:.
+ JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
+ # Prevent stupid automake from putting JAVAC=javac in Makefile.in
+ JAVAC = @JAVAC@

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/014_kdejava_link_qtjava.la_not_-lqtjava.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+--- kdebindings/kdejava/koala/Makefile.am
++++ kdebindings/kdejava/koala/Makefile.am
+@@ -4,7 +4,7 @@
+ ## INCLUDES were found outside kdevelop specific part
+ 
+ koala_SOURCES = main.cpp 
+-koala_LDADD   = ./kdejava/libkdejava.la $(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
++koala_LDADD   = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
+ 
+ SUBDIRS = org kdejava 
+ 

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/016_QPointArray_begin_end_jlong.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/016_QPointArray_begin_end_jlong.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/016_QPointArray_begin_end_jlong.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,78 @@
+--- kdebindings/kalyptus/kalyptusCxxToJNI.pm
++++ kdebindings/kalyptus/kalyptusCxxToJNI.pm
+@@ -1322,6 +1322,19 @@
+ 	return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->truncate((uint) pos);
+ }
+ 
++#if SIZEOF_CHAR_P == 8
++JNIEXPORT jlong JNICALL
++Java_org_kde_qt_QPointArray_begin(JNIEnv *env, jobject obj)
++{
++	return (jlong) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->begin();
++}
++
++JNIEXPORT jlong JNICALL
++Java_org_kde_qt_QPointArray_end(JNIEnv *env, jobject obj)
++{
++	return (jlong) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->end();
++}
++#else
+ JNIEXPORT jint JNICALL
+ Java_org_kde_qt_QPointArray_begin(JNIEnv *env, jobject obj)
+ {
+@@ -1333,6 +1346,7 @@
+ {
+ 	return (jint) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->end();
+ }
++#endif
+ 
+ JNIEXPORT jobject JNICALL
+ Java_org_kde_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index)
+only in patch2:
+unchanged:
+--- kdebindings/qtjava/javalib/qtjava/QPointArray.cpp
++++ kdebindings/qtjava/javalib/qtjava/QPointArray.cpp
+@@ -273,6 +273,19 @@
+ 	return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->truncate((uint) pos);
+ }
+ 
++#if SIZEOF_CHAR_P == 8
++JNIEXPORT jlong JNICALL
++Java_org_kde_qt_QPointArray_begin(JNIEnv *env, jobject obj)
++{
++	return (jlong) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->begin();
++}
++
++JNIEXPORT jlong JNICALL
++Java_org_kde_qt_QPointArray_end(JNIEnv *env, jobject obj)
++{
++	return (jlong) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->end();
++}
++#else
+ JNIEXPORT jint JNICALL
+ Java_org_kde_qt_QPointArray_begin(JNIEnv *env, jobject obj)
+ {
+@@ -284,6 +297,7 @@
+ {
+ 	return (jint) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->end();
+ }
++#endif
+ 
+ JNIEXPORT jobject JNICALL
+ Java_org_kde_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index)
+--- kdebindings/qtjava/javalib/qtjava/QPointArray.h~	2005-11-08 22:21:54.000000000 +0000
++++ kdebindings/qtjava/javalib/qtjava/QPointArray.h	2005-12-13 13:19:41.000000000 +0000
+@@ -35,8 +35,13 @@
+ extern JNIEXPORT void JNICALL Java_org_kde_qt_QPointArray_finalize (JNIEnv *env, jobject);
+ extern JNIEXPORT void JNICALL Java_org_kde_qt_QPointArray_dispose (JNIEnv *env, jobject);
+ extern JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_isDisposed (JNIEnv *env, jobject);
++#if SIZEOF_CHAR_P == 8
++extern JNIEXPORT jlong JNICALL Java_org_kde_qt_QPointArray_size (JNIEnv *env, jobject);
++extern JNIEXPORT jlong JNICALL Java_org_kde_qt_QPointArray_count (JNIEnv *env, jobject);
++#else
+ extern JNIEXPORT jint JNICALL Java_org_kde_qt_QPointArray_size (JNIEnv *env, jobject);
+ extern JNIEXPORT jint JNICALL Java_org_kde_qt_QPointArray_count (JNIEnv *env, jobject);
++#endif
+ extern JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_isEmpty (JNIEnv *env, jobject);
+ extern JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_isNull (JNIEnv *env, jobject);
+ extern JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_resize (JNIEnv *env, jobject, jint);

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+--- kdebindings/kdejava/koala/kdejava/Makefile.am
++++ kdebindings/kdejava/koala/kdejava/Makefile.am
+@@ -1,5 +1,6 @@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+-lib_LTLIBRARIES = libkdejava.la
++jniloc_LTLIBRARIES = libkdejava.la
++jnilocdir = $(libdir)/jni
+ 
+ 
+ ## INCLUDES were found outside kdevelop specific part
+--- kdebindings/qtjava/javalib/qtjava/Makefile.am
++++ kdebindings/qtjava/javalib/qtjava/Makefile.am
+@@ -1,5 +1,7 @@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+-lib_LTLIBRARIES = libqtjava.la libqtjavasupport.la
++jniloc_LTLIBRARIES = libqtjava.la
++lib_LTLIBRARIES = libqtjavasupport.la
++jnilocdir = $(libdir)/jni
+ 
+ 
+ ## INCLUDES were found outside kdevelop specific part

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/018-juic-uixsldir.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/018-juic-uixsldir.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/018-juic-uixsldir.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+--- kdebindings/qtjava/designer/juic/bin/juic
++++ kdebindings/qtjava/designer/juic/bin/juic
+@@ -43,8 +43,7 @@
+ #              common/
+ #              java
+ 
+-a=$(getAbsolutePath $0)
+-UIXSLDIR=$(dirname "$a")
++UIXSLDIR=/usr/share/juic
+ UIXSL=${UIXSLDIR}/juic.xsl
+ 
+ ABSTRACT=

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/019-kdejava_koala_no-enable-final.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/019-kdejava_koala_no-enable-final.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/019-kdejava_koala_no-enable-final.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+--- kdebindings/kdejava/koala/kdejava/Makefile.am
++++ kdebindings/kdejava/koala/kdejava/Makefile.am
+@@ -34,4 +34,4 @@
+ 
+ libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
+ 
+-KDE_OPTIONS = qtonly
++KDE_OPTIONS = qtonly nofinal

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+--- kdebindings/kjsembed/plugins/Makefile.am
++++ kdebindings/kjsembed/plugins/Makefile.am
+@@ -1,8 +1,8 @@
+ INCLUDES=  -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
+ KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE
+ 
+-kde_module_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la \
+-	libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la
++kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la
++noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la
+ METASOURCES = AUTO
+ 
+ # the Plugin's source, library search path, and link libraries
+@@ -33,6 +33,6 @@
+ 
+ # this is where the desktop file will go
+ plugindesktopdir   = $(kde_servicesdir)
+-plugindesktop_DATA = customobject_plugin.desktop customqobject_plugin.desktop imagefx_plugin.desktop\
+-	 qprocess_plugin.desktop kfileitem_plugin.desktop
++plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop
++noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop
+ 

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/023-dont-install-jsaccess.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/023-dont-install-jsaccess.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/023-dont-install-jsaccess.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+--- kdebindings/kjsembed/cpptests/jsaccess/Makefile.am
++++ kdebindings/kjsembed/cpptests/jsaccess/Makefile.am
+@@ -5,7 +5,7 @@
+ 
+ INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
+ 
+-bin_PROGRAMS    = jsaccess
++noinst_PROGRAMS    = jsaccess
+ 
+ jsaccess_SOURCES =        jsaccess.cpp
+ jsaccess_LDFLAGS =        $(all_libraries) $(KDE_RPATH)

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+--- kdebindings/qtjava/javalib/Makefile.am
++++ kdebindings/qtjava/javalib/Makefile.am
+@@ -1,5 +1,5 @@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+-bin_PROGRAMS = javalib
++noinst_PROGRAMS = javalib
+ 
+ ## INCLUDES were found outside kdevelop specific part
+ 

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/025-dont-install-koala-test-program.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/025-dont-install-koala-test-program.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/025-dont-install-koala-test-program.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+--- kdebindings/kdejava/koala/Makefile.am
++++ kdebindings/kdejava/koala/Makefile.am
+@@ -1,5 +1,5 @@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+-bin_PROGRAMS = koala
++noinst_PROGRAMS = koala
+ 
+ ## INCLUDES were found outside kdevelop specific part
+ 

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,86 @@
+--- kdebindings/qtruby/rubylib/qtruby/configure.in.in
++++ kdebindings/qtruby/rubylib/qtruby/configure.in.in
+@@ -7,12 +7,14 @@
+   RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+   RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
+   RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
++  RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
+   RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
+   RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
+   AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG])
+   AC_SUBST(RUBY_ARCHDIR)
+   AC_SUBST(RUBY_SITEARCHDIR)
+   AC_SUBST(RUBY_SITEDIR)
++  AC_SUBST(RUBY_RUBYLIBDIR)
+   AC_SUBST(RUBY_LIBDIR)
+   AC_SUBST(RUBY_LIBRUBYARG)
+ fi
+--- kdebindings/qtruby/rubylib/qtruby/Makefile.am
++++ kdebindings/qtruby/rubylib/qtruby/Makefile.am
+@@ -6,7 +6,7 @@
+ libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp 
+ libqtrubyinternal_la_METASOURCES = AUTO
+ 
+-rubylibdir = $(RUBY_SITEARCHDIR)
++rubylibdir = $(RUBY_ARCHDIR)
+ rubylib_LTLIBRARIES = qtruby.la
+ qtruby_la_SOURCES = 
+ qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/qt/
+--- kdebindings/qtruby/rubylib/qtruby/lib/Makefile.am
++++ kdebindings/qtruby/rubylib/qtruby/lib/Makefile.am
+@@ -1,4 +1,4 @@
+ SUBDIRS = Qt 
+ 
+-rubylibdir = $(RUBY_SITEDIR)
++rubylibdir = $(RUBY_RUBYLIBDIR)
+ rubylib_DATA = Qt.rb
+--- kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
++++ kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
+@@ -1,2 +1,2 @@
+-qtrubylibdir = $(RUBY_SITEDIR)/Qt
++qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt
+ qtrubylib_DATA = qtruby.rb
+--- kdebindings/qtruby/rubylib/designer/uilib/Makefile.am
++++ kdebindings/qtruby/rubylib/designer/uilib/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
+ 
+-rubylibdir = $(RUBY_SITEARCHDIR)
++rubylibdir = $(RUBY_ARCHDIR)
+ rubylib_LTLIBRARIES = qui.la
+ qui_la_SOURCES = qui.cpp
+ qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
+--- kdebindings/korundum/rubylib/korundum/configure.in.in
++++ kdebindings/korundum/rubylib/korundum/configure.in.in
+@@ -7,9 +7,11 @@
+   RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+   RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
+   RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
++  RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
+   AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR])
+   AC_SUBST(RUBY_ARCHDIR)
+   AC_SUBST(RUBY_SITEARCHDIR)
++  AC_SUBST(RUBY_RUBYLIBDIR)
+   AC_SUBST(RUBY_SITEDIR)
+ fi
+ 
+--- kdebindings/korundum/rubylib/korundum/Makefile.am
++++ kdebindings/korundum/rubylib/korundum/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
+ 
+-rubylibdir = $(RUBY_SITEARCHDIR)
++rubylibdir = $(RUBY_ARCHDIR)
+ rubylib_LTLIBRARIES = korundum.la
+ korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/kde/
+ korundum_la_METASOURCES = AUTO
+--- kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am
++++ kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am
+@@ -1,5 +1,5 @@
+-kderubylibdir = $(RUBY_SITEDIR)/KDE
++kderubylibdir = $(RUBY_RUBYLIBDIR)/KDE
+ kderubylib_DATA = korundum.rb
+ 
+-rubylibdir = $(RUBY_SITEDIR)
++rubylibdir = $(RUBY_RUBYLIBDIR)
+ rubylib_DATA = Korundum.rb

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/027-fix-dcopjava-deps.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/027-fix-dcopjava-deps.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/027-fix-dcopjava-deps.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,19 @@
+--- kdebindings/dcopjava/binding/Makefile.am
++++ kdebindings/dcopjava/binding/Makefile.am
+@@ -6,10 +6,13 @@
+ 
+ INCLUDES = $(jni_includes) $(all_includes)
+ 
+-client.cpp: org_kde_DCOP_Client.h 
++client.$(OBJEXT): org_kde_DCOP_Client.h 
+ 
+-org_kde_DCOP_Client.h: org/kde/DCOP/Client.class
+-	CLASSPATH=$(srcdir) $(JAVAH) -jni org.kde.DCOP.Client
++client.lo: org_kde_DCOP_Client.h 
++
++org_kde_DCOP_Client.h:
++	$(MAKE) -C org
++	CLASSPATH=.:$(srcdir) $(JAVAH) -jni org.kde.DCOP.Client
+ 
+ SUBDIRS = org
+ 

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/028-make-cmdline.js-executable.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/028-make-cmdline.js-executable.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/028-make-cmdline.js-executable.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+--- kdebindings/kjsembed/stdlib/Makefile.am
++++ kdebindings/kjsembed/stdlib/Makefile.am
+@@ -1,5 +1,5 @@
+ # -*- makefile -*-
+ 
+ jslibdir = $(kde_datadir)/kjsembed
+-jslib_DATA = cmdline.js
++jslib_SCRIPTS = cmdline.js
+ 

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/029-ruby1.8-not-just-ruby.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/029-ruby1.8-not-just-ruby.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/029-ruby1.8-not-just-ruby.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+--- kdebindings/qtruby/bin/rbqtapi
++++ kdebindings/qtruby/bin/rbqtapi
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby1.8
+ 
+ # Note: this program is part of qtruby and makes use of its internal functions.
+ #       You should not rely on those in your own programs.
+--- kdebindings/qtruby/bin/rbqtsh
++++ kdebindings/qtruby/bin/rbqtsh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby1.8
+ 
+ # rbqtsh : a graphical shell for qtruby.
+ #

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/030-koala-makefile-too-much-arguments.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,24 @@
+--- kdebindings/kdejava/koala/org/kde/koala/Makefile.in
++++ kdebindings/kdejava/koala/org/kde/koala/Makefile.in
+@@ -426,8 +426,7 @@
+ uninstall-info-am:
+ 
+ classnoinst.stamp: $(noinst_JAVA)
+-	@if test -n "$?"; then \
+-	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
++	if test -n "$<"; then \
+ 	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
+ 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
+ 	else :; fi
+--- kdebindings/qtjava/javalib/org/kde/qt/Makefile.in
++++ kdebindings/qtjava/javalib/org/kde/qt/Makefile.in
+@@ -426,8 +426,7 @@
+ uninstall-info-am:
+ 
+ classnoinst.stamp: $(noinst_JAVA)
+-	@if test -n "$?"; then \
+-	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
++	if test -n "$<"; then \
+ 	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
+ 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
+ 	else :; fi

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/040-configure-give-kde_java_libgcjdir.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/040-configure-give-kde_java_libgcjdir.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/040-configure-give-kde_java_libgcjdir.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+--- kdebindings/configure
++++ kdebindings/configure
+@@ -32465,9 +32465,9 @@
+ 
+ if test "x$kde_java_bindir" != "xno"; then
+ 
+-    kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
+-    kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
+-    kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
++    kde_java_libjvmdir=
++    kde_java_libgcjdir=/usr/lib/
++    kde_java_libhpidir=
+ 
+       if test -d "$kde_java_includedir"; then
+     if test ! -x "$kde_java_bindir/javac"; then

Added: people/jriddell/KDE/3.5/kdebindings/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/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/kdebindings/debian/patches/kubuntu_01_dcopjava_paths.diff
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/patches/kubuntu_01_dcopjava_paths.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/patches/kubuntu_01_dcopjava_paths.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+--- kdebindings/dcopjava/binding/org/kde/DCOP/Makefile.am	2005-09-10 08:16:14.000000000 +0000
++++ kdebindings/dcopjava/binding/org/kde/DCOP/Makefile.am	2005-12-13 18:29:06.000000000 +0000
+@@ -3,6 +3,6 @@
+ 
+ SUFFIXES = .java .class
+ .java.class:
+-	CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ $*.java
++	$(JAVAC) -d ../../../ -cp ../../../ $(top_srcdir)/dcopjava/binding/org/kde/DCOP/$*.java
+ 
+ CLEANFILES = $(class_DATA)

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

Added: people/jriddell/KDE/3.5/kdebindings/debian/python-dcop.examples
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/python-dcop.examples	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/python-dcop.examples	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+dcoppython/test/*.py
+dcoppython/test/README-server

Added: people/jriddell/KDE/3.5/kdebindings/debian/python-dcop.install
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/python-dcop.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/python-dcop.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/site-packages

Added: people/jriddell/KDE/3.5/kdebindings/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdebindings/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdebindings/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,100 @@
+#! /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
+
+###
+
+ifneq (,$(shell dh_listpackages -s | grep libqt3-jni))
+    WITH_JAVA := --with-java=/usr/lib/jvm/java-gcj
+else
+    WITH_JAVA    := --without-java
+    WITHOUT_JAVA := 1
+endif
+
+###
+
+DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \
+		  	    DO_NOT_COMPILE='dcopperl kalyptus qtsharp xparts python'
+
+DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk
+
+# These are not all the packages with libraries, but only those that
+# need to be in DEB_SHLIBDEPS_INCLUDE...
+PACKAGES_WITH_LIBS = libqt3-jni libsmokeqt1 libsmokekde1 libkjsembed1
+
+# These packages do not ship files in /usr/lib so need not call ldconfig.
+DEB_DH_MAKESHLIBS_ARGS_libkde3-jni          = -n
+DEB_DH_MAKESHLIBS_ARGS_libqt0-ruby1.8       = -n
+DEB_DH_MAKESHLIBS_ARGS_libkorundum0-ruby1.8 = -n
+
+###
+
+clean::
+	rm -f kjsembed/docs/embedding/simple-embed/Makefile
+	rm -f debian/stamp-install-dcopjava
+
+common-build-indep::
+ifndef WITHOUT_JAVA
+	# build dcopjava even though it's disabled upstream.
+	cd $(DEB_BUILDDIR) && \
+	$(MAKE) -C dcopjava 
+endif
+
+stamp-install-dcopjava:
+ifndef WITHOUT_JAVA
+	cd $(DEB_BUILDDIR) && \
+	$(MAKE) -C dcopjava install DESTDIR=$(CURDIR)/debian/tmp
+endif
+	touch debian/$@
+
+upstream_version=$(shell head -1 $(CURDIR)/debian/changelog | sed -e "s,.*:\([^-]*\).*,\1,")
+
+common-install-indep:: stamp-install-dcopjava
+	dh_link -i
+ifndef WITHOUT_JAVA
+	# Fix up the Java packages so they conform to policy
+	mkdir -p debian/tmp/usr/share/java
+	(cd debian/tmp/usr/lib/java ; jar cvf ../../share/java/dcopjava-$(upstream_version).jar org/ )
+	cd debian/tmp/usr/lib/java; rm -rf org
+	ln -s dcopjava-$(upstream_version).jar debian/tmp/usr/share/java/dcopjava.jar
+
+	mv debian/tmp/usr/lib/java/qtjava.jar debian/tmp/usr/share/java/qtjava-$(upstream_version).jar
+	ln -s qtjava-$(upstream_version).jar debian/tmp/usr/share/java/qtjava.jar
+
+	mv debian/tmp/usr/lib/java/koala.jar debian/tmp/usr/share/java/koala-$(upstream_version).jar
+	ln -s koala-$(upstream_version).jar debian/tmp/usr/share/java/koala.jar
+endif
+
+common-install-arch:: stamp-install-dcopjava
+	dh_link -s
+	# Provide a Makefile for the example
+	cp $(DEB_BUILDDIR)/kjsembed/docs/embedding/simple-embed/Makefile kjsembed/docs/embedding/simple-embed
+
+###
+
+binary-install/python-dcop::
+	dh_python -p$(cdbs_curpkg)
+
+###
+
+common-binary-post-install-arch::
+	for p in $(PACKAGES_WITH_USD_SYMLINK); do \
+	  rm -f debian/$$p/usr/share/doc/$$p/copyright; \
+	  rm -f debian/$$p/usr/share/doc/$$p/changelog.Debian; \
+	  rm -f debian/$$p/usr/share/doc/$$p/changelog; \
+	done
+
+common-binary-post-install-indep::
+	for p in $(PACKAGES_WITH_USD_SYMLINK); do \
+	  rm -f debian/$$p/usr/share/doc/$$p/copyright; \
+	  rm -f debian/$$p/usr/share/doc/$$p/changelog.Debian; \
+	  rm -f debian/$$p/usr/share/doc/$$p/changelog; \
+	done
+
+PACKAGES_WITH_USD_SYMLINK = kdebindings-java libkde3-java libqt3-java \
+			    libdcop3-java-dev libdcop3-java \
+			    libsmokekde-dev libsmokeqt-dev \
+			    kjscmd libkjsembed-dev


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

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/blinken.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/blinken.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/blinken.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,48 @@
+usr/bin/blinken
+usr/share/applications/kde/blinken.desktop
+usr/share/apps/blinken/images/blinken.png
+usr/share/apps/blinken/images/blueh.png
+usr/share/apps/blinken/images/greenh.png
+usr/share/apps/blinken/images/highscore.png
+usr/share/apps/blinken/images/highscore_hover.png
+usr/share/apps/blinken/images/mark.png
+usr/share/apps/blinken/images/menu.png
+usr/share/apps/blinken/images/menu_hover.png
+usr/share/apps/blinken/images/quit.png
+usr/share/apps/blinken/images/quit_hover.png
+usr/share/apps/blinken/images/redh.png
+usr/share/apps/blinken/images/yellowh.png
+usr/share/apps/blinken/sounds/1.wav
+usr/share/apps/blinken/sounds/2.wav
+usr/share/apps/blinken/sounds/3.wav
+usr/share/apps/blinken/sounds/4.wav
+usr/share/apps/blinken/sounds/lose.wav
+usr/share/config.kcfg/blinken.kcfg
+usr/share/doc/kde/HTML/en/blinken/accessibility.html
+usr/share/doc/kde/HTML/en/blinken/blinken1.png
+usr/share/doc/kde/HTML/en/blinken/blinken2.png
+usr/share/doc/kde/HTML/en/blinken/blinken_accesskeys.png
+usr/share/doc/kde/HTML/en/blinken/blinken_helpbutton.png
+usr/share/doc/kde/HTML/en/blinken/blinken_highscoresbutton.png
+usr/share/doc/kde/HTML/en/blinken/blinken_nickprompt.png
+usr/share/doc/kde/HTML/en/blinken/blinken_quitbutton.png
+usr/share/doc/kde/HTML/en/blinken/common
+usr/share/doc/kde/HTML/en/blinken/compilation.html
+usr/share/doc/kde/HTML/en/blinken/credits.html
+usr/share/doc/kde/HTML/en/blinken/enter-highscore.html
+usr/share/doc/kde/HTML/en/blinken/index.cache.bz2
+usr/share/doc/kde/HTML/en/blinken/index.docbook
+usr/share/doc/kde/HTML/en/blinken/index.html
+usr/share/doc/kde/HTML/en/blinken/installation.html
+usr/share/doc/kde/HTML/en/blinken/introduction.html
+usr/share/doc/kde/HTML/en/blinken/playing-tips.html
+usr/share/doc/kde/HTML/en/blinken/using-blinken.html
+usr/share/icons/hicolor/128x128/apps/blinken.png
+usr/share/icons/hicolor/16x16/apps/blinken.png
+usr/share/icons/hicolor/22x22/apps/blinken.png
+usr/share/icons/hicolor/32x32/apps/blinken.png
+usr/share/icons/hicolor/48x48/apps/blinken.png
+usr/share/icons/hicolor/64x64/apps/blinken.png
+usr/share/icons/hicolor/scalable/apps/blinken.svgz
+
+usr/share/apps/blinken/fonts/steve.ttf /usr/share/fonts/truetype/ttf-kdeedu/

Added: people/jriddell/KDE/3.5/kdeedu/debian/celestrongps.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/celestrongps.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/celestrongps.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 CELESTRONGPS 1 "March 16, 2005"
+.\" 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
+celestrongps \- Celestron GPS driver for INDI telescope control
+.SH SYNOPSIS
+.B celestrongps
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBcelestrongps\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,428 @@
+kdeedu (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
+
+kdeedu (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * rebuild for new libboost 
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Fri, 13 Jan 2006 15:31:57 +0100
+
+kdeedu (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:27:39 +0000
+
+kdeedu (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Generate .pot files
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 19:43:59 +0000
+
+kdeedu (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * kmessedwords replaced with kanagram
+  * libkdeedu1 becomes libkdeedu3
+  * New packages kgeography, blinken
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 20:53:20 +0000
+
+kdeedu (4:3.4.2-2.1) unstable; urgency=low
+
+  * NMU
+  * Use gcc-3.4 to build in arm, m68k and hppa, closes: #334986
+
+ -- Isaac Clerencia <isaac at debian.org>  Fri, 21 Oct 2005 13:14:31 +0200
+
+kdeedu (4:3.4.2-2) unstable; urgency=low
+
+  * Built against libfam-dev, not libgamin-dev.
+
+ -- Ben Burton <bab at debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
+
+kdeedu (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * First g++-4 upload to sid.
+  * Adjusted build-dependencies and shlibs files for the C++ ABI transition.
+    Note that the libkdeedu1 and libkiten1 package names do not need to change.
+  * Fixed tempfile handling in langen2kvtml, which is shipped in the kvoctrain
+    package.  See the following URL for further information:
+    - http://www.kde.org/info/security/advisory-20050815-1.txt
+    References: CAN-2005-2101
+  * Don't use libsuff=64 on amd64/ppc64 (closes: #301796).
+  * Added the new script keduca-shrinker, thanks to Mathieu Roy for providing
+    it (closes: #305980).
+  * Updated FSF address in the copyright file.
+  * Bumped standards-version to 3.6.2.1 (no changes required).
+  * KTouch now allows manual level change regardless of whether automatic
+    level changing is enabled (closes: #129491).
+  * Line numbers fixed in KTurtle error messages (closes: #293582).
+
+ -- Ben Burton <bab at debian.org>  Thu,  1 Sep 2005 09:04:24 +1000
+
+kdeedu (4:3.4.3-0ubuntu2) breezy; urgency=low
+
+  * Do not try to install missing man pages
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun,  9 Oct 2005 13:12:42 +0100
+
+kdeedu (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build with GCC 3.4 on hppa etc
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  7 Oct 2005 18:35:59 +0000
+
+kdeedu (4:3.4.2-0ubuntu4) breezy; urgency=low
+
+  * SECURITY UPDATE: fix insecure temporary file creation
+  * The script uses known filenames in /tmp which allow an
+    local attacker to overwrite files writeable by the
+    user (manually) invoking the conversion script.  A local
+    file can overwrite files and possibly elevate privileges.
+  * Add kubuntu_01_langen2kvtml_temp_file_vulnerability.diff
+  * References:
+    CAN-2005-2101
+    http://www.kde.org/info/security/advisory-20050815-1.txt
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 13 Aug 2005 12:35:52 +0000
+
+kdeedu (4:3.4.2-0ubuntu3) breezy; urgency=low
+
+  * last rebuild didnt work it seems...
+    rebuild for new boost again to make kig installable in edubuntu
+
+ -- Oliver Grawert <ogra at ubuntu.com>  Mon,  8 Aug 2005 12:08:34 +0200
+
+kdeedu (4:3.4.2-0ubuntu2) breezy; urgency=low
+
+  * Rebuild for new boost upload.
+
+ -- Matthias Klose <doko at ubuntu.com>  Wed,  3 Aug 2005 23:24:48 +0200
+
+kdeedu (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:24 +0000
+
+kdeedu (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 00:32:27 +0000
+
+kdeedu (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+
+  * New upstream release.
+  * Sync with Debian.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Sat, 28 May 2005 19:08:44 +0000
+
+kdeedu (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
+
+kdeedu (4:3.4.0-0pre1) unstable; urgency=low
+
+  * New major upstream release.
+  * New binary packages libkiten1 and libkiten-dev.
+  * Removed obsolete kderemove tags from menu items.
+
+ -- Ben Burton <bab at debian.org>  Tue,  8 Mar 2005 07:43:35 +1100
+
+kdeedu (4:3.3.2-3) unstable; urgency=low
+
+  * Included the full GFDL text in debian/copyright, since all of the docbook
+    documentation is under this license.
+  * Fixed the "umbruckan" typos in the German kturtle data (closes: #285146).
+
+ -- Ben Burton <bab at debian.org>  Sat, 26 Mar 2005 10:15:48 +1100
+
+kdeedu (4:3.3.2-2) unstable; urgency=high
+
+  * Fixed buffer overflows in fliccd, one of the INDI drivers shipped with
+    kstars (closes: #295499).  See the following URL for further information:
+    - http://www.kde.org/info/security/advisory-20050215-1.txt
+    References: CAN-2005-0011
+  * Patched the sources directly (i.e., the patch shows up in the usual
+    debian diff but not as an extra file in debian/patches), since this is
+    a non-debian-specific problem that is already fixed in upstream CVS.
+
+ -- Ben Burton <bab at debian.org>  Thu, 17 Feb 2005 07:53:09 +1100
+
+kdeedu (4:3.3.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * The moon images are now licensed under the GPL (closes: #266404).
+  * Built against boost 1.32.0.
+  * Re-enabled boost.python scripting on arm, since it now seems to be
+    compiling with boost 1.32.0.
+  * Added a test in debian/rules to make the build fail if the boost libraries
+    are not built.
+
+ -- Ben Burton <bab at debian.org>  Sun, 16 Jan 2005 20:45:11 +1100
+
+kdeedu (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * Add directory /usr/share/doc/kde/HTML/en/flashkard to kdeedu-doc-html
+    to prevent .dhelp problem.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 16 Mar 2005 18:35:25 +0000
+
+kdeedu (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+  * New upstream release
+  * cleanup debian/patches dir
+
+ -- Andreas Mueller <amu at ubuntu.com>  Wed,  9 Mar 2005 18:09:17 +0000
+
+kdeedu (4:3.3.2-1ubuntu2) hoary; urgency=low
+
+  * SECURITY UPDATE: Buffer overflow in fliccd of kdeedu/kstars/indi
+  * added 01-kstars-indi-fliccd-overflows.diff which fixes buffer overflows
+  * References:
+    CAN-2005-0011
+    http://www.kde.org/info/security/advisory-20050215-1.txt
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 17 Feb 2005 02:44:19 +0000
+
+kdeedu (4:3.3.2-1ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+
+ -- Andreas Mueller <amu at canonical.com>  Sun, 16 Jan 2005 03:38:05 +0100
+
+kdeedu (4:3.3.1-3) unstable; urgency=medium
+
+  * Sigh.  Patched kstars platform tests for m68k.  This _really_ is
+    every arch dealt with.
+
+ -- Ben Burton <bab at debian.org>  Fri, 12 Nov 2004 07:39:04 +1100
+
+kdeedu (4:3.3.1-2) unstable; urgency=medium
+
+  * Patched platform tests in kstars to include mips and mipsel.
+
+ -- Ben Burton <bab at debian.org>  Wed, 10 Nov 2004 07:45:35 +1100
+
+kdeedu (4:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Platform tests in kstars code now expanded to include s390 and powerpc
+    (closes: #278341).
+  * Build-conflicts with autoconf2.13, which does not play well with
+    Makefile.common.
+  * KTurtle no longer crashes on configure (closes: #278234).
+  * Patched KTurtle so that the default language is in fact one of the
+    supported KTurtle languages and not a different dialect.  This fixes
+    the broken examples directory as well as KTurtle refusing to run any
+    commands.
+  * Cosmetic updates to some manpages.
+
+ -- Ben Burton <bab at debian.org>  Thu, 28 Oct 2004 08:35:18 +1000
+
+kdeedu (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * New binary packages klatin, kturtle and kwordquiz.
+  * Package flashkard is no longer shipped with kdeedu.
+  * There is no longer a need to pull data out of the upstream tarball,
+    since upstream no longer ships with the (non-free) Messier images.
+  * Made libkdeedu-dev depend on kdelibs4-dev.
+  * KStars now shows borders between constellations (closes: #241930) and
+    supports full-screen mode (closes: #219649).
+  * KTouch now waits for a keypress before starting and also provides a
+    pause button (closes: #129523).
+  * A little more documentation is now installed for libkdeedu-dev.
+
+ -- Ben Burton <bab at debian.org>  Sat, 16 Oct 2004 15:32:36 +1000
+
+kdeedu (4:3.2.3-2) unstable; urgency=low
+
+  * Disable kig scripting on arm while boost.python remains broken on
+    that architecture.
+
+ -- Ben Burton <bab at debian.org>  Sat, 17 Jul 2004 11:19:00 +1000
+
+kdeedu (4:3.2.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Added manpages for KStars INDI server and device drivers.
+  * Suggests (konqueror | www-browser) for kdeedu-doc-html instead of
+    just www-browser.
+  * Added debian/clean-sources to simplify removal of non-DFSG-free material.
+
+ -- Ben Burton <bab at debian.org>  Sun, 20 Jun 2004 09:48:28 +1000
+
+kdeedu (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Built against Boost.Python 1.31.0, which in turn is built against
+    Python 2.3 (closes: #243079, #245135).
+
+ -- Ben Burton <bab at debian.org>  Thu, 22 Apr 2004 18:15:48 +1000
+
+kdeedu (4:3.2.1-2) unstable; urgency=low
+
+  * Don't use Conflicts/Replaces where we should just use Replaces.
+
+ -- Ben Burton <bab at debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
+
+kdeedu (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
+
+kdeedu (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).
+  * Split kstars into kstars / kstars-data.
+  * Split klettres into klettres / klettres-data.
+  * Using versioned dependencies for the kdeedu metapackage.
+
+ -- Ben Burton <bab at debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
+
+kdeedu (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.
+  * New binary packages kbruch and kig.
+
+ -- Ben Burton <bab at debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
+
+kdeedu (4:3.1.5-2) unstable; urgency=low
+
+  * Building with -mieee on alpha to avoid kstars SIGFPE (closes: #226966).
+
+ -- Ben Burton <bab at debian.org>  Tue, 20 Jan 2004 09:52:13 +1100
+
+kdeedu (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
+
+kdeedu (4:3.1.4-3) unstable; urgency=low
+
+  * Kiten recommends Japanese fonts (closes: #216440).
+  * Kiten depends on edict and kanjidic instead of supplying its own
+    copies (closes: #217196).
+
+ -- Ben Burton <bab at debian.org>  Sun, 21 Dec 2003 20:03:28 +1100
+
+kdeedu (4:3.1.4-2) unstable; urgency=low
+
+  * New pull from BRANCH; includes bugfixes for kstars.
+  * Fixed Saskatchewan time zones (closes: #206642).
+  * Fixed incomplete sentences in tips of the day (closes: #196943).
+
+ -- Ben Burton <bab at debian.org>  Fri, 12 Dec 2003 11:02:33 +1100
+
+kdeedu (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Using the new debian_branch for kstars, which now uses the Hipparcos
+    catalog and for which all non-DFSG-free images have been either removed or
+    replaced.  The copyright file has been updated accordingly, including
+    license information for both the catalog and images.  Thanks very much to
+    Jason Harris for his hard work on this (closes: #198499).
+  * KVocTrain no longer segfaults with inline editing (closes: #196211).
+  * Split debian menu titles into title/longtitle (closes: #196666).
+  * Changed several debian menu sections to Apps/Education.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab at debian.org>  Mon, 13 Oct 2003 11:29:44 +1000
+
+kdeedu (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Libtool updated (closes: #194479).
+  * Debian menu pixmaps no longer use a restricted colour map.
+  * Have kstars suggest konqueror since it offers the user online resources
+    (closes: #192734).
+  * Man page overhaul.
+
+ -- Ben Burton <bab at debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
+
+kdeedu (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab at debian.org>  Sun, 23 Mar 2003 15:23:23 +1100
+
+kdeedu (4:3.1.0-3) unstable; urgency=low
+
+  * Uses full paths in doc-base files instead of symlinks (closes: #180332).
+
+ -- Ben Burton <bab at debian.org>  Tue, 11 Feb 2003 14:45:59 +1100
+
+kdeedu (4:3.1.0-2) unstable; urgency=low
+
+  * First KDE3 upload to debian (closes: #119019).
+  * Rolled the epoch to aid upgrades from the unofficial repository on
+    ftp.kde.org.. *sigh*
+
+ -- Ben Burton <bab at debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
+
+kdeedu (3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab at debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
+
+kdeedu (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
+
+kdeedu (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
+
+kdeedu (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
+
+kdeedu (3.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
+
+kdeedu (3.0.1-1) unstable; urgency=low
+
+  * Initial Debian release (closes: Bug#119019).
+
+ -- Ben Burton <benb at acm.org>  Sun, 19 May 2002 18:44:16 +1000
+
+Local variables:
+mode: debian-changelog
+End:

Added: people/jriddell/KDE/3.5/kdeedu/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,480 @@
+Source: kdeedu
+Section: kde
+Priority: optional
+Maintainer: Ben Burton <bab at debian.org>
+Build-Depends: automake1.7, debhelper (>> 4.0.0), kdelibs4-dev (>= 4:3.5.1), libboost-python-dev (>= 1.32.0)
+Build-Conflicts: autoconf2.13
+Standards-Version: 3.6.2.1
+
+Package: kdeedu
+Architecture: all
+Section: kde
+Depends: kalzium (>= ${Source-Version}), kbruch (>= ${Source-Version}), kdeedu-data (>= ${Source-Version}), keduca (>= ${Source-Version}), khangman (>= ${Source-Version}), kig (>= ${Source-Version}), kiten (>= ${Source-Version}), klatin (>= ${Source-Version}), klettres (>= ${Source-Version}), kanagram (>= ${Source-Version}), kmplot (>= ${Source-Version}), kpercentage (>= ${Source-Version}), kstars (>= ${Source-Version}), ktouch (>= ${Source-Version}), kturtle (>= ${Source-Version}), kverbos (>= ${Source-Version}), kvoctrain (>= ${Source-Version}), kwordquiz (>= ${Source-Version})
+Suggests: kdeedu-doc-html
+Description: educational apps from the official KDE release
+ This is a collection of educational applications provided with the official
+ release of KDE (the K Desktop Environment).
+
+Package: kdeedu-data
+Architecture: all
+Section: kde
+Suggests: kdeedu
+Description: shared data for KDE educational applications
+ This package contains shared data necessary for running the educational
+ applications provided with KDE (the K Desktop Environment).
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kdeedu-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdeedu
+Description: KDE edutainment documentation in HTML format
+ By default the educational applications 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 edutainment 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/kalzium/.  Documentation is provided for most
+ KDE edutainment packages.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kalzium
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: chemistry teaching tool for KDE
+ Kalzium is a program which shows you the Periodic System of Elements (PSE).
+ You can use Kalzium to search for information about the elements or to
+ learn facts about the PSE.
+ .
+ Kalzium provides you with all kinds of information about the PSE.  You
+ can look up lots of information about the elements and also use
+ visualisations to show them.
+ .
+ You can visualise the Periodic Table of the Elements by blocks, groups,
+ acidic behavior or different states of matter.  You can also plot data for
+ a range of elements (weight, mean weight, density, IE1, IE2,
+ electronegativity), and you can go back in time to see what elements were
+ known at a given date.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: blinken
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter, kdeedu-doc-html
+Description: the well-known game Simon Says for KDE
+ Follow the pattern of sounds and lights as long as you can! Press the
+ start game button to begin. Watch the computer and copy the pattern it
+ makes. Complete the sequence in the right order to win.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kbruch
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: fraction calculation teaching tool for KDE
+ KBruch is a small program to practice calculating with fractions.
+ Different exercises are provided for this purpose.  The program checks
+ the user's input and gives feedback.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: keduca
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: interactive form-based tests for KDE
+ KEduca is a flash-card application which allows you to make
+ interactive form-based tests.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: khangman
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: the classical hangman game for KDE
+ KHangMan is a game based on the well known hangman game.  It is aimed
+ for children aged 6 and above.  It has four levels of difficulty:
+ Animals (animals words), Easy, Medium and Hard.
+ .
+ A word is picked at random and the letters are hidden.  You must guess
+ the word by trying one letter after another.  Each time you guess a wrong
+ letter, a picture of a hangman is drawn.  You must guess the word before
+ getting hanged!  You have 10 tries.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kig
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: interactive geometry program for KDE
+ Kig is an application for interactive geometry.  It is intended to serve
+ two purposes:
+ .
+  - to allow students to interactively explore mathematical figures and
+    concepts using the computer;
+  - to serve as a WYSIWYG tool for drawing mathematical figures and
+    including them in other documents.
+ .
+ With this program you can do geometry on a computer just like you would
+ on a blackboard in a classroom.  However, the program allows you to move
+ and change parts of a geometrical drawing so that you can see how the other
+ parts change as a result.
+ .
+ Kig supports loci and user-defined macros.  It also supports imports
+ and exports to/from foreign file formats including Cabri, Dr. Geo, KGeo,
+ KSeg and XFig.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kiten
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version}), ttf-kochi-gothic | ttf-kochi-mincho
+Suggests: khelpcenter, kdeedu-doc-html
+Description: Japanese reference/study tool for KDE
+ Kiten is a Japanese reference and study tool for KDE.  It is an
+ application with multiple functions.  Firstly, it is a convenient
+ English to Japanese and Japanese to English dictionary.  Secondly, it is
+ a Kanji dictionary, with multiple ways to look up specific characters.
+ Thirdly, it is a tool to help you learn Kanji.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: klatin
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: application to help revise/teach Latin
+ KLatin is a program to help revise Latin.  There are three "sections" in
+ which different aspects of the language can be revised.  These are the
+ vocabulary, grammar and verb testing sections.  In addition there is a
+ set of revision notes that can be used for self-guided revision.
+ .
+ In the vocabulary section an XML file is loaded containing various
+ words and their local language translations.  KLatin asks you what each
+ of these words translate into.  The questions take place in a
+ multiple-choice environment.
+ .
+ In the grammar and verb sections KLatin asks for a particular part of a
+ noun or a verb, such as the "ablative singular", or the "1st person
+ indicative passive plural", and is not multiple choice.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: klettres
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, klettres-data (= ${Source-Version})
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: foreign alphabet tutor for KDE
+ KLettres is an application specially designed to help the user to
+ learn the alphabet in a new language and then to learn to read simple
+ syllables.  The user can be a young child aged from two and a half or an
+ adult that wants to learn the basics of a foreign language.
+ .
+ Seven languages are currently available: Czech, Danish, Dutch, English,
+ French, Italian and Slovak.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: klettres-data
+Architecture: all
+Section: kde
+Recommends: klettres (= ${Source-Version})
+Replaces: klettres (<< 4:3.2.0.1)
+Description: data files for KLettres foreign alphabet tutor
+ This package contains architecture-independent data files for KLettres,
+ the foreign alphabet tutor for KDE.  This includes sound files and
+ graphics.
+ .
+ See the klettres package for further information.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kanagram
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Replaces: kmessedwords
+Conflicts: kmessedwords
+Description: letter order game for KDE
+ Kanagram is a game that is based on the word/letter puzzles that the
+ author played as a child.  A word is picked at random and displayed with
+ its letters in a messed order, with difficulty dependent on the chosen level.
+ You have an unlimited number of attempts, and scores are kept.
+ .
+ It is a very simply constructed game, with 3 dificulty levels of play.
+ It is fully customizable, allowing you to write in your own words and set
+ your own 'look and feel' of the game.  It is aimed for children aged 10+
+ because of the dificulty, but of course everyone is welcome to try.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kgeography
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: geography learning program
+ KGeography is a geography learning program.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kmplot
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: mathematical function plotter for KDE
+ KmPlot is a mathematical function plotter for KDE.  It has a powerful
+ built-in parser.  You can plot different functions simultaneously and
+ combine them to build new functions.
+ .
+ KmPlot supports parametric functions and functions in polar
+ coordinates.  Several grid modes are supported.  Plots may be printed
+ with high precision in the correct scale.
+ .
+ KmPlot also provides some numerical and visual features, like
+ filling and calculating the area between the plot and the first axis,
+ finding maximum and minimum values, changing function parameters
+ dynamically and plotting derivatives and integral functions.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kpercentage
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: percentage calculation teaching tool for KDE
+ KPercentage is a small math application that will help pupils to
+ improve their skills in calculating percentages.
+ .
+ There is a special training section for the three basic tasks.  Finally
+ the pupil can select a random mode, in which all three tasks are mixed
+ randomly.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kstars
+Architecture: any
+Section: science
+Depends: ${shlibs:Depends}, kstars-data (= ${Source-Version})
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: konqueror, khelpcenter, kdeedu-doc-html
+Description: desktop planetarium for KDE
+ KStars is a graphical desktop planetarium for KDE.  It depicts an
+ accurate simulation of the night sky, including stars, constellations,
+ star clusters, nebulae, galaxies, all planets, the Sun, the Moon,
+ comets and asteroids.  You can see the sky as it appears from any
+ location on Earth, on any date.
+ .
+ The user interface is highly intuitive and flexible.  The display can
+ be panned and zoomed with the mouse, and you can easily identify
+ objects and track their motion across the sky.  KStars includes many
+ powerful features, yet the interface is clean and simple and fun to use.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kstars-data
+Architecture: all
+Section: science
+Recommends: kstars (= ${Source-Version})
+Replaces: kstars (<< 4:3.2.0.1)
+Description: data files for KStars desktop planetarium
+ This package contains architecture-independent data files for KStars,
+ the graphical desktop planetarium for KDE.  This includes star
+ catalogues and astronomical images.
+ .
+ See the kstars package for further information.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: ktouch
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: touch typing tutor for KDE
+ KTouch is a program for learning touch typing - it helps you learn to
+ type on a keyboard quickly and correctly.  Every finger has its place on
+ the keyboard with associated keys to press.
+ .
+ KTouch helps you learn to touch type by providing you with text to
+ train on, and adjusts to different levels depending on how good you are.
+ It can display which key to press next, and the correct finger to use.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kturtle
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: educational Logo programming environment
+ KTurtle is an educational programming environment using the Logo
+ programming language.  It tries to make programming as easy and
+ accessible as possible.  This makes KTurtle suitable for teaching kids
+ the basics of mathematics, geometry and programming.
+ .
+ The commands used to program are in the style of the Logo programming
+ language.  The unique feature of Logo is that the commands are often
+ translated into the speaking language of the programmer.
+ .
+ KTurtle is named after "the turtle" that plays a central role in the
+ programming environment.  The user programs the turtle, using the Logo
+ commands, to draw a picture on the canvas.
+ .
+ Note that this version of Logo is only focused on the educational
+ qualities of the programming language and will not try to suit
+ professional programmers' needs.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kverbos
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: Spanish verb form study application for KDE
+ Kverbos allows the user to learn the forms of Spanish verbs.  The program
+ suggests a verb and a time and the user enters the different verb forms.
+ The program corrects the user input and gives feedback.
+ .
+ The user can edit the list of the verbs that can be studied.  The program
+ can build regular verb forms by itself.  Irregular verb forms have to be
+ entered by the user.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kvoctrain
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, ${perl:Depends}, libwww-perl
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: vocabulary trainer for KDE
+ KVocTrain is a little utility to help you train your vocabulary when you
+ are trying to learn a foreign language.  You can create your own database
+ with the words you need.  It is intended as a replacement for index
+ (flash) cards.
+ .
+ You probably remember flashcards from school.  The teacher would write the
+ original expression on the front side of the card and the translation on
+ the back.  Then look at the cards one after another.  If you knew the
+ translation, you could put it away.  If you failed, you put it back to
+ try again.
+ .
+ KVocTrain is not intended to teach you grammer or other sophisticated
+ things.  This is and probably will stay beyond the scope of this application.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: kwordquiz
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kdeedu-data (>= ${Source-Version})
+Suggests: khelpcenter, kdeedu-doc-html
+Description: flashcard and vocabulary learning program for KDE
+ KWordQuiz is a flashcard-based tool that helps you to master new
+ vocabularies.  It may be a language or any other kind of terminology.
+ .
+ KWordQuiz can open several types of vocabulary data.  Supported are .kvtml
+ files used by other KDE programs such as KVocTrain, .wql files used by
+ WordQuiz for Windows, .csv files with comma-separated text, and .xml.gz
+ files created by Pauker (http://pauker.sourceforge.net/).
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: libkdeedu3
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Replaces: libkdeedu1
+Conflicts: libkdeedu1
+Description: library for use with KDE educational apps
+ The KDE-based library libkdeedu is used with educational applications.
+ It currently provides support for data plotting and vocabulary items
+ (including a parser for kvtml vocabulary files).
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: libkdeedu-dev
+Architecture: any
+Section: libdevel
+Depends: libkdeedu3 (= ${Source-Version}), kdelibs4-dev (>= 4:3.4.2-1)
+Description: development files for KDE educational library
+ The KDE-based library libkdeedu is used with educational applications.
+ It currently provides support for data plotting and vocabulary items
+ (including a parser for kvtml vocabulary files).
+ .
+ Development files for libkdeedu are included in this package.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: libkiten1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, edict, kanjidic
+Recommends: ttf-kochi-gothic | ttf-kochi-mincho
+Suggests: kiten
+Replaces: kiten (<< 4:3.4.0)
+Description: library for Kiten Japanese reference/study tool
+ Kiten is a Japanese reference/study tool for KDE.  The library libkiten
+ contains portions of Kiten that may be useful for other applications.
+ These portions include dictionary, character lookup and widget classes.
+ .
+ This package contains the libkiten library along with supporting data,
+ such as Japanese language data files and GUI resource files.  For further
+ information, see the kiten package.
+ .
+ This package is part of the official KDE edutainment module.
+
+Package: libkiten-dev
+Architecture: any
+Section: libdevel
+Depends: libkiten1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.4.2-1)
+Description: development files for Kiten library
+ Kiten is a Japanese reference/study tool for KDE.  The library libkiten
+ contains portions of Kiten that may be useful for other applications.
+ These portions include dictionary, character lookup and widget classes.
+ .
+ Development files for libkiten are included in this package.  For
+ further information, see the kiten package.
+ .
+ This package is part of the official KDE edutainment module.
+

Added: people/jriddell/KDE/3.5/kdeedu/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,623 @@
+This package was debianised by Ben Burton <bab at debian.org> on
+Sun, 19 May 2002 18:44:16 +1000.
+Thanks to Karl Soderstrom and Gregory J. Oschwald for originally packaging
+kstars and ktouch respectively.
+
+It was downloaded via CVS from cvs.kde.org.
+
+Upstream Authors:
+
+  Kalzium: Carsten Niehaus <cniehaus at kde.org>
+  KBruch: Sebastian Stein <seb.kde at hpfsc.de>,
+      Eva Brucherseifer <eva at kde.org> and others
+  KEduca: Javier Campos <javi at asyris.org>, Klas Kalass <klas at kde.org>,
+      Henrique Pinto <henrique.pinto at kdemail.net>,
+      Anne-Marie Mahfouf <annma at kde.org>
+  KHangMan: Primoz Anzur <zerokode at gmx.net>, Anne-Marie Mahfouf <annma at kde.org>
+  Kig: Dominique Devriese <devriese at kde.org>,
+      Maurizio Paolini <paolini at dmf.bs.unicatt.it>,
+      Franco Pasquarelli <pasqui at dmf.bs.unicatt.it>,
+      Pino Toscano <toscano.pino at tiscali.it> and others
+  Kiten: Jason Katz-Brown <jason at katzbrown.com>,
+      Jim Breen <jwb at csse.monash.edu.au>,
+      Neil Stevens <neil at qualityassistant.com>
+  KLatin: George Wright <gwright at kde.org> and others
+  KLettres: Anne-Marie Mahfouf <annma at kde.org> and many others
+  KMathTool: Birgit Schulz <B.Schulz at Superlehrer.de>,
+      Marco Wegner <mail at marcowegner.de>
+  KMessedWords: Primoz Anzur <zerokode at gmx.net>,
+      Waldo Bastian <bastian at kde.org>, Daniel Molkentin <molkentin at kde.org>,
+      Reuben Sutton <reuben at microsucks.co.uk>,
+      Anne-Marie Mahfouf <annma at kde.org>
+  KmPlot: Klaus-Dieter Möller <kdmoeller at foni.net>,
+      Matthias Messmer <bmlmessmer at web.de>,
+      Fredrik Edemar <f_edemar at linux.se>
+  KPercentage: Matthias Messmer <bmlmessmer at web.de>,
+      Carsten Niehaus <cniehaus at gmx.de>,
+      Robert Gogolok <mail at robert-gogolok.de>
+  KStars: Jason Harris <jharris at 30doradus.org>,
+      Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+      Pablo de Vicente <pvicentea at wanadoo.es>,
+      Jasem Mutlaq <mutlaqja at ikarustech.com>, Carsten Niehaus <cniehaus at gmx.de>,
+      Mark Hollomon <mhh at mindspring.com>, Vincent Jagot <vincent.jagot at free.fr>,
+      Martin Piskernig <martin.piskernig at stuwo.at>
+  KTouch: Haavard Froeiland <haavard at users.sourceforge.net>,
+      Andreas Nicolai <Andreas.Nicolai at gmx.net>
+  KTurtle: Cies Breijs <cies # kde.nl>,
+      Walter Schreppers <Walter.Schreppers # ua.ac.be>,
+      Anne-Marie Mahfouf <annemarie.mahfouf # free.fr>
+  Kverbos: Arnold Kraschinski <arnold.k67 at gmx.de>
+  KVocTrain: Ewald Arnold <kvoctrain at ewald-arnold.de>,
+      Peter Hedlund <peter at peterandlinda.com>
+  KWordQuiz: Peter Hedlund <peter at peterandlinda.com>
+  libkdeedu: Scott Wheeler <wheeler at kde.org>,
+      Jason Harris <jharris at 30doradus.org>
+
+Copyright:
+
+  All components of this package are released under the GNU General
+  Public License (GPL), with the following exceptions.  Note that the
+  abbreviation LGPL refers to the GNU Library General Public License.
+
+    Kiten: (see below)
+    KStars: (see below)
+    KVocTrain: GPL, though some source files are under the LGPL
+    KWordQuiz: GPL, though many source files are under the LGPL
+    Libraries:
+      libextdate.so: Sources under a mixture of GPL and LGPL
+      libkdeeducore.so: LGPL
+    DocBook documentation: (see below)
+
+  On Debian GNU/Linux systems, the complete texts of the GPL and the LGPL
+  can be found in the files `/usr/share/common-licenses/GPL' and
+  `/usr/share/common-licenses/LGPL` respectively.
+
+  --------------------
+
+  Kiten:
+
+    This application is released under the GPL, though a few of its
+    source files are under the following license:
+
+      Copyright (C) 2001 Neil Stevens <neil at qualityassistant.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).
+
+  --------------------
+
+  KStars:
+
+    While KStars itself is released under the GPL, its INDI server and
+    drivers, its data catalogue and some of its images are under different
+    licenses as follows.
+
+    INDI server and drivers:
+
+      Released under the LGPL, with the following exceptions:
+
+        The ColourConVerT library along with some related code is released
+        under the GPL.  This is used in the V4L and Philips webcam drivers.
+
+        The file celestronprotocol.c is released under the GPL.  This is
+        used in the Celestron GPS driver.
+
+        The Finger Lakes Instruments driver is released under the
+        following license:
+
+          Copyright (c) 2000, 2002 Finger Lakes Instrumentation (FLI), L.L.C.
+          All rights reserved.
+
+          Redistribution and use in source and binary forms, with or without
+          modification, are permitted provided that the following conditions
+          are met:
+
+                Redistributions of source code must retain the above copyright
+                notice, this list of conditions and the following disclaimer.
+
+                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.
+
+                Neither the name of Finger Lakes Instrumentation (FLI), LLC
+                nor the names of its contributors may be used to endorse or
+                promote products derived from this software without specific
+                prior written permission.
+
+          THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+          ``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.
+
+        The FITS reading/writing library is released under the GPL.
+        This is used in the static libindicom library that is linked
+        into KStars.
+
+    Star catalogue:
+
+      Star catalog derived from the Hipparcos and Tycho star catalogs.
+      These catalogs are in the public domain, and can be obtained from
+      http://cdsweb.u-strasbg.fr/viz-bin/Cat?I/239
+
+      Changes made to the raw catalog include stripping out certain data
+      fields, reformatting, and manual matching up common and genetive
+      star names.  The modified catalog is (C) Jason Harris, 2003, and is
+      licensed under the terms of the GNU General Public License (GPL):
+      http://www.gnu.org/licenses/gpl.html
+
+      The Hipparcos data is in the public domain and may be used
+      by anyone. We do request however that use of the catalogue data
+      is acknowledged. Something similar to "This application
+      makes use of the  Hipparcos and Tycho catalogues (ESA, 1997)"
+      could be appropriate, and a link to the ESA Hipparcos web pages
+      (http://sci.esa.int/hipparcos) would also be appreciated.
+
+    Images:
+
+      KStars uses images in the skymap that are under copyright.  
+      In most cases, these images are freely available for 
+      non-commercial uses.  When required, we have obtained 
+      permission from the image's author.  For each image, we 
+      credit the author or source and provide a link to their 
+      website, when available.
+
+      Key:
+      PD:       Public Domain
+      CR:       Authorship Credit Requested
+      GPL:      Released under the General Public License
+
+      NASA/GSFC:Nat'l Aeronautics and Space Admin./Goddard Spaceflight Center
+
+
+      Planets Inline Image Credits:
+      Mercury:  NASA/GSFC (PD/CR)
+      Venus:    NASA/GSFC (PD/CR)
+      Moon:     based on a photo contributed by Frank Stefani (GPL)
+      Mars:     NASA and Hubble Heritage team (PD/CR)
+      Jupiter:  NASA/GSFC (PD/CR)
+      Saturn:   NASA and Hubble Heritage team (PD/CR)
+      Uranus:   Erich Karkoschka (University of Arizona) and NASA (PD/CR)
+      Neptune:  NASA Voyager 2 (PD/CR)
+      Pluto:    NASA/GSFC (PD/CR)
+
+  --------------------
+
+  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/kdeedu/debian/fliccd.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/fliccd.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/fliccd.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 FLICCD 1 "March 16, 2005"
+.\" 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
+fliccd \- Finger Lakes Instruments CCD driver for INDI telescope control
+.SH SYNOPSIS
+.B v4ldriver
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBfliccd\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/indiserver.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/indiserver.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/indiserver.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,123 @@
+.\"                                      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 INDISERVER 1 "October 16, 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
+indiserver \- INDI server for telescope control under KStars
+.SH SYNOPSIS
+.B indiserver
+[ \fB\-p\fP \fIport\fP ]
+[ \fB\-r\fP \fIattempts\fP ]
+[ \fB\-vv\fP ]
+\fIdriver\fP [ \fIdriver\fP ... ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBindiserver\fP is a server that sits between the
+KStars user interface and the low-level hardware drivers.
+.PP
+The INDI server is a network server, in that either local or remote clients
+may connect to it to control astronomical instruments.  The INDI server must
+be running on the machine that is physically connected to the
+astronomical instruments.
+.PP
+Note that there is no need for you to run the INDI server directly.  Using
+the KStars device manager, you can set up astronomical instruments and start
+or stop the INDI server all from within KStars.
+.PP
+You may however choose to run the INDI server manually from the command
+line.  In this case you must pass the names of one or more drivers for
+individual astronomical instruments.  The current list of available
+drivers is:
+.PP
+.RS
+celestrongps (Celestron GPS)
+.br
+fliccd (Finger Lakes Instruments CCD)
+.br
+lx200_16 (LX200 16")
+.br
+lx200autostar (LX200 Autostar)
+.br
+lx200classic (LX200 Classic)
+.br
+lx200generic (LX200 Generic)
+.br
+lx200gps (LX200 GPS)
+.br
+temma (Temma Takahashi)
+.br
+v4ldriver (Video4Linux Generic)
+.br
+v4lphilips (Philips Webcam)
+.RE
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-p\fP \fIport\fP
+Specify the port to listen on (defaults to 7624).
+.TP
+\fB\-r\fP \fIattempts\fP
+Specify the maximum number of restart attempts for each driver (defaults to 2).
+.TP
+\fB\-vv\fP
+Write more verbose output to stderr.
+.SH EXAMPLE
+To start an INDI server running an LX200 GPS driver and listening to
+connections on port 8000:
+.PP
+.RS
+\fIprompt$\fP indiserver -p 8000 lx200gps
+.RE
+.SH SEE ALSO
+.BR celestrongps (1),
+.BR fliccd (1),
+.BR lx200_16 (1),
+.BR lx200autostar (1),
+.BR lx200classic (1),
+.BR lx200generic (1),
+.BR lx200gps (1),
+.BR kstars (1),
+.BR temma (1),
+.BR v4ldriver (1),
+.BR v4lphilips (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/kalzium.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kalzium.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kalzium.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,55 @@
+.\"                                      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 KALZIUM 1 "March 16, 2005"
+.\" 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
+kalzium \- a chemistry teaching tool for KDE
+.SH SYNOPSIS
+.B kalzium
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKalzium\fP is a program which shows you the Periodic System of
+Elements (PSE).  You can use Kalzium to search for information about
+the elements or to learn facts about the PSE.
+.PP
+Kalzium provides you with all kinds of information about the PSE. You
+can look up lots of information about the elements and also use
+visualisations to show them.
+.PP
+You can visualize the Periodic Table of the Elements by blocks, groups,
+acidic behavior or different states of matter.  You can also plot data for a
+range of elements (weight, mean weight, density, IE1, IE2, electronegativity),
+and you can go back in time to see what elements were known at a given date.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkalzium \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kalzium/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kalzium/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kalzium/\fP.
+.SH AUTHOR
+Kalzium was written by Carsten Niehaus <cniehaus 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/kdeedu/debian/kalzium.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kalzium.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kalzium.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Kalzium for Debian
+------------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kalzium.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kalzium.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kalzium.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+usr/bin/kalzium
+usr/share/applications/kde/kalzium.desktop
+usr/share/apps/kalzium
+usr/share/config.kcfg/kalzium.kcfg
+usr/share/doc/kde/HTML/en/kalzium/*.docbook
+usr/share/doc/kde/HTML/en/kalzium/*.png
+usr/share/doc/kde/HTML/en/kalzium/common
+usr/share/doc/kde/HTML/en/kalzium/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/kalzium.png
+usr/share/icons/hicolor/16x16/apps/kalzium.png
+usr/share/icons/hicolor/22x22/apps/kalzium.png
+usr/share/icons/hicolor/32x32/apps/kalzium.png
+usr/share/icons/hicolor/48x48/apps/kalzium.png
+usr/share/icons/hicolor/64x64/apps/kalzium.png
+usr/share/icons/hicolor/scalable/apps/kalzium.svgz
+
+../kalzium.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kalzium.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kalzium.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kalzium.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(kalzium):needs="X11"\
+  section="Apps/Science"\
+  hints="KDE"\
+  title="Kalzium"\
+  longtitle="Kalzium (Periodic Table of Elements)"\
+  command="/usr/bin/kalzium"\
+  icon="/usr/share/pixmaps/kalzium.xpm"

Added: people/jriddell/KDE/3.5/kdeedu/debian/kalzium.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kalzium.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kalzium.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,73 @@
+/* XPM */
+static char * kalzium_xpm[] = {
+"32 32 38 1",
+" 	c None",
+".	c #000000",
+"+	c #010000",
+"@	c #020000",
+"#	c #030000",
+"$	c #040000",
+"%	c #040001",
+"&	c #050000",
+"*	c #040005",
+"=	c #040007",
+"-	c #070000",
+";	c #090000",
+">	c #04000F",
+",	c #030024",
+"'	c #03002A",
+")	c #03002F",
+"!	c #200000",
+"~	c #020060",
+"{	c #2B0000",
+"]	c #010079",
+"^	c #010088",
+"/	c #340000",
+"(	c #01008F",
+"_	c #360000",
+":	c #0000A4",
+"<	c #0000A5",
+"[	c #0000A9",
+"}	c #0000AD",
+"|	c #0000B1",
+"1	c #0000B2",
+"2	c #0000B3",
+"3	c #5D0000",
+"4	c #780000",
+"5	c #8F0000",
+"6	c #990000",
+"7	c #A80000",
+"8	c #AA0000",
+"9	c #AB0000",
+"                                ",
+"                     2222212    ",
+"                    122222222   ",
+"                   22222222222  ",
+"                  222222222222  ",
+"                  2222222222222 ",
+"                  2222222222222 ",
+"                  2:22222222222 ",
+"                  )>(2222222222 ",
+"     .....      $$$$>122222222  ",
+"    ........  $$$$$$$(2|]^[222  ",
+"   .........+$$$$$$*~}<%$$'22   ",
+"  ...........@$$$$$  1[$$$,2    ",
+" ............+$$$      $$$=     ",
+" .............$        $$$$     ",
+" .............         $$$$     ",
+" .............         $$$$     ",
+" .........##+.         $$$$     ",
+"  .......@$$$$         ;_!&     ",
+"   ......#$$$$$$      999987    ",
+"    .....@$$$$$$$$  999999999   ",
+"     .....  $$$$$$${6999999999  ",
+"             $$$$$$$39999999999 ",
+"               $$$$$49999999999 ",
+"                 $-/79999999999 ",
+"                  5799999999999 ",
+"                  9999999999999 ",
+"                   999999999999 ",
+"                   99999999999  ",
+"                    8999999999  ",
+"                     99999999   ",
+"                       999      "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kanagram.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,54 @@
+.\"                                      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 KANAGRAM 1 "March 16, 2005"
+.\" 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
+kanagram \- a letter order game for KDE
+.SH SYNOPSIS
+.B kanagram
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKanagram\fP is a game that is based on the word/letter puzzles that the
+author played as a child.  A word is picked at random and displayed with
+its letters in a messed order, with difficulty dependent on the chosen level.
+You have an unlimited number of attempts, and scores are kept.
+.PP
+It is a very simply constructed game, with 3 dificulty levels of play.
+It is fully customizable, allowing you to write in your own words and set
+your own 'look and feel' of the game.  It is aimed for children aged 10+
+because of the dificulty, but of course everyone is welcome to try.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkanagram \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kanagram/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kanagram/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kanagram/\fP.
+.SH AUTHOR
+Kanagram was written by Primoz Anzur <zerokode at gmx.net>,
+Waldo Bastian <bastian at kde.org>, Daniel Molkentin <molkentin at kde.org>,
+Reuben Sutton <reuben at microsucks.co.uk> and Anne-Marie Mahfouf <annma 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/kdeedu/debian/kanagram.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Kanagram for Debian
+-----------------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kanagram.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+usr/bin/kanagram
+usr/share/applications/kde/kanagram.desktop
+usr/share/apps/kanagram
+usr/share/config.kcfg/kanagram.kcfg
+usr/share/doc/kde/HTML/en/kanagram/*.docbook
+usr/share/doc/kde/HTML/en/kanagram/*.png
+usr/share/doc/kde/HTML/en/kanagram/common
+usr/share/doc/kde/HTML/en/kanagram/compilation.html
+usr/share/doc/kde/HTML/en/kanagram/configuring.html
+usr/share/doc/kde/HTML/en/kanagram/credits.html
+usr/share/doc/kde/HTML/en/kanagram/index.cache.bz2
+usr/share/doc/kde/HTML/en/kanagram/index.html
+usr/share/doc/kde/HTML/en/kanagram/installation.html
+usr/share/doc/kde/HTML/en/kanagram/introduction.html
+usr/share/doc/kde/HTML/en/kanagram/main_overlay.svgz
+usr/share/doc/kde/HTML/en/kanagram/newstuff-config.html
+usr/share/doc/kde/HTML/en/kanagram/using-kanagram.html
+usr/share/icons/hicolor/128x128/apps/kanagram.png
+usr/share/icons/hicolor/16x16/apps/kanagram.png
+usr/share/icons/hicolor/22x22/apps/kanagram.png
+usr/share/icons/hicolor/32x32/apps/kanagram.png
+usr/share/icons/hicolor/48x48/apps/kanagram.png
+usr/share/icons/hicolor/scalable/apps/kanagram.svgz
+
+../kanagram.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kanagram.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(kanagram):needs="X11"\
+  section="Games/Puzzles"\
+  hints="KDE"\
+  title="Kanagram"\
+  longtitle="Kanagram (Letter Order Game)"\
+  command="/usr/bin/kanagram"\
+  icon="/usr/share/pixmaps/kanagram.xpm"

Added: people/jriddell/KDE/3.5/kdeedu/debian/kanagram.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kanagram.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kanagram.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * kmessedwords_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #001074",
+"+ 	c #04261A",
+"@ 	c #330454",
+"# 	c #002928",
+"$ 	c #001697",
+"% 	c #56090B",
+"& 	c #003128",
+"* 	c #04331E",
+"= 	c #002383",
+"- 	c #3D0A63",
+"; 	c #760004",
+"> 	c #003E13",
+", 	c #00400F",
+"' 	c #002C7E",
+") 	c #04401B",
+"! 	c #7F060F",
+"~ 	c #034808",
+"{ 	c #022E9D",
+"] 	c #571B1C",
+"^ 	c #740D18",
+"/ 	c #6F1111",
+"( 	c #054620",
+"_ 	c #472423",
+": 	c #89022B",
+"< 	c #512121",
+"[ 	c #003790",
+"} 	c #1528A9",
+"| 	c #562123",
+"1 	c #4F2627",
+"2 	c #07359C",
+"3 	c #801019",
+"4 	c #A1011D",
+"5 	c #612123",
+"6 	c #045800",
+"7 	c #0F30BA",
+"8 	c #004963",
+"9 	c #771A1C",
+"0 	c #672221",
+"a 	c #6C2022",
+"b 	c #9A0920",
+"c 	c #980E14",
+"d 	c #930F1D",
+"e 	c #065B08",
+"f 	c #B90008",
+"g 	c #B3030E",
+"h 	c #742021",
+"i 	c #BB0201",
+"j 	c #A30D13",
+"k 	c #B70023",
+"l 	c #B8011E",
+"m 	c #AE0524",
+"n 	c #C40006",
+"o 	c #99121B",
+"p 	c #881A1F",
+"q 	c #90181D",
+"r 	c #C60200",
+"s 	c #C1001C",
+"t 	c #C30017",
+"u 	c #B00920",
+"v 	c #0E3FB9",
+"w 	c #0E5E15",
+"x 	c #CD000C",
+"y 	c #004E99",
+"z 	c #0F5E1C",
+"A 	c #D10006",
+"B 	c #D0000F",
+"C 	c #D0011E",
+"D 	c #1F40B1",
+"E 	c #DD0004",
+"F 	c #D80013",
+"G 	c #C60625",
+"H 	c #12641B",
+"I 	c #084FA8",
+"J 	c #D00324",
+"K 	c #DD010E",
+"L 	c #D80025",
+"M 	c #D20618",
+"N 	c #0E6A18",
+"O 	c #DD001E",
+"P 	c #E80001",
+"Q 	c #CA0730",
+"R 	c #0C6C22",
+"S 	c #DA012F",
+"T 	c #1B48BF",
+"U 	c #E6001B",
+"V 	c #E00031",
+"W 	c #E5002E",
+"X 	c #F30009",
+"Y 	c #E5070A",
+"Z 	c #1F49C8",
+"` 	c #1E48D5",
+" .	c #EB002C",
+"..	c #EE0026",
+"+.	c #156D2F",
+"@.	c #D71114",
+"#.	c #0A55D9",
+"$.	c #117724",
+"%.	c #0958E2",
+"&.	c #F70717",
+"*.	c #0060DC",
+"=.	c #155AD7",
+"-.	c #DB191F",
+";.	c #0062F2",
+">.	c #1D5ECA",
+",.	c #108618",
+"'.	c #14832B",
+").	c #E61A25",
+"!.	c #1B831F",
+"~.	c #2564BF",
+"{.	c #DE2328",
+"].	c #2164DB",
+"^.	c #E0232F",
+"/.	c #FE1913",
+"(.	c #F41E1F",
+"_.	c #1F882C",
+":.	c #1D8C1F",
+"<.	c #0071FF",
+"[.	c #216CCD",
+"}.	c #2C65D5",
+"|.	c #0077F2",
+"1.	c #236EC9",
+"2.	c #1A9134",
+"3.	c #F72328",
+"4.	c #18971B",
+"5.	c #FF2026",
+"6.	c #276DDC",
+"7.	c #2A6FD8",
+"8.	c #EA2E2F",
+"9.	c #179932",
+"0.	c #1E73F0",
+"a.	c #217CC8",
+"b.	c #3A6ED8",
+"c.	c #E93436",
+"d.	c #2578E0",
+"e.	c #F52F35",
+"f.	c #12A625",
+"g.	c #29898F",
+"h.	c #FF2F2E",
+"i.	c #10A930",
+"j.	c #247BF1",
+"k.	c #209F3C",
+"l.	c #16A53D",
+"m.	c #367BCF",
+"n.	c #E93D3E",
+"o.	c #317FE1",
+"p.	c #1588FF",
+"q.	c #2483F1",
+"r.	c #2581FE",
+"s.	c #3E7CDF",
+"t.	c #EB4547",
+"u.	c #FF3D3D",
+"v.	c #25AF2E",
+"w.	c #CD5065",
+"x.	c #2D8DDD",
+"y.	c #23B138",
+"z.	c #2AAB51",
+"A.	c #4185E2",
+"B.	c #3D86E9",
+"C.	c #EA4D4F",
+"D.	c #2BB147",
+"E.	c #FF484C",
+"F.	c #24BB39",
+"G.	c #338FFE",
+"H.	c #28B746",
+"I.	c #1DBA56",
+"J.	c #398EF6",
+"K.	c #26B65A",
+"L.	c #28BA40",
+"M.	c #C36286",
+"N.	c #4290F0",
+"O.	c #508DE4",
+"P.	c #F85357",
+"Q.	c #EC5A5A",
+"R.	c #3698FF",
+"S.	c #4494FE",
+"T.	c #2EBF54",
+"U.	c #FF5856",
+"V.	c #EB6162",
+"W.	c #479AF6",
+"X.	c #FB5D5B",
+"Y.	c #3F9FFF",
+"Z.	c #4C9CFF",
+"`.	c #549BF2",
+" +	c #42C64C",
+".+	c #CF728E",
+"++	c #3ECA44",
+"@+	c #41C560",
+"#+	c #FF6466",
+"$+	c #5F9EE8",
+"%+	c #52A2FF",
+"&+	c #F16D75",
+"*+	c #F66C6E",
+"=+	c #5CA4F4",
+"-+	c #65A6EA",
+";+	c #4FAEFF",
+">+	c #68ADC3",
+",+	c #4BCC6E",
+"'+	c #59AAFF",
+")+	c #60AAF4",
+"!+	c #50D34D",
+"~+	c #50D258",
+"{+	c #57CD69",
+"]+	c #F27B7D",
+"^+	c #D5859B",
+"/+	c #54D266",
+"(+	c #5ACC76",
+"_+	c #5FB1FF",
+":+	c #68AEFF",
+"<+	c #55D37A",
+"[+	c #FF7F7D",
+"}+	c #6DB5FF",
+"|+	c #F18989",
+"1+	c #DB90A4",
+"2+	c #6CDA68",
+"3+	c #F68D8D",
+"4+	c #71BCFF",
+"5+	c #7BBBFF",
+"6+	c #6FD885",
+"7+	c #73D78E",
+"8+	c #DA9EB0",
+"9+	c #81C3FF",
+"0+	c #88C0FF",
+"a+	c #7CDB99",
+"b+	c #7FDF7C",
+"c+	c #FE9B98",
+"d+	c #91C2FD",
+"e+	c #8BC6FF",
+"f+	c #F9A8A7",
+"g+	c #FFA6A6",
+"h+	c #96CBFF",
+"i+	c #8FE48F",
+"j+	c #94E2A6",
+"k+	c #99E7A0",
+"l+	c #A2D1FF",
+"m+	c #FFB2B3",
+"n+	c #FEB8B6",
+"o+	c #A4E6B5",
+"p+	c #ADD6FF",
+"q+	c #ADEAC0",
+"r+	c #FEC1C3",
+"s+	c #B7DCFF",
+"t+	c #B7EDB7",
+"u+	c #C0E1FE",
+"v+	c #C2EFC8",
+"w+	c #C8F1C4",
+"x+	c #C8F0D1",
+"y+	c #CBE7FF",
+"z+	c #D0F3DB",
+"A+	c #D9EDFF",
+"B+	c #D8F5D7",
+"C+	c #E4F1FF",
+"D+	c #E6F9E4",
+"E+	c #EBFAED",
+"F+	c #EFF7FF",
+"G+	c #F9FFFF",
+"                      ~.1.m.m.m.I                               ",
+"                    -+4+e+e+e+e+$+                              ",
+"                    5+s+F+G+G+y+)+                              ",
+"                    [.=+_+C+F+u+=+                              ",
+"                      [ O.l+F+u+=+                              ",
+"                        A.l+C+s+`.                              ",
+"                        A.e+A+s+`.'                             ",
+"                        s.d+y+l+W.7.O.W.o.>.                    ",
+"                        s.d+y+l+Y.}+h+p+e+'+B.2                 ",
+"                        s.5+u+l+l+h+5+p+s+u+)+W.=               ",
+"                        b.}+s+l+Z.B.b.Z.}+s+s+'+>.              ",
+"                        6.5+p+d+B.=   { S.e+p+0+J.=             ",
+"              ; ;       ].}+l+5+q.      }.'+p+p+S.2             ",
+"        4 Q W .. . .S : }.:+l+0+j.      T Z.h+h+Z.D             ",
+"    ! L U V.|+m+f+|+V.Q ].'+e+5+j.      v Z.h+h+Z.T             ",
+"  ; W ^.m+n+V.n.V.n+r+8+].'+h+}+j.      D J.h+e+x.8 6           ",
+"  o -.m+m+V.V m S M n+1+#.%+0+:+0.      Z R.>+R 2.z.K.k.R       ",
+"  Q C.f+f+V.C % / {.&+8+=.Y.4+'+0..     0.g.'.(+q+z+E+x+<+'.    ",
+"  m ^.c+c+C.J     J Q.^+#.Y.4+4+p.Z } #.a.'.7+E+o+I.I.x+E+,+w   ",
+"  3 O -.{.O d ! u O C..+#.Z.}+:+_+G.r.R.+.,+x+v+I.w l.v+B+7+$.  ",
+"    ^ u k k J O {.Q.[+M.%.R.G.<.p.R.%+x.'.a+v+7+$.~ k.j+w+,+H   ",
+"    / k B {.n.*+*+n.C.&+7 <.;.$ 7 ` ;.y 9.k+t+(+N   z 2.T.2.,   ",
+"  3 C -.X.#+U. at .B -.c.#+w.@ @         * k.k+k+{+z     , , >     ",
+"  l -.P.P.n.B k h t c.U.P.-.o           :.6+i+{+H         >     ",
+"3 x E.E.E.x o     t c.E.E.B d           !.{+b+{+!.      z i.H   ",
+"q B u.u.8.x ]     t ).u.u.x d           z H.{+2+D.z ) H L.{+i.* ",
+"q r u.h.u.n p a o r h.u.h.B q 0           :. +~+~+H.v.H. +y.w   ",
+"9 x 5.5.(.K n n A 3.Y 5.h. at .n t o         ) 4.F.++!+++L.v.w +   ",
+"| f E /.5././.&./.r r /././.X K i |         & N ,.f.4.!.>       ",
+"  a i r P /.Y A x f f r Y X Y r g <               # #           ",
+"    5 j g i i g p 1 0 j f f g c 0                               ",
+"        _ 1 1 _         _ 1                                     "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kbruch.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kbruch.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kbruch.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,47 @@
+.\"                                      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 KBRUCH 1 "October 16, 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
+kbruch \- a fraction calculation teaching tool for KDE
+.SH SYNOPSIS
+.B kbruch
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKBruch\fP is a small program to practice calculating with fractions.
+Different exercises are provided for this purpose.  The program checks
+the user's input and gives feedback.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkbruch \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kbruch/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kbruch/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kbruch/\fP.
+.SH AUTHOR
+KBruch was written by Sebastian Stein <seb.kde at hpfsc.de>,
+Eva Brucherseifer <eva 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/kdeedu/debian/kbruch.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kbruch.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kbruch.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KBruch for Debian
+-----------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 31 Jan 2004 12:08:48 +1100

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kbruch.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kbruch.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kbruch.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,19 @@
+usr/bin/kbruch
+usr/share/applications/kde/kbruch.desktop
+usr/share/apps/kbruch/kbruchui.rc
+usr/share/config.kcfg/kbruch.kcfg
+usr/share/doc/kde/HTML/en/kbruch/*.bz2
+usr/share/doc/kde/HTML/en/kbruch/*.docbook
+usr/share/doc/kde/HTML/en/kbruch/*.png
+usr/share/doc/kde/HTML/en/kbruch/common
+usr/share/icons/crystalsvg/32x32/actions/kbruch_*.png
+usr/share/icons/crystalsvg/64x64/actions/kbruch_*.png
+usr/share/icons/hicolor/128x128/apps/kbruch.png
+usr/share/icons/hicolor/16x16/apps/kbruch.png
+usr/share/icons/hicolor/22x22/apps/kbruch.png
+usr/share/icons/hicolor/32x32/apps/kbruch.png
+usr/share/icons/hicolor/48x48/apps/kbruch.png
+usr/share/icons/hicolor/64x64/apps/kbruch.png
+usr/share/icons/hicolor/scalable/apps/kbruch.svgz
+
+../kbruch.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kbruch.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kbruch.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kbruch.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kbruch):needs="X11"\
+  section="Apps/Math"\
+  hints="KDE"\
+  title="KBruch"\
+  longtitle="KBruch (Exercise Fractions)"\
+  command="/usr/bin/kbruch"\
+  icon="/usr/share/pixmaps/kbruch.xpm"
+

Added: people/jriddell/KDE/3.5/kdeedu/debian/kbruch.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kbruch.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kbruch.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,241 @@
+/* XPM */
+static char * kbruch_xpm[] = {
+"32 32 206 2",
+"  	c None",
+". 	c #3B2115",
+"+ 	c #3C2216",
+"@ 	c #3D2418",
+"# 	c #3E2419",
+"$ 	c #40271B",
+"% 	c #41281C",
+"& 	c #432A1E",
+"* 	c #452C21",
+"= 	c #4A3226",
+"- 	c #4D362B",
+"; 	c #4E372C",
+"> 	c #543E33",
+", 	c #574036",
+"' 	c #574137",
+") 	c #5B463C",
+"! 	c #5C463C",
+"~ 	c #FF0100",
+"{ 	c #FF0201",
+"] 	c #FF0302",
+"^ 	c #FF0403",
+"/ 	c #FF0605",
+"( 	c #614C42",
+"_ 	c #FF0706",
+": 	c #FF0807",
+"< 	c #634E45",
+"[ 	c #FF0A09",
+"} 	c #374EBE",
+"| 	c #655047",
+"1 	c #FF0D0C",
+"2 	c #FF1110",
+"3 	c #68534A",
+"4 	c #6A564D",
+"5 	c #6B574E",
+"6 	c #FF1716",
+"7 	c #6B584F",
+"8 	c #6F5C53",
+"9 	c #FF1E1D",
+"0 	c #715E55",
+"a 	c #4A5EC4",
+"b 	c #FF2221",
+"c 	c #437F35",
+"d 	c #736158",
+"e 	c #FF2423",
+"f 	c #458138",
+"g 	c #FF2726",
+"h 	c #468239",
+"i 	c #FF2A29",
+"j 	c #78665D",
+"k 	c #FF2B2A",
+"l 	c #5266C7",
+"m 	c #78675E",
+"n 	c #79685F",
+"o 	c #7A6860",
+"p 	c #FF2E2D",
+"q 	c #7B6961",
+"r 	c #FF3332",
+"s 	c #7D6C64",
+"t 	c #7F6E66",
+"u 	c #7F6E67",
+"v 	c #538B48",
+"w 	c #FF3736",
+"x 	c #FF3837",
+"y 	c #FF3938",
+"z 	c #817069",
+"A 	c #5F71CB",
+"B 	c #FF3E3D",
+"C 	c #5B904F",
+"D 	c #5B9150",
+"E 	c #5C9151",
+"F 	c #5D9151",
+"G 	c #FF4443",
+"H 	c #5F9353",
+"I 	c #897972",
+"J 	c #609455",
+"K 	c #FF4746",
+"L 	c #FF4847",
+"M 	c #629657",
+"N 	c #8B7C74",
+"O 	c #FF4A49",
+"P 	c #639758",
+"Q 	c #65975A",
+"R 	c #FF4C4B",
+"S 	c #66985B",
+"T 	c #66985C",
+"U 	c #67985C",
+"V 	c #FF4E4D",
+"W 	c #68995D",
+"X 	c #FF5251",
+"Y 	c #7282D1",
+"Z 	c #FF5453",
+"` 	c #FF5756",
+" .	c #709F66",
+"..	c #71A067",
+"+.	c #968982",
+"@.	c #978983",
+"#.	c #7A89D4",
+"$.	c #998B85",
+"%.	c #FF605F",
+"&.	c #9A8D87",
+"*.	c #78A46E",
+"=.	c #FF6261",
+"-.	c #78A56F",
+";.	c #79A570",
+">.	c #9C8F89",
+",.	c #9D908A",
+"'.	c #FF6867",
+").	c #7EA875",
+"!.	c #FF6968",
+"~.	c #A0938D",
+"{.	c #A0948E",
+"].	c #A1958F",
+"^.	c #A39791",
+"/.	c #FF706F",
+"(.	c #FF7170",
+"_.	c #85AD7D",
+":.	c #A59994",
+"<.	c #86AD7E",
+"[.	c #A69A95",
+"}.	c #FF7473",
+"|.	c #A79B95",
+"1.	c #FF7877",
+"2.	c #FF7A79",
+"3.	c #ABA09B",
+"4.	c #FF7C7B",
+"5.	c #90B387",
+"6.	c #FF7D7C",
+"7.	c #AEA39E",
+"8.	c #FF807F",
+"9.	c #FF8080",
+"0.	c #AFA4A0",
+"a.	c #FF8585",
+"b.	c #FF8686",
+"c.	c #FF8787",
+"d.	c #FF8888",
+"e.	c #FF8A8A",
+"f.	c #B5ABA7",
+"g.	c #FF8E8E",
+"h.	c #B8AEAA",
+"i.	c #FF9090",
+"j.	c #FF9191",
+"k.	c #FF9292",
+"l.	c #FF9393",
+"m.	c #FF9494",
+"n.	c #FF9595",
+"o.	c #BCB3AF",
+"p.	c #FF9D9D",
+"q.	c #C3BBB7",
+"r.	c #FFA1A1",
+"s.	c #FFA2A2",
+"t.	c #FFA6A6",
+"u.	c #FFA8A8",
+"v.	c #FFAEAE",
+"w.	c #D2CDCA",
+"x.	c #D4CECC",
+"y.	c #D5CFCD",
+"z.	c #FFBEBE",
+"A.	c #FFC0C0",
+"B.	c #D9D4D2",
+"C.	c #FFC7C7",
+"D.	c #FFCBCB",
+"E.	c #DEDAD8",
+"F.	c #DFDBD9",
+"G.	c #FFCDCD",
+"H.	c #E1DDDB",
+"I.	c #FFD0D0",
+"J.	c #FFD2D2",
+"K.	c #FFD6D6",
+"L.	c #DFE9DD",
+"M.	c #E9E6E4",
+"N.	c #E3E6F5",
+"O.	c #E9E7E5",
+"P.	c #E6EEE4",
+"Q.	c #EDEAE9",
+"R.	c #E8F0E7",
+"S.	c #E9F0E8",
+"T.	c #FFE6E6",
+"U.	c #EBEEF8",
+"V.	c #F0EEEE",
+"W.	c #FFE8E8",
+"X.	c #FFE9E9",
+"Y.	c #F2F0EF",
+"Z.	c #EEF3ED",
+"`.	c #F3F1F0",
+" +	c #FFECEC",
+".+	c #F4F3F2",
+"++	c #F2F3FA",
+"@+	c #F5F4F3",
+"#+	c #FFF0F0",
+"$+	c #F7F5F5",
+"%+	c #F6F8F5",
+"&+	c #F8F7F7",
+"*+	c #F6F9F6",
+"=+	c #F7F8FC",
+"-+	c #F7F9F7",
+";+	c #FAFAF9",
+">+	c #FFF8F8",
+",+	c #FFF9F9",
+"'+	c #FFFAFA",
+")+	c #FDFCFC",
+"!+	c #FFFCFC",
+"~+	c #FDFDFD",
+"{+	c #FFFDFD",
+"]+	c #FEFEFE",
+"^+	c #FFFEFE",
+"/+	c #FFFFFF",
+"                                                                ",
+"                                                                ",
+"      /+/+/+/+/+                                  /+/+/+/+      ",
+"    /+>+d.K X r./+                              /+Q.n :./+      ",
+"    /+y ~ ~ ~ ~ e./+                          /+ at +! . ) /+      ",
+"  /+I.~ _ 1.L ~ e /+                          /+j . & x./+      ",
+"    ,+6.A./+p.~ b /+                        /+7.. . o./+/+      ",
+"    /+/+#+O { ~ s./+                        `.* . $ , u H./+    ",
+"      /+K.~ ~ ^ l./+                      /+|.. . . . . > Y./+  ",
+"    /+/+/+G.}.~ ~ D./+                    /+t . ; F.q.. . h./+  ",
+"  /+v.6 u./+'+[ ~ k./+                    /+0 . q /+/+= . {./+  ",
+"  /+8.~ : 2.` ~ ~ z./+        Z.%+        /+>.. # @.t . . w./+  ",
+"  /+W.9 ~ ~ ~ ~ G '+        /+*.<./+      /+M.> . . . . z ~+    ",
+"    /+ +2.B L b.,+/+        /+P T /+        /+O.+.5 j 3.)+/+    ",
+"    /+/+/+/+/+/+/+/+    /+/+/+C D /+/+/+    /+/+/+/+/+/+/+/+    ",
+"  =+#.A A A A A A Y ++*+5...M h f J  ._.S.++Y A A A A A A #.=+  ",
+"  U.l } } } } } } a N.L.Q C v c h E U ).-+N.a } } } } } } l U.  ",
+"    /+/+/+/+/+/+/+/+    /+/+]+F H /+/+/+    /+/+/+/+/+/+/+/+    ",
+"    /+$+$.7 4 ,. at +/+        /+S W /+            /+X.a.n.!+/+    ",
+"    ]+( . . . . 8 /+        /+-.;./+            >+k ~ ~ j./+    ",
+"  /+B.. . ].&.. . O.          R.P.            /+4.~ ] ~ =./+    ",
+"  /+x.. . M.y.. . Q.                        /+J./ 2 Z ~ %./+    ",
+"    )+| . * % . o /+                        {+w ~ g.'.~ %./+    ",
+"  /+ at +< . @ + . d ;+                      /+i.~ g '+'.~ %./+    ",
+"  /+,.. - O.E.% . 0./+                    W.1 ~ V c.x ~ r t.^+  ",
+"  /+m . 4 /+/+' . N /+                  /+m.~ ~ ~ ~ ~ ~ ~ ~ J./+",
+"  /+^.. . I s . . f./+                  /+T.9./././.p ~ i g.!+  ",
+"  /+Q.) . . . . 3 .+                      /+/+/+/+/+(.~ !./+/+  ",
+"    /+V.~.d m [.&+/+                              /+I.R C./+    ",
+"      /+/+/+/+/+/+                                  /+/+/+      ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-data.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-data.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-data.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+usr/share/applnk/Edutainment/Languages/.directory
+usr/share/applnk/Edutainment/Mathematics/.directory
+usr/share/applnk/Edutainment/Miscellaneous/.directory
+usr/share/applnk/Edutainment/Science/.directory
+usr/share/applnk/Edutainment/Tools/.directory

Added: 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.kalzium	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kalzium
+Title: Kalzium Handbook
+Author: Carsten Niehaus <cniehaus at kde.org>
+Abstract: Kalzium is a program which shows you the Periodic System of
+ elements (PSE).  You can use Kalzium to search for information about
+ the elements or to learn facts about the PSE.
+Section: Apps/Science
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kalzium/index.html
+Files: /usr/share/doc/kde/HTML/en/kalzium/*.html

Added: 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.kbruch	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kbruch
+Title: KBruch Handbook
+Author: Sebastian Stein <seb.kde at hpfsc.de>
+Abstract: KBruch is a small program to practice calculating with fractions.
+ Different exercises are provided for this purpose.  The program checks the
+ user's input and gives feedback.
+Section: Apps/Math
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kbruch/index.html
+Files: /usr/share/doc/kde/HTML/en/kbruch/*.html

Added: 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.keduca	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.keduca	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: keduca
+Title: KEduca Handbook
+Author: Javier J. Campos <javi_cms at terra.es>
+Abstract: KEduca is flash card application which allows you to make
+ interactive form based tests.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/keduca/index.html
+Files: /usr/share/doc/kde/HTML/en/keduca/*.html

Added: 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.khangman	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.khangman	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: khangman
+Title: KHangMan Handbook
+Author: Anne-Marie Mahfouf <annma at kde.org>
+Abstract: KHangMan is the classical hangman game for children, adapted for KDE.
+Section: Games/Puzzles
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/khangman/index.html
+Files: /usr/share/doc/kde/HTML/en/khangman/*.html

Added: 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.kig	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kig	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kig
+Title: Kig Handbook
+Author: Dominique Devriese <devriese at kde.org>
+Abstract: Kig is a KDE application for Interactive Geometry.
+Section: Apps/Math
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kig/index.html
+Files: /usr/share/doc/kde/HTML/en/kig/*.html

Added: 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.kiten	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kiten	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kiten
+Title: Kiten Handbook
+Author: Jason Katz-Brown <jason at katzbrown.com>
+Abstract: Kiten is a Japanese reference/study tool for KDE.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kiten/index.html
+Files: /usr/share/doc/kde/HTML/en/kiten/*.html

Added: 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.klatin	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.klatin	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: klatin
+Title: KLatin Handbook
+Author: George Wright <gwright at users.sourceforge.net> and Anne-Marie Mahfouf <annma at kde.org>
+Abstract: KLatin is a KDE application to help revise/teach Latin.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/klatin/index.html
+Files: /usr/share/doc/kde/HTML/en/klatin/*.html

Added: 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.klettres	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.klettres	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Document: klettres
+Title: KLettres Handbook
+Author: Anne-Marie Mahfouf <annma at kde.org>
+Abstract: KLettres is an application specially designed to help the user
+ to learn an alphabet in a new language and then to learn to read simple
+ syllables.  The user can be a young child aged from two and a half or
+ an adult that wants to learn the basics of a foreign language.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/klettres/index.html
+Files: /usr/share/doc/kde/HTML/en/klettres/*.html

Added: 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.kmessedwords	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kmessedwords	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kmessedwords
+Title: KMessedWords Handbook
+Author: Primoz Anzur <zerokode at gmx.net>
+Abstract: KMessedWords is the simple mind-training word game.
+Section: Games/Puzzles
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmessedwords/index.html
+Files: /usr/share/doc/kde/HTML/en/kmessedwords/*.html

Added: 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.kmplot	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kmplot
+Title: KmPlot Handbook
+Author: Klaus-Dieter Moeller <kd.moeller at t-online.de> and Philip Rodrigues <phil.rod at ntlworld.com>
+Abstract: KmPlot is a mathematical function plotter for the KDE Desktop.
+Section: Apps/Math
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmplot/index.html
+Files: /usr/share/doc/kde/HTML/en/kmplot/*.html

Added: 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.kpercentage	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kpercentage
+Title: KPercentage Handbook
+Author: Matthias Messmer <bmlmessmer at web.de>, Carsten Niehaus <cniehaus at gmx.de> and Robert Gogolok <mail at robert-gogolok.de.de>
+Abstract: KPercentage is a small math application that will help pupils
+ to improve their skills in calculating percentages.
+Section: Apps/Math
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpercentage/index.html
+Files: /usr/share/doc/kde/HTML/en/kpercentage/*.html

Added: 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.kstars	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kstars	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Document: kstars
+Title: KStars Handbook
+Author: Jason Harris <kstars at 30doradus.org>
+Abstract: KStars is a graphical desktop planetarium for KDE.  It depicts an
+ accurate simulation of the night sky, including stars, constellations,
+ star clusters, nebulae, galaxies, all planets, the Sun, the Moon,
+ comets and asteroids.
+Section: Apps/Science
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kstars/index.html
+Files: /usr/share/doc/kde/HTML/en/kstars/*.html

Added: 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.ktouch	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Document: ktouch
+Title: KTouch Handbook
+Author: Haavard Froeiland <haavard at users.sourceforge.net>
+Abstract: KTouch is a program for learning to touch type.  KTouch
+ provides you with text to train on, and adjusts to different levels
+ depending on how good you are.  It can display which key to press next,
+ and the correct finger to use.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ktouch/index.html
+Files: /usr/share/doc/kde/HTML/en/ktouch/*.html

Added: 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.kturtle	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Document: kturtle
+Title: KTurtle Handbook
+Author: Cies Breijs <cies AT kde DOT nl> and Anne-Marie Mahfouf <annma AT kde DOT org>
+Abstract: KTurtle is an educational programming environment using the
+ LOGO programming language.  The unique quality of LOGO is that the
+ programming commands are translated to the language of the 'programmer'
+ so he/she can program in his/her native language.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kturtle/index.html
+Files: /usr/share/doc/kde/HTML/en/kturtle/*.html

Added: 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.kverbos	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kverbos
+Title: Kverbos Handbook
+Author: Arnold Kraschinski <arnold.k67 at gmx.de>
+Abstract: Kverbos is an application specially designed to study Spanish
+ verbforms.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kverbos/index.html
+Files: /usr/share/doc/kde/HTML/en/kverbos/*.html

Added: 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.kvoctrain	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kvoctrain
+Title: KVocTrain Handbook
+Author: Ewald Arnold <ewald at ewald-arnold.de>
+Abstract: KVocTrain is a little utility to help you train your vocabulary,
+ when you are trying to learn a foreign language.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kvoctrain/index.html
+Files: /usr/share/doc/kde/HTML/en/kvoctrain/*.html

Added: people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kwordquiz
+Title: KWordQuiz Handbook
+Author: Peter Hedlund <peter at peterandlinda.com>
+Abstract: KWordQuiz is a flashcard and vocabulary learning program for KDE.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kwordquiz/index.html
+Files: /usr/share/doc/kde/HTML/en/kwordquiz/*.html

Added: people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu-doc-html.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+usr/share/doc/kde/HTML/en/kalzium/*.html
+usr/share/doc/kde/HTML/en/kbruch/*.html
+usr/share/doc/kde/HTML/en/keduca/*.html
+usr/share/doc/kde/HTML/en/khangman/*.html
+usr/share/doc/kde/HTML/en/kig/*.html
+usr/share/doc/kde/HTML/en/kiten/*.html
+usr/share/doc/kde/HTML/en/klatin/*.html
+usr/share/doc/kde/HTML/en/klettres/*.html
+usr/share/doc/kde/HTML/en/kmessedwords/*.html
+usr/share/doc/kde/HTML/en/kmplot/*.html
+usr/share/doc/kde/HTML/en/kpercentage/*.html
+usr/share/doc/kde/HTML/en/kstars/*.html
+usr/share/doc/kde/HTML/en/ktouch/*.html
+usr/share/doc/kde/HTML/en/kturtle/*.html
+usr/share/doc/kde/HTML/en/kverbos/*.html
+usr/share/doc/kde/HTML/en/kvoctrain/*.html
+usr/share/doc/kde/HTML/en/kwordquiz/*.html

Added: people/jriddell/KDE/3.5/kdeedu/debian/kdeedu.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kdeedu.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kdeedu.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+KDE Educational Applications for Debian
+---------------------------------------
+
+Package kdeedu is a metapackage that depends on the full set of
+edutainment applications provided with the official release of KDE.
+
+Each application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

Added: people/jriddell/KDE/3.5/kdeedu/debian/keduca-shrinker
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca-shrinker	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca-shrinker	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,154 @@
+#!/usr/bin/perl
+#
+# Copyright (c) 2005 Mathieu Roy <yeupou--gnu.org>
+# http://yeupou.coleumes.org
+#
+#   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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+#   USA
+#
+# $Id: keduca-shrinker.pl,v 1.3 2005/04/23 11:30:50 yeupou Exp $
+
+use Getopt::Long;
+
+my $getopt;
+my $debug; 
+my $help;
+
+my $input;
+my $output;
+my $number = "20";
+
+
+########### Get options, give help
+
+eval {
+    $getopt = GetOptions("debug" => \$debug,
+			 "help" => \$help,
+			 "number=s" => \$number,
+			 "input=s" => \$input,
+			 "output=s" => \$ouput);
+};
+
+if ($help) {
+    print STDERR <<EOF;
+Usage: $0 [OPTION] --input [FILE] 
+
+A small program that take a kdeduca test file (.edu) as input with say 100
+question and output a kdeduca test file with 20 questions selected randomly. 
+
+    -i, --input=FILE          Input keduca file.
+    -o, --output=FILE         Output keduca file, shrinked.
+                              (By default, the suffix -shrinked will be added)
+    -n, --number=NUMBER       Number expected of questions, in the shrinked
+                              version.
+                              ($number by default)
+ 
+Project Homepage: https://gna.org/projects/keduca-shrinker/
+EOF
+exit(1);
+}
+
+# Test input file existence
+unless ($input) {
+    print "No input file.\n";
+}
+unless (-r $input) {
+    print "Input file not readable.\n";
+    exit;
+}
+open(INPUT, "< $input");
+
+# Test output writability
+unless ($output) {
+    $output = $input;
+    $output =~ s/.edu$//;
+    $output .= "-shrinked.edu";
+}
+if (-e $output && ! -w $output) {
+    print "Output file not writable.\n";
+    exit;
+
+}
+open(OUTPUT, "> $output");
+
+########### Define subs
+
+sub fisher_yates_shuffle {
+    my $table = shift;
+    my $i;
+    for ($i = @$table; --$i;) {
+	my $j = int rand($i+1);
+	next if $i == $j;
+	@$table[$i,$j] = @$table[$j,$i];
+    }
+}
+
+
+########### Grab the file header, store questions in an array.
+# I know, it's XML, it may be simple to call an xml parser.
+# But in fact, we have nothing to parse here, we do not care about
+# the real content, so...
+my $structure = "header";
+my $header;
+my $footer;
+my @questions;
+my $newquestion;
+
+while (<INPUT>) {
+    ## Grab the structure (footer and header)
+    # the header last when data begins
+    # the footer begin when data ends
+
+    $header .= $_ if $structure eq "header";
+
+    $structure = "content" if /\<Data\>/m;
+    $structure = "footer" if /\<\/Data\>/m;
+
+    $footer .= $_ if $structure eq "footer";
+
+    ## Grab the questions
+    if ($structure eq "content") {
+	$newquestion .= $_;
+	
+	# If we found the string </question>, that the end of a question
+	if (/\<\/question\>/m) {
+	    push(@questions, $newquestion);
+	    $newquestion = "";
+	}
+	
+    }
+}
+
+########### Select the number of questions we want
+# warn the user if there's nothing to do
+if (scalar(@questions) < $number) {
+    print "There are only ".scalar(@questions)." questions in the input file, less than $number.\n";
+    # Copy & exit
+    system("cp", $input, $output);
+    exit;
+} else {
+    # Shuffle
+    fisher_yates_shuffle(\@questions);
+    # Keeps only the desired amount (number-1, as 0 is counted)
+    $#questions = ($number-1);
+}
+
+########### Final output
+print OUTPUT $header;
+print OUTPUT @questions;
+print OUTPUT $footer;
+
+close(INPUT);
+close(OUTPUT);

Added: people/jriddell/KDE/3.5/kdeedu/debian/keduca-shrinker.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca-shrinker.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca-shrinker.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,66 @@
+.\"                                      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 KEDUCA-SHRINKER 1 "September 1, 2005"
+.\" 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
+keduca-shrinker \- extract a random sample from a large KEduca test file
+.SH SYNOPSIS
+.B keduca-shrinker
+[ \fB\-o, \-\-output\fP=\fIfile\fP ]
+[ \fB\-n, \-\-number\fP=\fInumber\fP ]
+\fB\-i, \-\-input\fP=\fIfile\fP
+.SH DESCRIPTION
+\fBkeduca-shrinker\fP is a small program that reads a large KEduca
+test file (.edu) and extracts a random sample of questions to create a
+new smaller test file.  For example, it could take a 100 question test
+file as input and then output a test file with 20 questions selected at
+random.
+.PP
+Note that the input file \fBmust\fP be uncompressed.  When you save the
+original test in the KEduca Editor, you should explicitly clear the "Compress
+the file" checkbox.  Otherwise keduca-shrinker will not be able to read it.
+.PP
+\fBKEduca\fP is a flash-card application for working with interactive
+form-based tests.  It is shipped as part of the official KDE edutainment
+module.
+.SH OPTIONS
+.TP
+\fB\-i, \-\-input\fP=\fIfile\fP
+The large KEduca test file that should be read as input.
+.TP
+\fB\-o, \-\-output\fP=\fIfile\fP
+The smaller KEduca test file that should be written as output.
+This defaults to the input filename with \fI-shrinked\fP appended to its
+base.  For example, if the input file is \fIfoo.edu\fP then the
+default output file is \fIfoo-shrinked.edu\fP.
+.TP
+\fB\-n, \-\-number\fP=\fInumber\fP
+The number of random questions to select from the input file.
+This defaults to 20.
+.SH SEE ALSO
+.BR keduca (1),
+.BR keducabuilder (1).
+.PP
+This tool is not yet part of the official KDE edutainment module.
+Its upstream site is
+\fIhttps://gna.org/projects/keduca-shrinker/\fP.
+.SH AUTHOR
+keduca-shrinker was written by Mathieu Roy <yeupou at coleumes.org>.
+It is licensed under the GNU General Public License (see the script
+itself for details).
+.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/kdeedu/debian/keduca.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca.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 KEDUCA 1 "September 1, 2005"
+.\" 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
+keduca \- interactive form-based tests for KDE
+.SH SYNOPSIS
+.B keduca
+.RI "[ " generic-options " ]"
+[ \fIfile\fP ]
+.SH DESCRIPTION
+\fBKEduca\fP is a flash-card application that allows you to work with
+interactive form-based tests.  This application is used only for viewing
+and taking these tests \- you can create and edit tests using the
+related application \fBKEducaBuilder\fP.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkeduca \-\-help\fP.
+.SH SEE ALSO
+.BR keduca-shrinker (1),
+.BR keducabuilder (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/keduca/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/keduca/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/keduca/\fP.
+.SH AUTHOR
+KEduca was written by Javier Campos <javi at asyris.org>,
+Klas Kalass <klas at kde.org>, Henrique Pinto <henrique.pinto at kdemail.net>
+and Anne-Marie Mahfouf <annma 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/kdeedu/debian/keduca.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KEduca for Debian
+-----------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/keduca.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,24 @@
+usr/bin/keduca
+usr/bin/keducabuilder
+usr/lib/kde3/libkeducapart.la
+usr/lib/kde3/libkeducapart.so
+usr/share/applications/kde/keduca.desktop
+usr/share/applications/kde/keducabuilder.desktop
+usr/share/apps/keduca
+usr/share/config.kcfg/keduca.kcfg
+usr/share/doc/kde/HTML/en/keduca/*.docbook
+usr/share/doc/kde/HTML/en/keduca/*.png
+usr/share/doc/kde/HTML/en/keduca/common
+usr/share/doc/kde/HTML/en/keduca/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/keduca.png
+usr/share/icons/hicolor/16x16/apps/keduca.png
+usr/share/icons/hicolor/22x22/apps/keduca.png
+usr/share/icons/hicolor/32x32/apps/keduca.png
+usr/share/icons/hicolor/48x48/apps/keduca.png
+usr/share/icons/hicolor/64x64/apps/keduca.png
+usr/share/mimelnk/application/x-edu.desktop
+usr/share/mimelnk/application/x-edugallery.desktop
+usr/share/services/keduca_part.desktop
+
+../keduca-shrinker usr/bin
+../keduca.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/keduca.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+?package(keduca):needs="X11"\
+  section="Apps/Education"\
+  hints="KDE"\
+  title="KEduca"\
+  longtitle="KEduca (Tests and Exams)"\
+  command="/usr/bin/keduca"\
+  icon="/usr/share/pixmaps/keduca.xpm"
+
+?package(keduca):needs="X11"\
+  section="Apps/Education"\
+  hints="KDE"\
+  title="KEduca-Editor"\
+  longtitle="KEduca-Editor (Tests and Exams Editor)"\
+  command="/usr/bin/keducabuilder"\
+  icon="/usr/share/pixmaps/keduca.xpm"

Added: people/jriddell/KDE/3.5/kdeedu/debian/keduca.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keduca.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keduca.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * keduca_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #2D0001",
+"+ 	c #370001",
+"@ 	c #3B0000",
+"# 	c #3A0609",
+"$ 	c #400406",
+"% 	c #490003",
+"& 	c #460202",
+"* 	c #430602",
+"= 	c #4F0203",
+"- 	c #560000",
+"; 	c #4D0703",
+"> 	c #540608",
+", 	c #570904",
+"' 	c #6C0004",
+") 	c #5E070A",
+"! 	c #760004",
+"~ 	c #680802",
+"{ 	c #68080A",
+"] 	c #630D08",
+"^ 	c #820000",
+"/ 	c #7B0600",
+"( 	c #8D0205",
+"_ 	c #750D0D",
+": 	c #6F1110",
+"< 	c #7E0B0C",
+"[ 	c #900500",
+"} 	c #791216",
+"| 	c #741614",
+"1 	c #343A02",
+"2 	c #930C0A",
+"3 	c #5F2223",
+"4 	c #7D1719",
+"5 	c #642D00",
+"6 	c #891A1A",
+"7 	c #831D1D",
+"8 	c #9A1716",
+"9 	c #99171C",
+"0 	c #006A02",
+"a 	c #882220",
+"b 	c #7D2827",
+"c 	c #6E2F2E",
+"d 	c #116700",
+"e 	c #912325",
+"f 	c #0E6E00",
+"g 	c #8D2724",
+"h 	c #0C6F09",
+"i 	c #A11F21",
+"j 	c #196C05",
+"k 	c #8F292B",
+"l 	c #9C2425",
+"m 	c #A32222",
+"n 	c #1E6F0B",
+"o 	c #932D2E",
+"p 	c #992B2B",
+"q 	c #197402",
+"r 	c #A12A29",
+"s 	c #1E7500",
+"t 	c #983231",
+"u 	c #277405",
+"v 	c #1F7808",
+"w 	c #1A7D00",
+"x 	c #AB2B2D",
+"y 	c #257A00",
+"z 	c #316D2B",
+"A 	c #9D3635",
+"B 	c #2E7A0E",
+"C 	c #AC3431",
+"D 	c #327C02",
+"E 	c #A23B39",
+"F 	c #A93936",
+"G 	c #367F07",
+"H 	c #A53E41",
+"I 	c #A14141",
+"J 	c #7E5051",
+"K 	c #924849",
+"L 	c #338610",
+"M 	c #3A830D",
+"N 	c #388804",
+"O 	c #B04041",
+"P 	c #AB4340",
+"Q 	c #3D8511",
+"R 	c #3B8331",
+"S 	c #AD4548",
+"T 	c #AA4948",
+"U 	c #448A0A",
+"V 	c #B1494B",
+"W 	c #389212",
+"X 	c #409011",
+"Y 	c #488E10",
+"Z 	c #B04F53",
+"` 	c #B3514F",
+" .	c #4B9114",
+"..	c #4E9207",
+"+.	c #B15656",
+"@.	c #4E9419",
+"#.	c #52960E",
+"$.	c #BB5856",
+"%.	c #B65B5A",
+"&.	c #956B69",
+"*.	c #549A20",
+"=.	c #BA5E5D",
+"-.	c #5C9F0D",
+";.	c #60A100",
+">.	c #5C9F1C",
+",.	c #5A9F26",
+"'.	c #B96460",
+").	c #629E1C",
+"!.	c #68A100",
+"~.	c #7E807D",
+"{.	c #5F9B43",
+"].	c #64A504",
+"^.	c #BA695E",
+"/.	c #BB6769",
+"(.	c #699848",
+"_.	c #64A129",
+":.	c #838482",
+"<.	c #6DA60A",
+"[.	c #6BA61A",
+"}.	c #69A525",
+"|.	c #C16C6D",
+"1.	c #868784",
+"2.	c #69A62E",
+"3.	c #BE706E",
+"4.	c #C36F76",
+"5.	c #888A87",
+"6.	c #73AC16",
+"7.	c #6FAB2B",
+"8.	c #74AD18",
+"9.	c #C37473",
+"0.	c #A68858",
+"a.	c #73A933",
+"b.	c #C87977",
+"c.	c #7AAE30",
+"d.	c #79AF39",
+"e.	c #919390",
+"f.	c #C67E7F",
+"g.	c #80B22B",
+"h.	c #A88C8B",
+"i.	c #82B322",
+"j.	c #CA7D86",
+"k.	c #7DB23C",
+"l.	c #80B53F",
+"m.	c #CB8284",
+"n.	c #82B638",
+"o.	c #84B730",
+"p.	c #C88685",
+"q.	c #AE9486",
+"r.	c #88B642",
+"s.	c #9D9B9F",
+"t.	c #CB8988",
+"u.	c #C78C88",
+"v.	c #9A9FA1",
+"w.	c #82B47B",
+"x.	c #8ABD36",
+"y.	c #8EBB3E",
+"z.	c #8CBB46",
+"A.	c #91BC37",
+"B.	c #AEA661",
+"C.	c #D08E8C",
+"D.	c #90BD41",
+"E.	c #8AC332",
+"F.	c #8EBE50",
+"G.	c #91BF4A",
+"H.	c #D29195",
+"I.	c #BE9B9C",
+"J.	c #D09491",
+"K.	c #D09698",
+"L.	c #9AC14D",
+"M.	c #99C154",
+"N.	c #97BF6E",
+"O.	c #CA9D9A",
+"P.	c #99C35D",
+"Q.	c #97C758",
+"R.	c #D59B9C",
+"S.	c #CAA48D",
+"T.	c #C7A3A4",
+"U.	c #9CC660",
+"V.	c #A2C16B",
+"W.	c #D39F9F",
+"X.	c #A4C762",
+"Y.	c #A4C86A",
+"Z.	c #BBB883",
+"`.	c #DF9FA9",
+" +	c #D9A4A4",
+".+	c #9FCF60",
+"++	c #A8CC6E",
+"@+	c #ACCD61",
+"#+	c #DCA8A7",
+"$+	c #C4BB8F",
+"%+	c #BAB8BC",
+"&+	c #DAACA9",
+"*+	c #AAC898",
+"=+	c #B6BBBE",
+"-+	c #BABCB9",
+";+	c #AFCE77",
+">+	c #BAC882",
+",+	c #B2D17A",
+"'+	c #DAB5B6",
+")+	c #DFB3B6",
+"!+	c #B1CDAA",
+"~+	c #B2D482",
+"{+	c #D7B9B8",
+"]+	c #B9D383",
+"^+	c #BAD78D",
+"/+	c #BCDA96",
+"(+	c #BFDB91",
+"_+	c #E5C0C1",
+":+	c #C3DA97",
+"<+	c #E5C2C9",
+"[+	c #C2DBB2",
+"}+	c #CECED9",
+"|+	c #C5DEA2",
+"1+	c #CCDEA3",
+"2+	c #E9CAC9",
+"3+	c #CAE1B1",
+"4+	c #CEE3AE",
+"5+	c #ECCECD",
+"6+	c #D5E0BA",
+"7+	c #EAD3D0",
+"8+	c #D3E6AA",
+"9+	c #D4E4B6",
+"0+	c #EDD6D3",
+"a+	c #D5E7BF",
+"b+	c #D8E8BA",
+"c+	c #EDD9DB",
+"d+	c #D8ECB6",
+"e+	c #D8EAC2",
+"f+	c #DFE0EA",
+"g+	c #EBDEDE",
+"h+	c #F1DCDE",
+"i+	c #E0EDCD",
+"j+	c #E8E5EA",
+"k+	c #F2E4E5",
+"l+	c #E8EECF",
+"m+	c #EBE9ED",
+"n+	c #E8F3CC",
+"o+	c #E3F4D9",
+"p+	c #EAF2D9",
+"q+	c #EAEFF2",
+"r+	c #F8EAEB",
+"s+	c #F1F5E4",
+"t+	c #F9F0E9",
+"u+	c #F0F7EC",
+"v+	c #EFFAE7",
+"w+	c #F9F3F2",
+"x+	c #F2F9EE",
+"y+	c #F8F5FA",
+"z+	c #F6FAE9",
+"A+	c #F2FCF7",
+"B+	c #FDF7F6",
+"C+	c #F5FAFD",
+"D+	c #FBFAF1",
+"E+	c #FAFCF9",
+"F+	c #FFFCFA",
+"G+	c #FEFFFC",
+"                        G+G+G+G+G+G+G+G+                        ",
+"                  G+G+B+5+&+C.t.t.C. +5+B+G+G+                  ",
+"                G+o+$+=.%.4.p.K.K.p.3.` ` t.h+G+G+              ",
+"            G+D+]+M.>+'+h+k+r+r+k+r+r+h+W.=.O m.w+G+            ",
+"          G+o+Q.;+i+v+w+r+w+w+r+k+2+2+5+'+&+J.V P 7+G+          ",
+"        G+6+y.4+v+v+A+D+G+G+G+G+B+y+{+)+R.K.K.W./.r _+G+        ",
+"      G+i+y.9+D+s+D+C+G+G+y+G+G+F+C+k+K.u.C.t.f.H.'.l 2+G+      ",
+"    G+x+G.4+u+p+E+y+G+G+F+w+r+G+G+G+F+&+f.f.b.9.3.4.V O r+G+    ",
+"    F+~+Y.s+o+i+u+G+G+x+6+&+K._+F+C+y+5+3.4.3.'.'.'.'.l 9.G+    ",
+"  G+p+y.4+e+6+9+9+p+z+:+^+S.j.p.y+G+G+h+'.'.=.%.+.Z Z P l c+G+  ",
+"  C+]+X.9+|+1+:+|+:+:+]+~+Z.4.b.B+G+F+_+Z +.Z T T E I I 8 b.G+  ",
+"  D+M.^+:+/+/+:+^+^+~+~+,+++^.K.G+G+y+u.E Z T H A I t t e O B+  ",
+"y+i+y.:+:+^+^+]+;+;+;+++Y..+0.<+G+G+h+Z A H I I k o k k e 8 2+G+",
+"G+4+L.:+~+]+;+;+;+Y.X.U.X.F.V.w+G+C+u.g A o e g g a a 7 | 8 #+G+",
+"y+:+z.]+;+++Y.X.Y.P.M.M.M.r.:+G+G+r+H o g o k k 7 4 4 4 | ( K.G+",
+"G+/+y.;+X.Y.P.P.M.M.M.r.r.c.a+G+G+'+6 k k 7 4 4 4 4 | : | ^ C.G+",
+"F+:+o.Y.X.M.M.F.r.r.k.d.d.c.i+y+C+O.< 4 4 4 } | : : { ) ] 2 K.G+",
+"C+9+g.P.F.r.r.r.k.d.d.a.2.>.[+G+C+{+_ | | | : : ] ] ) ) ) ( #+G+",
+"G+p+i.r.r.d.d.d.a.a.}._._.#.N.G+C+G+K { : ] ) ) ) ) ) > : 8 5+G+",
+"  y+L.c.d.d.2.2._._.,._. at .@.X [+o+q.b { { ] ) ) ) > > ; _ F y+  ",
+"  C+:+6.a.}._.,.*.*. at .@. . at .N Q W 1 - = > , > > > > ; > ( C.G+  ",
+"  G+v+g.[.*._.#. at .Y U U Q M M M D (.T.I.c > > > ; ; & ~ i 0+G+  ",
+"    y+:+<.*.Q  .Q Q Q Q L G D s (.A+G+F+k+3 & ; ; $ ; [ C.G+    ",
+"      E+L.!.Y L U L M G B v v f *+C+G+G+C+&.$ % $ & ( V y+G+    ",
+"      y+v+x.[.G B v v G B B u 0 w.G+G+G+G+J # $ $ < x 0+G+      ",
+"        y+s+A.-.U u u q q q q q n !+G+B+h.# + % ^ r 7+G+        ",
+"          C+D+X.<.#.B n j n j u 0 d R z . & ~ 2 $.r+G+          ",
+"            G+C+4+D.<.#.G q d d d d 0 w 5 ( x  +y+F+            ",
+"                y+G+8+ at +A.8.-.[.-.[.6.E.B.`.F+C+                ",
+"            :.~.e.=+m+C+z+i+b+8+8+b+i+x+C+q+%+e.~.1.1.          ",
+"        5.:.1.1.1.:.1.s.%+}+f+f+k+f+}+%+v.5.:.:.:.5.1.5.5.      ",
+"              5.:.1.:.:.1.:.1.1.:.:.:.~.1.:.1.:.1.              "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/keducabuilder.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/keducabuilder.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/keducabuilder.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 KEDUCABUILDER 1 "September 1, 2005"
+.\" 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
+keducabuilder \- test/exam editor for KEduca
+.SH SYNOPSIS
+.B keducabuilder
+.RI "[ " generic-options " ]"
+[ \fIfile\fP ]
+.SH DESCRIPTION
+\fBKEducaBuilder\fP is the test editor for \fBKEduca\fP, a flash-card
+application for working with interactive form-based tests.
+KEducaBuilder is used to create and edit these tests, whereas KEduca
+itself can be used to view and take these tests.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkeduca \-\-help\fP.
+.SH SEE ALSO
+.BR keduca (1),
+.BR keduca-shrinker (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/keduca/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/keduca/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/keduca/\fP.
+.SH AUTHOR
+KEduca was written by Javier Campos <javi at asyris.org>,
+Klas Kalass <klas at kde.org>, Henrique Pinto <henrique.pinto at kdemail.net>
+and Anne-Marie Mahfouf <annma 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/kdeedu/debian/kgeography.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kgeography.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kgeography.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,337 @@
+usr/bin/kgeography
+usr/share/applications/kde/kgeography.desktop
+usr/share/apps/kgeography/africa.kgm
+usr/share/apps/kgeography/africa.png
+usr/share/apps/kgeography/asia.kgm
+usr/share/apps/kgeography/asia.png
+usr/share/apps/kgeography/austria.kgm
+usr/share/apps/kgeography/austria.png
+usr/share/apps/kgeography/brazil.kgm
+usr/share/apps/kgeography/brazil.png
+usr/share/apps/kgeography/canada.kgm
+usr/share/apps/kgeography/canada.png
+usr/share/apps/kgeography/china.kgm
+usr/share/apps/kgeography/china.png
+usr/share/apps/kgeography/europe.kgm
+usr/share/apps/kgeography/europe.png
+usr/share/apps/kgeography/flags/Monaco.png
+usr/share/apps/kgeography/flags/NewZealand.png
+usr/share/apps/kgeography/flags/SriLanka.png
+usr/share/apps/kgeography/flags/Vatican.png
+usr/share/apps/kgeography/flags/afghanistan.png
+usr/share/apps/kgeography/flags/albania.png
+usr/share/apps/kgeography/flags/alberta.png
+usr/share/apps/kgeography/flags/algeria.png
+usr/share/apps/kgeography/flags/andorra.png
+usr/share/apps/kgeography/flags/angola.png
+usr/share/apps/kgeography/flags/antigua.png
+usr/share/apps/kgeography/flags/argentina.png
+usr/share/apps/kgeography/flags/armenia.png
+usr/share/apps/kgeography/flags/australia.png
+usr/share/apps/kgeography/flags/austria.png
+usr/share/apps/kgeography/flags/azerbaijan.png
+usr/share/apps/kgeography/flags/baden_wurttemberg.png
+usr/share/apps/kgeography/flags/bahamas.png
+usr/share/apps/kgeography/flags/bahrain.png
+usr/share/apps/kgeography/flags/bangladesh.png
+usr/share/apps/kgeography/flags/barbados.png
+usr/share/apps/kgeography/flags/bavaria.png
+usr/share/apps/kgeography/flags/bc.png
+usr/share/apps/kgeography/flags/belarus.png
+usr/share/apps/kgeography/flags/belgium.png
+usr/share/apps/kgeography/flags/belize.png
+usr/share/apps/kgeography/flags/benin.png
+usr/share/apps/kgeography/flags/berlin.png
+usr/share/apps/kgeography/flags/bhutan.png
+usr/share/apps/kgeography/flags/bolivia.png
+usr/share/apps/kgeography/flags/bosnia_herzegovina.png
+usr/share/apps/kgeography/flags/botswana.png
+usr/share/apps/kgeography/flags/br_AC.png
+usr/share/apps/kgeography/flags/br_AL.png
+usr/share/apps/kgeography/flags/br_AM.png
+usr/share/apps/kgeography/flags/br_AP.png
+usr/share/apps/kgeography/flags/br_BA.png
+usr/share/apps/kgeography/flags/br_CE.png
+usr/share/apps/kgeography/flags/br_DF.png
+usr/share/apps/kgeography/flags/br_ES.png
+usr/share/apps/kgeography/flags/br_GO.png
+usr/share/apps/kgeography/flags/br_MA.png
+usr/share/apps/kgeography/flags/br_MG.png
+usr/share/apps/kgeography/flags/br_MS.png
+usr/share/apps/kgeography/flags/br_MT.png
+usr/share/apps/kgeography/flags/br_PA.png
+usr/share/apps/kgeography/flags/br_PE.png
+usr/share/apps/kgeography/flags/br_PI.png
+usr/share/apps/kgeography/flags/br_PN.png
+usr/share/apps/kgeography/flags/br_PR.png
+usr/share/apps/kgeography/flags/br_RJ.png
+usr/share/apps/kgeography/flags/br_RN.png
+usr/share/apps/kgeography/flags/br_RO.png
+usr/share/apps/kgeography/flags/br_RR.png
+usr/share/apps/kgeography/flags/br_RS.png
+usr/share/apps/kgeography/flags/br_SC.png
+usr/share/apps/kgeography/flags/br_SE.png
+usr/share/apps/kgeography/flags/br_SP.png
+usr/share/apps/kgeography/flags/br_TO.png
+usr/share/apps/kgeography/flags/brandenburg.png
+usr/share/apps/kgeography/flags/brazil.png
+usr/share/apps/kgeography/flags/bremen.png
+usr/share/apps/kgeography/flags/brunei.png
+usr/share/apps/kgeography/flags/bulgaria.png
+usr/share/apps/kgeography/flags/burkina.png
+usr/share/apps/kgeography/flags/burundi.png
+usr/share/apps/kgeography/flags/cambodia.png
+usr/share/apps/kgeography/flags/cameroon.png
+usr/share/apps/kgeography/flags/canada.png
+usr/share/apps/kgeography/flags/central_african_republic.png
+usr/share/apps/kgeography/flags/chad.png
+usr/share/apps/kgeography/flags/chile.png
+usr/share/apps/kgeography/flags/china.png
+usr/share/apps/kgeography/flags/colombia.png
+usr/share/apps/kgeography/flags/congo_brazzaville.png
+usr/share/apps/kgeography/flags/congo_kinshasa.png
+usr/share/apps/kgeography/flags/costa_rica.png
+usr/share/apps/kgeography/flags/cote_divoire.png
+usr/share/apps/kgeography/flags/croatia.png
+usr/share/apps/kgeography/flags/cuba_3x2.png
+usr/share/apps/kgeography/flags/cyprus_4x3.png
+usr/share/apps/kgeography/flags/czech.png
+usr/share/apps/kgeography/flags/denmark.png
+usr/share/apps/kgeography/flags/djibouti.png
+usr/share/apps/kgeography/flags/dominica.png
+usr/share/apps/kgeography/flags/dominicanrepublic.png
+usr/share/apps/kgeography/flags/easttimor.png
+usr/share/apps/kgeography/flags/ecuador.png
+usr/share/apps/kgeography/flags/egypt.png
+usr/share/apps/kgeography/flags/el_salvador.png
+usr/share/apps/kgeography/flags/equatorial_guinea.png
+usr/share/apps/kgeography/flags/eritrea.png
+usr/share/apps/kgeography/flags/estonia.png
+usr/share/apps/kgeography/flags/ethiopia.png
+usr/share/apps/kgeography/flags/fiji.png
+usr/share/apps/kgeography/flags/finland.png
+usr/share/apps/kgeography/flags/france.png
+usr/share/apps/kgeography/flags/gabon.png
+usr/share/apps/kgeography/flags/gambia.png
+usr/share/apps/kgeography/flags/georgia.png
+usr/share/apps/kgeography/flags/germany.png
+usr/share/apps/kgeography/flags/ghana.png
+usr/share/apps/kgeography/flags/greece.png
+usr/share/apps/kgeography/flags/greenland.png
+usr/share/apps/kgeography/flags/guatemala.png
+usr/share/apps/kgeography/flags/guinea.png
+usr/share/apps/kgeography/flags/guineabissau.png
+usr/share/apps/kgeography/flags/guyana.png
+usr/share/apps/kgeography/flags/haiti.png
+usr/share/apps/kgeography/flags/hamburg.png
+usr/share/apps/kgeography/flags/hesse.png
+usr/share/apps/kgeography/flags/honduras.png
+usr/share/apps/kgeography/flags/hungary.png
+usr/share/apps/kgeography/flags/iceland.png
+usr/share/apps/kgeography/flags/india.png
+usr/share/apps/kgeography/flags/indonesia.png
+usr/share/apps/kgeography/flags/iran.png
+usr/share/apps/kgeography/flags/iraq.png
+usr/share/apps/kgeography/flags/ireland.png
+usr/share/apps/kgeography/flags/israel.png
+usr/share/apps/kgeography/flags/italy.png
+usr/share/apps/kgeography/flags/italy/it-abr200.png
+usr/share/apps/kgeography/flags/italy/it-aos200.png
+usr/share/apps/kgeography/flags/italy/it-bas200.png
+usr/share/apps/kgeography/flags/italy/it-cal200.png
+usr/share/apps/kgeography/flags/italy/it-cam200.png
+usr/share/apps/kgeography/flags/italy/it-emi200.png
+usr/share/apps/kgeography/flags/italy/it-fri200.png
+usr/share/apps/kgeography/flags/italy/it-lat200.png
+usr/share/apps/kgeography/flags/italy/it-lig200.png
+usr/share/apps/kgeography/flags/italy/it-lom200.png
+usr/share/apps/kgeography/flags/italy/it-mar200.png
+usr/share/apps/kgeography/flags/italy/it-mol200.png
+usr/share/apps/kgeography/flags/italy/it-pie200.png
+usr/share/apps/kgeography/flags/italy/it-pug200.png
+usr/share/apps/kgeography/flags/italy/it-sar200.png
+usr/share/apps/kgeography/flags/italy/it-sic200.png
+usr/share/apps/kgeography/flags/italy/it-tre200.png
+usr/share/apps/kgeography/flags/italy/it-tus200.png
+usr/share/apps/kgeography/flags/italy/it-umb200.png
+usr/share/apps/kgeography/flags/italy/it-ven200.png
+usr/share/apps/kgeography/flags/jamaica.png
+usr/share/apps/kgeography/flags/japan.png
+usr/share/apps/kgeography/flags/jordan.png
+usr/share/apps/kgeography/flags/kazakhstan.png
+usr/share/apps/kgeography/flags/kenya.png
+usr/share/apps/kgeography/flags/kuwait.png
+usr/share/apps/kgeography/flags/kyrgyzstan.png
+usr/share/apps/kgeography/flags/laos.png
+usr/share/apps/kgeography/flags/latvia.png
+usr/share/apps/kgeography/flags/lebanon.png
+usr/share/apps/kgeography/flags/lesotho.png
+usr/share/apps/kgeography/flags/liberia.png
+usr/share/apps/kgeography/flags/libya.png
+usr/share/apps/kgeography/flags/lithuania.png
+usr/share/apps/kgeography/flags/lower_saxony.png
+usr/share/apps/kgeography/flags/luxembourg.png
+usr/share/apps/kgeography/flags/macedonia.png
+usr/share/apps/kgeography/flags/madagascar.png
+usr/share/apps/kgeography/flags/malawi.png
+usr/share/apps/kgeography/flags/malaysia.png
+usr/share/apps/kgeography/flags/mali.png
+usr/share/apps/kgeography/flags/manitoba.png
+usr/share/apps/kgeography/flags/mauritania.png
+usr/share/apps/kgeography/flags/mecklenburg_western_pomerania.png
+usr/share/apps/kgeography/flags/mexico.png
+usr/share/apps/kgeography/flags/moldova.png
+usr/share/apps/kgeography/flags/mongolia.png
+usr/share/apps/kgeography/flags/morocco.png
+usr/share/apps/kgeography/flags/mozambique.png
+usr/share/apps/kgeography/flags/myanmar.png
+usr/share/apps/kgeography/flags/namibia.png
+usr/share/apps/kgeography/flags/nepal.png
+usr/share/apps/kgeography/flags/netherlands.png
+usr/share/apps/kgeography/flags/newbrunswick.png
+usr/share/apps/kgeography/flags/newfoundland.png
+usr/share/apps/kgeography/flags/nicaragua.png
+usr/share/apps/kgeography/flags/niger.png
+usr/share/apps/kgeography/flags/nigeria.png
+usr/share/apps/kgeography/flags/nkorea.png
+usr/share/apps/kgeography/flags/north_rhine_westphalia.png
+usr/share/apps/kgeography/flags/norway.png
+usr/share/apps/kgeography/flags/novascotia.png
+usr/share/apps/kgeography/flags/nunavut.png
+usr/share/apps/kgeography/flags/nwterritories.png
+usr/share/apps/kgeography/flags/oman.png
+usr/share/apps/kgeography/flags/ontario.png
+usr/share/apps/kgeography/flags/pakistan.png
+usr/share/apps/kgeography/flags/panama.png
+usr/share/apps/kgeography/flags/papua_new_guinea.png
+usr/share/apps/kgeography/flags/paraguay.png
+usr/share/apps/kgeography/flags/pei.png
+usr/share/apps/kgeography/flags/peru.png
+usr/share/apps/kgeography/flags/philippines.png
+usr/share/apps/kgeography/flags/poland.png
+usr/share/apps/kgeography/flags/portugal.png
+usr/share/apps/kgeography/flags/qatar.png
+usr/share/apps/kgeography/flags/quebec.png
+usr/share/apps/kgeography/flags/rhineland_palatinate.png
+usr/share/apps/kgeography/flags/romania.png
+usr/share/apps/kgeography/flags/russia.png
+usr/share/apps/kgeography/flags/rwanda.png
+usr/share/apps/kgeography/flags/saarland.png
+usr/share/apps/kgeography/flags/san_marino.png
+usr/share/apps/kgeography/flags/saskatchewan.png
+usr/share/apps/kgeography/flags/saudiarabia.png
+usr/share/apps/kgeography/flags/saxony.png
+usr/share/apps/kgeography/flags/saxony_anhalt.png
+usr/share/apps/kgeography/flags/schleswig_holstein.png
+usr/share/apps/kgeography/flags/senegal.png
+usr/share/apps/kgeography/flags/serbiamontenegro_3x2.png
+usr/share/apps/kgeography/flags/sierra_leone.png
+usr/share/apps/kgeography/flags/singapore.png
+usr/share/apps/kgeography/flags/skorea.png
+usr/share/apps/kgeography/flags/slovakia.png
+usr/share/apps/kgeography/flags/slovenia.png
+usr/share/apps/kgeography/flags/somalia.png
+usr/share/apps/kgeography/flags/southafrica.png
+usr/share/apps/kgeography/flags/spain.png
+usr/share/apps/kgeography/flags/sudan.png
+usr/share/apps/kgeography/flags/suriname.png
+usr/share/apps/kgeography/flags/swaziland.png
+usr/share/apps/kgeography/flags/sweden.png
+usr/share/apps/kgeography/flags/switzerland.png
+usr/share/apps/kgeography/flags/syria.png
+usr/share/apps/kgeography/flags/taiwan.png
+usr/share/apps/kgeography/flags/tajikistan.png
+usr/share/apps/kgeography/flags/tanzania.png
+usr/share/apps/kgeography/flags/thailand.png
+usr/share/apps/kgeography/flags/thuringia.png
+usr/share/apps/kgeography/flags/togo.png
+usr/share/apps/kgeography/flags/tonga.png
+usr/share/apps/kgeography/flags/trinidad_tobago.png
+usr/share/apps/kgeography/flags/tunisia.png
+usr/share/apps/kgeography/flags/turkey.png
+usr/share/apps/kgeography/flags/turkmenistan.png
+usr/share/apps/kgeography/flags/uae.png
+usr/share/apps/kgeography/flags/uganda.png
+usr/share/apps/kgeography/flags/uk.png
+usr/share/apps/kgeography/flags/ukraine.png
+usr/share/apps/kgeography/flags/uruguay.png
+usr/share/apps/kgeography/flags/usa.png
+usr/share/apps/kgeography/flags/uzbekistan.png
+usr/share/apps/kgeography/flags/venezuela.png
+usr/share/apps/kgeography/flags/vietnam.png
+usr/share/apps/kgeography/flags/western_sahara.png
+usr/share/apps/kgeography/flags/yemen.png
+usr/share/apps/kgeography/flags/yukon.png
+usr/share/apps/kgeography/flags/zambia.png
+usr/share/apps/kgeography/flags/zimbabwe.png
+usr/share/apps/kgeography/france.kgm
+usr/share/apps/kgeography/france.png
+usr/share/apps/kgeography/germany.kgm
+usr/share/apps/kgeography/germany.png
+usr/share/apps/kgeography/italy.kgm
+usr/share/apps/kgeography/italy.png
+usr/share/apps/kgeography/italyprovince.kgm
+usr/share/apps/kgeography/italyprovince.png
+usr/share/apps/kgeography/kgeographyui.rc
+usr/share/apps/kgeography/ncamerica.kgm
+usr/share/apps/kgeography/ncamerica.png
+usr/share/apps/kgeography/netherlands.kgm
+usr/share/apps/kgeography/netherlands.png
+usr/share/apps/kgeography/norway.kgm
+usr/share/apps/kgeography/norway.png
+usr/share/apps/kgeography/poland.kgm
+usr/share/apps/kgeography/poland.png
+usr/share/apps/kgeography/southamerica.kgm
+usr/share/apps/kgeography/southamerica.png
+usr/share/apps/kgeography/spain.kgm
+usr/share/apps/kgeography/spain.png
+usr/share/apps/kgeography/usa.kgm
+usr/share/apps/kgeography/usa.png
+usr/share/apps/kgeography/world.kgm
+usr/share/apps/kgeography/world.png
+usr/share/config.kcfg/kgeography.kcfg
+usr/share/doc/kde/HTML/en/kgeography/commands.html
+usr/share/doc/kde/HTML/en/kgeography/common
+usr/share/doc/kde/HTML/en/kgeography/compilation.html
+usr/share/doc/kde/HTML/en/kgeography/credits.html
+usr/share/doc/kde/HTML/en/kgeography/description-file.html
+usr/share/doc/kde/HTML/en/kgeography/first-start1.png
+usr/share/doc/kde/HTML/en/kgeography/first-start10.png
+usr/share/doc/kde/HTML/en/kgeography/first-start11.png
+usr/share/doc/kde/HTML/en/kgeography/first-start12.png
+usr/share/doc/kde/HTML/en/kgeography/first-start2.png
+usr/share/doc/kde/HTML/en/kgeography/first-start3.png
+usr/share/doc/kde/HTML/en/kgeography/first-start4.png
+usr/share/doc/kde/HTML/en/kgeography/first-start5.png
+usr/share/doc/kde/HTML/en/kgeography/first-start6.png
+usr/share/doc/kde/HTML/en/kgeography/first-start7.png
+usr/share/doc/kde/HTML/en/kgeography/first-start8.png
+usr/share/doc/kde/HTML/en/kgeography/first-start9.png
+usr/share/doc/kde/HTML/en/kgeography/flags.html
+usr/share/doc/kde/HTML/en/kgeography/how-to-maps.html
+usr/share/doc/kde/HTML/en/kgeography/how-to-test.html
+usr/share/doc/kde/HTML/en/kgeography/index.cache.bz2
+usr/share/doc/kde/HTML/en/kgeography/index.docbook
+usr/share/doc/kde/HTML/en/kgeography/index.html
+usr/share/doc/kde/HTML/en/kgeography/installation.html
+usr/share/doc/kde/HTML/en/kgeography/introduction.html
+usr/share/doc/kde/HTML/en/kgeography/kgeography.png
+usr/share/doc/kde/HTML/en/kgeography/map-file.html
+usr/share/doc/kde/HTML/en/kgeography/non-political-maps.html
+usr/share/doc/kde/HTML/en/kgeography/quick-start.html
+usr/share/doc/kde/HTML/en/kgeography/river.png
+usr/share/doc/kde/HTML/en/kgeography/using-kapp.html
+usr/share/doc/kde/HTML/en/kgeography/zoom.png
+usr/share/icons/crystalsvg/128x128/apps/kgeography.png
+usr/share/icons/crystalsvg/16x16/apps/kgeography.png
+usr/share/icons/crystalsvg/22x22/apps/kgeography.png
+usr/share/icons/crystalsvg/32x32/apps/kgeography.png
+usr/share/icons/crystalsvg/48x48/apps/kgeography.png
+usr/share/icons/crystalsvg/64x64/apps/kgeography.png
+usr/share/icons/crystalsvg/scalable/apps/kgeography.svgz
+usr/share/icons/hicolor/128x128/apps/kgeography.png
+usr/share/icons/hicolor/16x16/apps/kgeography.png
+usr/share/icons/hicolor/22x22/apps/kgeography.png
+usr/share/icons/hicolor/32x32/apps/kgeography.png
+usr/share/icons/hicolor/48x48/apps/kgeography.png
+usr/share/icons/hicolor/64x64/apps/kgeography.png

Added: people/jriddell/KDE/3.5/kdeedu/debian/khangman.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/khangman.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/khangman.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 KHANGMAN 1 "October 16, 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
+khangman \- the classical hangman game for KDE
+.SH SYNOPSIS
+.B khangman
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKHangMan\fP is a game based on the well known hangman game.  It is aimed
+for children aged 6 and above.  It has four levels of difficulty:
+Animals (animals words), Easy, Medium and Hard.
+.PP
+A word is picked at random and the letters are hidden.  You must guess
+the word by trying one letter after another.  Each time you guess a wrong
+letter, a picture of a hangman is drawn.  You must guess the word before
+getting hanged!  You have 10 tries.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkhangman \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/khangman/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/khangman/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/khangman/\fP.
+.SH AUTHOR
+KHangMan was written by Primoz Anzur <zerokode at gmx.net> and
+Anne-Marie Mahfouf <annma 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/kdeedu/debian/khangman.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/khangman.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/khangman.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KHangMan for Debian
+-------------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/khangman.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/khangman.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/khangman.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+etc/kde3/khangmanrc
+usr/bin/khangman
+usr/share/applications/kde/khangman.desktop
+usr/share/apps/khangman
+usr/share/config.kcfg/khangman.kcfg
+usr/share/doc/kde/HTML/en/khangman/*.docbook
+usr/share/doc/kde/HTML/en/khangman/*.png
+usr/share/doc/kde/HTML/en/khangman/common
+usr/share/doc/kde/HTML/en/khangman/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/khangman.png
+usr/share/icons/hicolor/16x16/apps/khangman.png
+usr/share/icons/hicolor/22x22/apps/khangman.png
+usr/share/icons/hicolor/32x32/apps/khangman.png
+usr/share/icons/hicolor/48x48/apps/khangman.png
+usr/share/icons/hicolor/64x64/apps/khangman.png
+usr/share/icons/hicolor/scalable/apps/khangman.svgz
+
+../khangman.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/khangman.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/khangman.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/khangman.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(khangman):needs="X11"\
+  section="Games/Puzzles"\
+  hints="KDE"\
+  title="KHangMan"\
+  longtitle="KHangMan (Hangman Game)"\
+  command="/usr/bin/khangman"\
+  icon="/usr/share/pixmaps/khangman.xpm"

Added: people/jriddell/KDE/3.5/kdeedu/debian/khangman.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/khangman.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/khangman.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,224 @@
+/* XPM */
+static char * khangman_xpm[] = {
+"32 32 189 2",
+"  	c None",
+". 	c #3B2115",
+"+ 	c #3C2216",
+"@ 	c #3D2217",
+"# 	c #3D2317",
+"$ 	c #3D2318",
+"% 	c #3D2418",
+"& 	c #3E2419",
+"* 	c #422315",
+"= 	c #3F251A",
+"- 	c #432415",
+"; 	c #40271B",
+"> 	c #41281C",
+", 	c #42291D",
+"' 	c #4C2614",
+") 	c #422A1E",
+"! 	c #432A1E",
+"~ 	c #432B1F",
+"{ 	c #462A1D",
+"] 	c #442B20",
+"^ 	c #452C21",
+"/ 	c #452D22",
+"( 	c #462D22",
+"_ 	c #472E23",
+": 	c #472F24",
+"< 	c #483025",
+"[ 	c #4A3227",
+"} 	c #4B3328",
+"| 	c #5E2D17",
+"1 	c #4C3429",
+"2 	c #5A301D",
+"3 	c #4C352A",
+"4 	c #4D352A",
+"5 	c #4F382D",
+"6 	c #50392E",
+"7 	c #51392F",
+"8 	c #6E3216",
+"9 	c #6F3216",
+"0 	c #533C31",
+"a 	c #703318",
+"b 	c #543E33",
+"c 	c #71351A",
+"d 	c #563F35",
+"e 	c #72361B",
+"f 	c #574036",
+"g 	c #594339",
+"h 	c #5B453B",
+"i 	c #763C22",
+"j 	c #5B463C",
+"k 	c #634638",
+"l 	c #784026",
+"m 	c #5F4A40",
+"n 	c #604B41",
+"o 	c #7B442A",
+"p 	c #624D44",
+"q 	c #7A462D",
+"r 	c #655047",
+"s 	c #7E482F",
+"t 	c #655147",
+"u 	c #665248",
+"v 	c #6A564D",
+"w 	c #6C5950",
+"x 	c #85513A",
+"y 	c #71584C",
+"z 	c #6E5A52",
+"A 	c #87553F",
+"B 	c #726057",
+"C 	c #736158",
+"D 	c #746159",
+"E 	c #75625A",
+"F 	c #75635B",
+"G 	c #76645C",
+"H 	c #8D5D46",
+"I 	c #77655D",
+"J 	c #78665D",
+"K 	c #7E6458",
+"L 	c #90614C",
+"M 	c #7B6961",
+"N 	c #936550",
+"O 	c #946651",
+"P 	c #817069",
+"Q 	c #85756D",
+"R 	c #877770",
+"S 	c #897A73",
+"T 	c #8A7B74",
+"U 	c #9F7664",
+"V 	c #8C7D76",
+"W 	c #8D7E77",
+"X 	c #A27C6A",
+"Y 	c #A47D6B",
+"Z 	c #92837D",
+"` 	c #94867F",
+" .	c #958780",
+"..	c #A78271",
+"+.	c #968881",
+"@.	c #998B84",
+"#.	c #998B85",
+"$.	c #9A8D87",
+"%.	c #9B8E88",
+"&.	c #9D908A",
+"*.	c #AE8B7B",
+"=.	c #AA8D7F",
+"-.	c #A39791",
+";.	c #A49792",
+">.	c #B39284",
+",.	c #A59994",
+"'.	c #A99D98",
+").	c #B89B8D",
+"!.	c #B99B8E",
+"~.	c #AFA4A0",
+"{.	c #B0A5A0",
+"].	c #C0A69A",
+"^.	c #C1A79B",
+"/.	c #B5ABA7",
+"(.	c #BBB2AD",
+"_.	c #BBB2AE",
+":.	c #BEB5B1",
+"<.	c #C9B2A7",
+"[.	c #BEB6B2",
+"}.	c #CBB5AB",
+"|.	c #C3BBB7",
+"1.	c #C9C2BF",
+"2.	c #CAC3C0",
+"3.	c #CBC4C0",
+"4.	c #CBC4C1",
+"5.	c #D4C2BA",
+"6.	c #CFC8C5",
+"7.	c #CFC9C6",
+"8.	c #D0CAC7",
+"9.	c #D5D0CD",
+"0.	c #D6D1CE",
+"a.	c #DDCFC8",
+"b.	c #DED0CA",
+"c.	c #DFD1CB",
+"d.	c #D9D3D1",
+"e.	c #DAD5D3",
+"f.	c #E1D4CF",
+"g.	c #E2D5CF",
+"h.	c #E2D6D0",
+"i.	c #DCD8D6",
+"j.	c #DDD9D7",
+"k.	c #DEDAD8",
+"l.	c #E4D9D4",
+"m.	c #E0DCDA",
+"n.	c #E2DEDC",
+"o.	c #E3DFDD",
+"p.	c #E3E0DE",
+"q.	c #E8DFDA",
+"r.	c #E4E1DF",
+"s.	c #E5E1E0",
+"t.	c #E5E2DF",
+"u.	c #E6E2E1",
+"v.	c #E7E4E2",
+"w.	c #E7E4E3",
+"x.	c #EBE3DF",
+"y.	c #E8E5E3",
+"z.	c #ECE4E0",
+"A.	c #EDE5E2",
+"B.	c #EBE6E3",
+"C.	c #E9E7E5",
+"D.	c #EAE7E6",
+"E.	c #EBE8E7",
+"F.	c #ECE9E8",
+"G.	c #F0EAE7",
+"H.	c #EDEBEA",
+"I.	c #EEEBEA",
+"J.	c #EEECEA",
+"K.	c #F1EBE8",
+"L.	c #EEECEB",
+"M.	c #F1ECE9",
+"N.	c #EFEDEC",
+"O.	c #F2F0EF",
+"P.	c #F4F0EE",
+"Q.	c #F3F1F0",
+"R.	c #F3F2F1",
+"S.	c #F7F4F2",
+"T.	c #F8F5F3",
+"U.	c #F8F5F4",
+"V.	c #F7F6F6",
+"W.	c #F8F7F7",
+"X.	c #F9F8F8",
+"Y.	c #FAF8F7",
+"Z.	c #FAF9F8",
+"`.	c #FBF9F9",
+" +	c #FAFAF9",
+".+	c #FCFCFB",
+"++	c #FCFCFC",
+"@+	c #FDFCFB",
+"#+	c #FFFFFF",
+"                  #+#+#+#+#+#+#+#+#+#+#+#+#+#+#+#+#+            ",
+"              #+j.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.F.          ",
+"            #+-.. . . . . . . . . . . . . . . . . . 1 O.        ",
+"            #+J & &.&.&.&.&.&.&.&.&. at .2 K &.&.&.&.&.[.#+        ",
+"            #+J > #+#+#+#+#+#+#+#+#+#+l.).Y.#+#+#+#+#+          ",
+"            #+J > #+                  Z.9 5.#+                  ",
+"            #+I > #+                  #+N q.#+                  ",
+"            #+I , #+                #+M.L S.#+                  ",
+"            #+I , #+              #+Z.X l `.#+                  ",
+"            #+G , #+          #+ at +G.O e a b.#+                  ",
+"            #+G ! #+        #+T.x o h.K.U ].#+                  ",
+"            #+G ! #+      #+f.!.>.z.#+U.H x.#+#+                ",
+"            #+F ! #+      #+s Y #+#+#+}.i B.u.n.#+  #+R.#+#+#+  ",
+"            #+F ~ #+    #+#+*.P.#+#+#+^.g._ . t #+#+p.( 7 P L.#+",
+"            #+F ~ #+    #+a.c K.#+Q.x.9 c._ . t #+X.n . . S #+  ",
+"            #+F ~ #+      S.H <.3.[ y A J._ . t #+T . . u  +#+  ",
+"            #+E ] #+      #+#+U q * - | '._ . t (.. . 4 D.#+    ",
+"            #+E ] #+        #+A...k ' 8 j._ . 7 ] . = 8.#+      ",
+"            #+E ] #+          #+#+V { =.#+_ . . . . j .+#+      ",
+"            #+D ^ #+      #+#+#+W.: R #+#+_ . p r . . #.#+      ",
+"            #+D ^ #+      #+;.m ; . 4.#+#+_ . t o.! . # 6.#+    ",
+"            #+D ^ #+      #+J . . . 9.#+#+_ . t #+~.. . 7 O.#+  ",
+"            #+C ( #+        1.R b . |.#+#+_ . t #+#+D . . M #+  ",
+"            #+C ( #+            ++b M #+#+: 1 Q #+#+H.[ 0 W Q.  ",
+"            #+C ( #+            #+$.+ 7.#+X.#+#+#+#+4.:.#+#+#+  ",
+"          #+N./ @ r.#+        #+L.6 . , (..+#+#+Q.S . = [.#+#+  ",
+"        #+E.h ) $ 5 m.#+      #+z . . } + < B g # # } . % [.#+  ",
+"    #+#+w.d h w ( v 1 i.#+#+  #+{.# Z V.j.v . . G v.V.` ] k.#+  ",
+"  #+/.%.( 3  .f ; #.b , +.,. +  #+t.#+    _.. . :.#+  #+I.#+    ",
+"  y.] . . . . . . . . . . + 2.#+          D.. . s.#+            ",
+"  #+C.e.e.e.e.e.e.e.e.e.e.n.#+            #+0.d.#+              ",
+"      #+#+#+#+#+#+#+#+#+#+                                      "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kig.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kig.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kig.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,81 @@
+.\"                                      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 KIG 1 "October 16, 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
+kig \- an interactive geometry program for KDE
+.SH SYNOPSIS
+.B kig
+.RI "[ " generic-options " ]"
+[ \fIURL\fP ]
+.br
+.B kig \-c, \-\-convert\-to\-native
+[ \fB\-o, \-\-outfile\fP \fInative-file\fP ]
+\fIfile\fP
+.SH DESCRIPTION
+\fBKig\fP is an application for interactive geometry.  It is intended to
+serve two purposes:
+.PP
+.RS
+\- to allow students to interactively explore mathematical figures and
+concepts using the computer;
+.PP
+\- to serve as a WYSIWYG tool for drawing mathematical figures and
+including them in other documents.
+.RE
+.PP
+With this program you can do geometry on a computer just like you would
+on a blackboard in a classroom.  However, the program allows you to move
+and change parts of a geometrical drawing so that you can see how the other
+parts change as a result.
+.PP
+Kig supports loci and user-defined macros.  It also supports imports
+and exports to/from foreign file formats including Cabri, Dr. Geo, KGeo,
+KSeg and XFig.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+Below are the kig-specific options.
+For a full summary of options, run \fIkig \-\-help\fP.
+.TP
+.B \-c, \-\-convert\-to\-native
+Do not show a GUI.  Instead, convert the specified file to the native
+Kig format.  The native Kig file will be written to standard output
+unless \-\-outfile is passed (see below).
+.TP
+\fB\-o, \-\-outfile\fP \fInative-file\fP
+Used with \-\-convert\-to\-native to specify where to save the newly
+created Kig file.  Note that a filename of '\-' means standard
+output (which is also the default).
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kig/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kig/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kig/\fP.
+.SH AUTHOR
+Kig was written by Dominique Devriese <devriese at kde.org>,
+Maurizio Paolini <paolini at dmf.bs.unicatt.it>,
+Franco Pasquarelli <pasqui at dmf.bs.unicatt.it>,
+Pino Toscano <toscano.pino at tiscali.it> 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/kdeedu/debian/kig.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kig.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kig.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Kig for Debian
+--------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 31 Jan 2004 12:08:48 +1100

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kig.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kig.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kig.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,41 @@
+etc/kde3/magic/cabri.magic
+etc/kde3/magic/drgeo.magic
+usr/bin/kig
+usr/bin/pykig.py
+usr/lib/kde3/kfile_drgeo.la
+usr/lib/kde3/kfile_drgeo.so
+usr/lib/kde3/kfile_kig.la
+usr/lib/kde3/kfile_kig.so
+usr/lib/kde3/libkigpart.la
+usr/lib/kde3/libkigpart.so
+usr/share/applications/kde/kig.desktop
+usr/share/apps/katepart/syntax/python-kig.xml
+usr/share/apps/kig
+usr/share/doc/kde/HTML/en/kig/*.bz2
+usr/share/doc/kde/HTML/en/kig/*.docbook
+usr/share/doc/kde/HTML/en/kig/*.png
+usr/share/doc/kde/HTML/en/kig/common
+usr/share/icons/crystalsvg/128x128/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/16x16/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/22x22/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/32x32/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/48x48/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/64x64/mimetypes/kig_doc.png
+usr/share/icons/crystalsvg/scalable/mimetypes/kig_doc.svgz
+usr/share/icons/hicolor/128x128/apps/kig.png
+usr/share/icons/hicolor/16x16/apps/kig.png
+usr/share/icons/hicolor/22x22/apps/kig.png
+usr/share/icons/hicolor/32x32/apps/kig.png
+usr/share/icons/hicolor/48x48/apps/kig.png
+usr/share/icons/hicolor/64x64/apps/kig.png
+usr/share/icons/hicolor/scalable/apps/kig.svgz
+usr/share/mimelnk/application/x-cabri.desktop
+usr/share/mimelnk/application/x-drgeo.desktop
+usr/share/mimelnk/application/x-kgeo.desktop
+usr/share/mimelnk/application/x-kig.desktop
+usr/share/mimelnk/application/x-kseg.desktop
+usr/share/services/kfile_drgeo.desktop
+usr/share/services/kfile_kig.desktop
+usr/share/services/kig_part.desktop
+
+../kig.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kig.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kig.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kig.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kig):needs="X11"\
+  section="Apps/Math"\
+  hints="KDE"\
+  title="Kig"\
+  longtitle="Kig (Interactive Geometry)"\
+  command="/usr/bin/kig"\
+  icon="/usr/share/pixmaps/kig.xpm"
+

Added: people/jriddell/KDE/3.5/kdeedu/debian/kig.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kig.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kig.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * kig_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #6A2800",
+"+ 	c #4E504D",
+"@ 	c #654A44",
+"# 	c #B82C0D",
+"$ 	c #565855",
+"% 	c #C42E0C",
+"& 	c #5E5C5A",
+"* 	c #C13C17",
+"= 	c #C13C1E",
+"- 	c #60625F",
+"; 	c #9F4D4B",
+"> 	c #985557",
+", 	c #A94F50",
+"' 	c #985A54",
+") 	c #6B6D6A",
+"! 	c #A85843",
+"~ 	c #AF544E",
+"{ 	c #8F6357",
+"] 	c #AD5E29",
+"^ 	c #BA5152",
+"/ 	c #A75E4B",
+"( 	c #A4614C",
+"_ 	c #D44F40",
+": 	c #C2564C",
+"< 	c #D7513C",
+"[ 	c #876C88",
+"} 	c #B45F5C",
+"| 	c #CE5C36",
+"1 	c #837682",
+"2 	c #B06759",
+"3 	c #C56736",
+"4 	c #DA5757",
+"5 	c #B26B67",
+"6 	c #B66E4D",
+"7 	c #D75C5D",
+"8 	c #DF5E3E",
+"9 	c #C5694A",
+"0 	c #D5683E",
+"a 	c #DF643A",
+"b 	c #698AB1",
+"c 	c #BA764D",
+"d 	c #DF692E",
+"e 	c #BB7269",
+"f 	c #B17964",
+"g 	c #BF7749",
+"h 	c #6390C2",
+"i 	c #E56837",
+"j 	c #DF6F29",
+"k 	c #B77676",
+"l 	c #608DED",
+"m 	c #898B88",
+"n 	c #D47728",
+"o 	c #DE6F38",
+"p 	c #DB733F",
+"q 	c #918B8A",
+"r 	c #AF826E",
+"s 	c #D57938",
+"t 	c #8F918E",
+"u 	c #E57928",
+"v 	c #FF7600",
+"w 	c #639AFA",
+"x 	c #C2817F",
+"y 	c #7696E5",
+"z 	c #66A0DE",
+"A 	c #6C9AF4",
+"B 	c #F77B20",
+"C 	c #EB8026",
+"D 	c #D97A78",
+"E 	c #5EA0FE",
+"F 	c #CF8751",
+"G 	c #C28588",
+"H 	c #64A2ED",
+"I 	c #B58B8E",
+"J 	c #A9918F",
+"K 	c #E08349",
+"L 	c #DB7A8B",
+"M 	c #E0834F",
+"N 	c #FF8200",
+"O 	c #D38A4E",
+"P 	c #61A5FD",
+"Q 	c #F87274",
+"R 	c #EB8539",
+"S 	c #CC868C",
+"T 	c #71A1F5",
+"U 	c #E4874C",
+"V 	c #E38A3F",
+"W 	c #C38B93",
+"X 	c #F5777C",
+"Y 	c #6DA5FE",
+"Z 	c #C28F8F",
+"` 	c #AA9B96",
+" .	c #DA8A6F",
+"..	c #75A4F9",
+"+.	c #B0999C",
+"@.	c #C29196",
+"#.	c #DA9449",
+"$.	c #FE9000",
+"%.	c #EB8C4A",
+"&.	c #D9898D",
+"*.	c #70AAFD",
+"=.	c #D58C8D",
+"-.	c #FE9207",
+";.	c #CC9199",
+">.	c #D68CA0",
+",.	c #EB914D",
+"'.	c #E18A90",
+").	c #EA9153",
+"!.	c #DC9859",
+"~.	c #B3A0A2",
+"{.	c #A5A7A4",
+"].	c #E9898D",
+"^.	c #D49397",
+"/.	c #EF9449",
+"(.	c #7CAEFB",
+"_.	c #DD9A61",
+":.	c #E99656",
+"<.	c #FF9B00",
+"[.	c #E99A43",
+"}.	c #E8965C",
+"|.	c #EB9750",
+"1.	c #6EB6FF",
+"2.	c #BBA29A",
+"3.	c #C69C9F",
+"4.	c #F4973E",
+"5.	c #86B1F9",
+"6.	c #E09697",
+"7.	c #8EB3F6",
+"8.	c #E99F6E",
+"9.	c #BBACA7",
+"0.	c #FFA70A",
+"a.	c #FFA900",
+"b.	c #EB979B",
+"c.	c #F3A73E",
+"d.	c #E3A95F",
+"e.	c #FEAD00",
+"f.	c #FEAE10",
+"g.	c #9FBBD2",
+"h.	c #8EBCFE",
+"i.	c #A2B6E9",
+"j.	c #C0B3B4",
+"k.	c #C7AFB9",
+"l.	c #9ABFE1",
+"m.	c #DDA8A8",
+"n.	c #FFB125",
+"o.	c #F2A0A4",
+"p.	c #94C0FC",
+"q.	c #F7B045",
+"r.	c #F6AC60",
+"s.	c #FEB430",
+"t.	c #FEB543",
+"u.	c #FFBA2A",
+"v.	c #E6B29E",
+"w.	c #96CAFE",
+"x.	c #F0B86C",
+"y.	c #A8C4F6",
+"z.	c #FEBB3E",
+"A.	c #FFBC36",
+"B.	c #FBB767",
+"C.	c #FFBF49",
+"D.	c #F5BB7C",
+"E.	c #D4BFC2",
+"F.	c #D1C0C8",
+"G.	c #F7BC77",
+"H.	c #A7CDFD",
+"I.	c #ADCDF8",
+"J.	c #F4C36D",
+"K.	c #F6BE85",
+"L.	c #DBC0C4",
+"M.	c #E3BEBE",
+"N.	c #EABEAE",
+"O.	c #F5C180",
+"P.	c #DAC1CB",
+"Q.	c #EEC198",
+"R.	c #F4C286",
+"S.	c #B7CFF5",
+"T.	c #F3C87D",
+"U.	c #BFCEEF",
+"V.	c #D1CCCA",
+"W.	c #FFCA58",
+"X.	c #D0CDD2",
+"Y.	c #F9C978",
+"Z.	c #DBCBC6",
+"`.	c #FFCC61",
+" +	c #BCD3F3",
+".+	c #FECF62",
+"++	c #E9C6CC",
+"@+	c #FFCA82",
+"#+	c #DDCCD4",
+"$+	c #F4D17C",
+"%+	c #FFCD76",
+"&+	c #FED06A",
+"*+	c #FFCF72",
+"=+	c #D1D7D9",
+"-+	c #FFD373",
+";+	c #FDD08B",
+">+	c #E2D0D9",
+",+	c #D0D9E1",
+"'+	c #DBD6D4",
+")+	c #FDD775",
+"!+	c #FFD57B",
+"~+	c #EED4B7",
+"{+	c #FFD682",
+"]+	c #DBD8DC",
+"^+	c #FED689",
+"/+	c #EAD3D0",
+"(+	c #FDDA84",
+"_+	c #FBDC7F",
+":+	c #CFDFF3",
+"<+	c #FFD992",
+"[+	c #DBDCE6",
+"}+	c #FFE074",
+"|+	c #FEDC8D",
+"1+	c #DDDEE8",
+"2+	c #DEE0DD",
+"3+	c #FAE383",
+"4+	c #DBDFEF",
+"5+	c #FEDE95",
+"6+	c #CFE3FC",
+"7+	c #FFDCA1",
+"8+	c #E0E2DF",
+"9+	c #FBE58B",
+"0+	c #E0E1EC",
+"a+	c #FFE09D",
+"b+	c #FFE48D",
+"c+	c #FEE881",
+"d+	c #FBEA88",
+"e+	c #FFE3A6",
+"f+	c #E6E4E8",
+"g+	c #FEE6A1",
+"h+	c #F2E2DD",
+"i+	c #FCEC90",
+"j+	c #E3E8EB",
+"k+	c #FDEA9C",
+"l+	c #E6E6F1",
+"m+	c #FFE6AF",
+"n+	c #E7E9E6",
+"o+	c #EAE7EC",
+"p+	c #EDEAEF",
+"q+	c #EAEBF6",
+"r+	c #FFF29C",
+"s+	c #F6E9E9",
+"t+	c #EFECF1",
+"u+	c #E7EFF8",
+"v+	c #F0EDF2",
+"w+	c #EEF0ED",
+"x+	c #FCECE7",
+"y+	c #F2EFF4",
+"z+	c #F8F1DC",
+"A+	c #EEF3F6",
+"B+	c #F5F2F7",
+"C+	c #F9F6FB",
+"D+	c #F9FBF8",
+"E+	c #F7FCFF",
+"F+	c #FFFCFA",
+"G+	c #FDFFFC",
+"                  = = = = = = = = = = = = * * * * * * * * * #   ",
+"        + $ $ $ @ _.r+m+m+m+e+e+a+a+5+5+5+5+|+|+{+{+!+!+-+-+K   ",
+"        ) ]+f+2+]+~.F i+g+e+a+5+|+|+|+{+{+{+!+!+-+-+&+&+`.`.K   ",
+"        ) E+G+C+G+G+=+6 9+k+a+5+a+7+K.R.O.D.D.G.G.G.x.Y.`.W.M   ",
+"        ) C+G+G+G+F+E+t+r T.k+<+5+a+8.% ( ( ( ( / 2 ! ).`.W.U   ",
+"        ) G+G+G+E+G+G+G+C+2.!.d+5+^+|+R.| Z.j+2+2+2+E.).`.`.U   ",
+"        ) C+G+G+G+G+G+G+G+G+X.g 9+b+^+|+;+p N.C+F+G+h+).`.W.U   ",
+"        ) G+G+G+G+G+G+G+E+G+G+s+f $+i+{+{+<+}. .F+G+h+).`.`.%.  ",
+"        ) C+G+G+G+G+G+G+G+s+Z ; g.J d.i+!+{+!+D.0 x+h+).`..+%.  ",
+"        ) G+G+G+G+G+s+x ~ e ' > l.w.h g i+(+!+!+T.o v.).`.W.).  ",
+"        ) C+G+G+G+/+3 Q.z+z+2 ~.C+E+E+,+{ (+_+-+-+Y.,.,.`.W.%.  ",
+"        ) G+E+E+M.K %+O.B.~+, ]+G+E+E+E+w+1 x.3+-+&+-+<+`.`.,.  ",
+"        ) F+F+m.V !+%+-.v 9 J A+F+F+D+E+E+D+b O d+)+&+&+`.W.,.  ",
+"        ) C+=.[.{+-+<.N C ~ X.F+C+C+C+D+D+E+u+z c _+}+`.`.`./.  ",
+"        ) D c.<+`.0.-.C } V.A+w+D+w+C+B+w+C+F+(.j+r %+c+`.`./.  ",
+"        : q.<+W.e.<.u 5 X.A+B+B+B+C+A+A+C+C+B+p.6+A+9.#.c+W./.  ",
+"      _ q.a+C.a.0.u G =+y+A+A+A+A+F+s+A+A+A+A+I.S.y+B+t ] i+r.  ",
+"    8 C.a+A.e.e.j [ ]+y+A+s+B+v+t+y+A+A+s+B+w+h.6+y+C+{.$ . n   ",
+"  i t.<+s.a.e.i I H u+A+u+A+A+j+A+v+v+u+A+y+A+*.j+A+y+{.-       ",
+"4 s.{+n.0.e.o +.0+p.S.o+t+j+o.Q X X Q X Q X L y v+o+B+{.&       ",
+"  R u.0.f.a ~.j+o+0+*.4+p+o+b.++j+A+j+u+j+u+T >.j+q+B+{.&       ",
+"  7 4.s.< j.1+f+l+o+ +P j+j+b.L.l+l+p+f+l+5.i.].p+p+B+{.-       ",
+"      ^ & D+o+j+l+f+o+S.E S.b.++j+o+l+ +A y.]+&.u+l+q+{.&       ",
+"        ) C+l+f+j+l+f+f+0+5.l A 7.P w 5.4+j+#+&.f+f+q+j.&       ",
+"        ) w+l+f+f+0+0+f+j+j+^.P.U.1+f+0+f+f+/+&.1+f+u+{.-       ",
+"        ) C+f+1+1+f+f+1+1+1+^.L.]+j+[+j+1+1+#+G 0+0+o+{.&       ",
+"        ) B+1+1+[+1+0+f+1+1+ at .F.1+1+[+1+1+,+>+G f+1+l+{.&       ",
+"        ) A+1+1+1+1+]+[+,+1+;.W 3.3.3.3.3.3. at .G [+1+q+{.-       ",
+"        ) C+[+[+[+1+[+1+[+[+F.k.k.k.k.k.k.k.k.F.[+[+l+{.&       ",
+"        ) D+v+t+t+q+q+t+v+j+A+v+v+v+v+v+v+v+v+j+p+v+q+j.&       ",
+"        & t t t q q t t q t q q q q q m m m q m m m m ) -       ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kiten.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kiten.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kiten.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 KITEN 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
+kiten \- a Japanese reference/study tool for KDE
+.SH SYNOPSIS
+.B kiten
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKiten\fP is a Japanese reference and study tool for KDE.  It is an
+application with multiple functions.  Firstly, it is a convenient
+English to Japanese and Japanese to English dictionary.  Secondly, it is
+a Kanji dictionary, with multiple ways to look up specific characters.
+Thirdly, it is a tool to help you learn Kanji.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkiten \-\-help\fP.
+.SH SEE ALSO
+.BR kitengen (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kiten/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kiten/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kiten/\fP.
+.SH AUTHOR
+Kiten was written by Jason Katz-Brown <jason at katzbrown.com>,
+Jim Breen <jwb at csse.monash.edu.au> and
+Neil Stevens <neil at qualityassistant.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/kdeedu/debian/kiten.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kiten.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kiten.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Kiten for Debian
+----------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kiten.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kiten.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kiten.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+usr/bin/kiten
+usr/bin/kitengen
+usr/share/applications/kde/kiten.desktop
+usr/share/doc/kde/HTML/en/kiten/*.docbook
+usr/share/doc/kde/HTML/en/kiten/*.png
+usr/share/doc/kde/HTML/en/kiten/common
+usr/share/doc/kde/HTML/en/kiten/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/kiten.png
+usr/share/icons/hicolor/16x16/apps/kiten.png
+usr/share/icons/hicolor/32x32/apps/kiten.png
+usr/share/icons/hicolor/48x48/apps/kiten.png
+usr/share/icons/hicolor/scalable/apps/kiten.svgz
+
+../kiten.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kiten.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kiten.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kiten.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(kiten):needs="X11"\
+  section="Apps/Education"\
+  hints="KDE"\
+  title="Kiten"\
+  longtitle="Kiten (Japanese Reference/Study Tool)"\
+  command="/usr/bin/kiten"\
+  icon="/usr/share/pixmaps/kiten.xpm"

Added: people/jriddell/KDE/3.5/kdeedu/debian/kiten.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kiten.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kiten.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,176 @@
+/* XPM */
+static char * kiten_xpm[] = {
+"32 32 141 2",
+"  	c None",
+". 	c #3F3F3F",
+"+ 	c #D40000",
+"@ 	c #D40202",
+"# 	c #424242",
+"$ 	c #DD0000",
+"% 	c #DE0000",
+"& 	c #DE0202",
+"* 	c #E70000",
+"= 	c #464646",
+"- 	c #E70303",
+"; 	c #F00000",
+"> 	c #F10000",
+", 	c #494949",
+"' 	c #E70606",
+") 	c #FA0000",
+"! 	c #4B4B4C",
+"~ 	c #F10405",
+"{ 	c #F00505",
+"] 	c #F00707",
+"^ 	c #E71213",
+"/ 	c #525253",
+"( 	c #535354",
+"_ 	c #5D5D5E",
+": 	c #5F5F61",
+"< 	c #E72526",
+"[ 	c #606062",
+"} 	c #626264",
+"| 	c #D83133",
+"1 	c #646464",
+"2 	c #656566",
+"3 	c #676769",
+"4 	c #686869",
+"5 	c #E03739",
+"6 	c #6A6A6C",
+"7 	c #6A6A6D",
+"8 	c #6D6D72",
+"9 	c #6E6E72",
+"0 	c #6F6F72",
+"a 	c #727276",
+"b 	c #747477",
+"c 	c #747479",
+"d 	c #F63D3F",
+"e 	c #7A7A7D",
+"f 	c #7A7A7F",
+"g 	c #7B7B81",
+"h 	c #F5484A",
+"i 	c #E25658",
+"j 	c #828287",
+"k 	c #86868A",
+"l 	c #EE5B5D",
+"m 	c #88888E",
+"n 	c #8A8A90",
+"o 	c #909095",
+"p 	c #939398",
+"q 	c #ED7376",
+"r 	c #9797A0",
+"s 	c #9A9AA0",
+"t 	c #9D9DA4",
+"u 	c #F27E81",
+"v 	c #A1A1A6",
+"w 	c #A4A4AA",
+"x 	c #EF898D",
+"y 	c #A9A9B2",
+"z 	c #AAAAB1",
+"A 	c #E59599",
+"B 	c #ADADB6",
+"C 	c #AEAEB4",
+"D 	c #EE979C",
+"E 	c #E29DA1",
+"F 	c #B2B2B7",
+"G 	c #B5B5BD",
+"H 	c #F09DA1",
+"I 	c #B6B6BC",
+"J 	c #B8B8C0",
+"K 	c #B8B8C1",
+"L 	c #B9B9C1",
+"M 	c #EBA6AA",
+"N 	c #F0A4A8",
+"O 	c #E3AAAE",
+"P 	c #BBBBC4",
+"Q 	c #C0C0CB",
+"R 	c #C1C1D0",
+"S 	c #C2C2D0",
+"T 	c #C3C3CE",
+"U 	c #C4C4CE",
+"V 	c #EAB7BD",
+"W 	c #C7C7CE",
+"X 	c #C7C7D2",
+"Y 	c #C7C7D3",
+"Z 	c #EBBABF",
+"` 	c #C9C9D3",
+" .	c #CCCCD6",
+"..	c #CECEDB",
+"+.	c #CFCFDB",
+"@.	c #D0D0D6",
+"#.	c #D0D0D9",
+"$.	c #E9C6CC",
+"%.	c #D2D2DE",
+"&.	c #EBC9CF",
+"*.	c #D3D3DE",
+"=.	c #D3D3DF",
+"-.	c #E9CDD2",
+";.	c #D7D7E1",
+">.	c #E7D1D7",
+",.	c #D8D8E0",
+"'.	c #D8D8E3",
+").	c #DADAE0",
+"!.	c #DADAE3",
+"~.	c #DCDCE5",
+"{.	c #ECD6DC",
+"].	c #DDDDE4",
+"^.	c #EAD9DF",
+"/.	c #DEDEE7",
+"(.	c #ECD9DE",
+"_.	c #DFDFE7",
+":.	c #E1E1E9",
+"<.	c #E9DFE5",
+"[.	c #E9E0E5",
+"}.	c #E3E3EA",
+"|.	c #E5E3EA",
+"1.	c #E5E5EC",
+"2.	c #E9E4EA",
+"3.	c #E9E5EB",
+"4.	c #E7E7ED",
+"5.	c #E8E8EE",
+"6.	c #E8E8EF",
+"7.	c #E9E8EE",
+"8.	c #E9E9EF",
+"9.	c #EAEAF0",
+"0.	c #EBEBF1",
+"a.	c #EFEFF3",
+"b.	c #F0F0F4",
+"c.	c #F1F1F4",
+"d.	c #F2F2F6",
+"e.	c #F4F4F7",
+"f.	c #F6F6F8",
+"g.	c #F7F7F9",
+"h.	c #F8F8FA",
+"i.	c #FCFCFD",
+"j.	c #FDFDFD",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                        } a o w I F k b         ",
+"                                _ c B ` /.a.e.h.j.i.g.8. .:     ",
+"  1 e                     6 n P !.5.8.8.0.b.e.h.j.i.g.d.1.[     ",
+"  4 b.).y g 3 0 f j p G #.:.8.8.8.8.8.8.0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9.~.+...=._.1.8.8.8.8.8.8.8.8.8.0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.8.8.8.8.8.8.8.8.8.0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.8.8.8.8.>.O A 3.8.0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.8.8.-.i @ + $ - M 0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.8.Z ^ % + + $ * ] {.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.&.~ * % + + $ * ; H b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.h > * % + + $ * ; u b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.$.) > * % + + $ * ; N b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.D ) > * % + + $ * { (.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.x ) > * % + + $ * q 0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.V ) > * % + + $ < <.0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.|.d > * % + + 5 [.8.0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.^.l ' & | E 7.8.8.0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.8.8.2.8.8.8.8.8.8.0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.8.8.8.8.8.8.8.8.8.0.b.e.h.j.i.g.d.1.[     ",
+"  4 e.f.9./.*.%.'._.1.8.8.8.8.8.8.8.8.}.;.X K C v z W ].:.[     ",
+"  4 e.f.9./.*.%.'._.1.8.8.8.8.6./.T r 8 !             , 7 (     ",
+"    @.c.9./.*.%.'._.1.8.4.,.J m /                               ",
+"      9 t Q R S Y U L s 2 ,                                     ",
+"          . # = , .                                             ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kitengen.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kitengen.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kitengen.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,55 @@
+.\"                                      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 KITENGEN 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
+kitengen \- index table generator for Kiten
+.SH SYNOPSIS
+.B kitengen
+.I input output.xjdx
+.SH DESCRIPTION
+\fBkitengen\fP is an index table generator for Kiten.
+.PP
+This program is for Kiten's internal use and should \fBnot\fP be run
+directly.
+.PP
+\fBKiten\fP is a Japanese reference and study tool for KDE.  It is an
+application with multiple functions.  Firstly, it is a convenient
+English to Japanese and Japanese to English dictionary.  Secondly, it is
+a Kanji dictionary, with multiple ways to look up specific characters.
+Thirdly, it is a tool to help you learn Kanji.
+.PP
+This application is part of the official KDE edutainment module.
+.SH SEE ALSO
+.BR kiten (1).
+.PP
+Full user documentation for Kiten is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kiten/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kiten/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kiten/\fP.
+.SH AUTHOR
+Kiten was written by Jason Katz-Brown <jason at katzbrown.com>,
+Jim Breen <jwb at csse.monash.edu.au> and
+Neil Stevens <neil at qualityassistant.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/kdeedu/debian/klatin.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klatin.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klatin.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,56 @@
+.\"                                      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 KLATIN 1 "March 16, 2005"
+.\" 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
+klatin \- an application to help revise/teach Latin
+.SH SYNOPSIS
+.B klatin
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKLatin\fP is a program to help revise Latin.  There are three "sections"
+in which different aspects of the language can be revised.  These are the
+vocabulary, grammar and verb testing sections.  In addition there is a
+set of revision notes that can be used for self-guided revision.
+.PP
+In the vocabulary section an XML file is loaded containing various
+words and their local language translations.  KLatin asks you what each
+of these words translate into.  The questions take place in a
+multiple-choice environment.
+.PP
+In the grammar and verb sections KLatin asks for a particular part of a
+noun or a verb, such as the "ablative singular", or the "1st person
+indicative passive plural", and is not multiple choice.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIklatin \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/klatin/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/klatin/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/klatin/\fP.
+.SH AUTHOR
+KLatin was written by George Wright <gwright 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/kdeedu/debian/klatin.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klatin.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klatin.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KLatin for Debian
+-----------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 16 Oct 2004 15:32:36 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/klatin.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klatin.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klatin.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+usr/bin/klatin
+usr/share/applications/kde/klatin.desktop
+usr/share/apps/klatin
+usr/share/config.kcfg/klatin.kcfg
+usr/share/doc/kde/HTML/en/klatin/*.bz2
+usr/share/doc/kde/HTML/en/klatin/*.docbook
+usr/share/doc/kde/HTML/en/klatin/*.png
+usr/share/doc/kde/HTML/en/klatin/README
+usr/share/doc/kde/HTML/en/klatin/common
+usr/share/icons/hicolor/128x128/apps/klatin.png
+usr/share/icons/hicolor/16x16/apps/klatin.png
+usr/share/icons/hicolor/22x22/apps/klatin.png
+usr/share/icons/hicolor/32x32/apps/klatin.png
+usr/share/icons/hicolor/48x48/apps/klatin.png
+usr/share/icons/hicolor/64x64/apps/klatin.png
+usr/share/icons/hicolor/scalable/apps/klatin.svgz
+
+../klatin.xpm usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/klatin.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klatin.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klatin.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,86 @@
+/* XPM */
+static char * klatin_xpm[] = {
+"32 32 51 1",
+" 	c None",
+".	c #00193F",
+"+	c #162E51",
+"@	c #445773",
+"#	c #455A77",
+"$	c #7F8FA4",
+"%	c #8191A6",
+"&	c #8494A8",
+"*	c #8494A9",
+"=	c #8897AC",
+"-	c #8898AC",
+";	c #8999AD",
+">	c #8A99AD",
+",	c #8A9AAE",
+"'	c #A79A9F",
+")	c #A89EA4",
+"!	c #A89FA5",
+"~	c #A89FA6",
+"{	c #A9A4AD",
+"]	c #AAA5AE",
+"^	c #AAA6AF",
+"/	c #ABAAB4",
+"(	c #ABACB6",
+"_	c #ACAEB9",
+":	c #ACAFBB",
+"<	c #ACB0BC",
+"[	c #ACB1BD",
+"}	c #ADB6C4",
+"|	c #AEB7C5",
+"1	c #AEB7C6",
+"2	c #AEB9C8",
+"3	c #AEBCCC",
+"4	c #AFBCCB",
+"5	c #AFBCCC",
+"6	c #AFBDCC",
+"7	c #AFBDCD",
+"8	c #B0BECE",
+"9	c #B5C2D1",
+"0	c #B6C3D1",
+"a	c #B8C4D2",
+"b	c #B8C5D3",
+"c	c #BFCAD7",
+"d	c #BFCBD7",
+"e	c #C1CCD8",
+"f	c #C2CCD9",
+"g	c #DBE1E8",
+"h	c #DDE3EA",
+"i	c #DEE4EA",
+"j	c #DEE4EB",
+"k	c #FEFEFE",
+"l	c #FFFFFF",
+"                                ",
+"                                ",
+"                                ",
+"              675               ",
+"            77[]|77             ",
+"          75<~'''{}67           ",
+"        75:!''''''']|77         ",
+"      34_)'''''''''''^177       ",
+"    ..4(///////////////2777     ",
+"  .+##7777777777777777777777    ",
+"     cfb   dfa  7ef0  8ff9      ",
+"     ll    kl    kl    ll       ",
+"     ll    kl    kl    ll       ",
+"     ll    kl    kl    ll       ",
+"     ll    kl    kl    ll       ",
+"     ll    kl    kl    ll       ",
+"     ll    kl    kl    ll       ",
+"     ll    kl    kl    ll       ",
+"     ll    kl    kl    ll       ",
+"     gi    hi    ji    ii       ",
+"    =,,;* -,,>& -,,;% -,,;$     ",
+"  @@@@@@@@@@@@@@@@@@@@@@@@@@    ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klettres-data.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+KLettres data for Debian
+------------------------
+
+This package merely provides supporting data files for KLettres.  The
+KLettres application itself can be found in the klettres package.
+
+ -- Ben Burton <bab at debian.org>, Mon, 23 Feb 2004 08:14:22 +1100

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

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/klettres.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klettres.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klettres.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 KLETTRES 1 "March 16, 2005"
+.\" 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
+klettres \- a foreign alphabet tutor for KDE
+.SH SYNOPSIS
+.B klettres
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKLettres\fP is an application specially designed to help the user to
+learn the alphabet in a new language and then to learn to read simple
+syllables.  The user can be a young child aged from two and a half or an
+adult that wants to learn the basics of a foreign language.
+.PP
+Seven languages are currently available: Czech, Danish, Dutch, English,
+French, Italian and Slovak.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIklettres \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/klettres/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/klettres/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/klettres/\fP.
+.SH AUTHOR
+KLettres was written by Anne-Marie Mahfouf <annma at kde.org> and many 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/kdeedu/debian/klettres.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klettres.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klettres.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KLettres for Debian
+-------------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/klettres.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klettres.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klettres.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+etc/kde3/klettresrc
+usr/bin/klettres
+usr/share/applications/kde/klettres.desktop
+usr/share/config.kcfg/klettres.kcfg
+usr/share/doc/kde/HTML/en/klettres/*.docbook
+usr/share/doc/kde/HTML/en/klettres/*.png
+usr/share/doc/kde/HTML/en/klettres/common
+usr/share/doc/kde/HTML/en/klettres/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/klettres.png
+usr/share/icons/hicolor/16x16/apps/klettres.png
+usr/share/icons/hicolor/22x22/apps/klettres.png
+usr/share/icons/hicolor/32x32/apps/klettres.png
+usr/share/icons/hicolor/48x48/apps/klettres.png
+usr/share/icons/hicolor/scalable/apps/klettres.svgz
+
+../klettres.xpm usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/klettres.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/klettres.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/klettres.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,241 @@
+/* XPM */
+static char * klettres_xpm[] = {
+"32 32 206 2",
+"  	c None",
+". 	c #000002",
+"+ 	c #00000C",
+"@ 	c #00000D",
+"# 	c #000010",
+"$ 	c #000011",
+"% 	c #000012",
+"& 	c #000013",
+"* 	c #000014",
+"= 	c #000017",
+"- 	c #00001A",
+"; 	c #000021",
+"> 	c #000022",
+", 	c #000023",
+"' 	c #0D0000",
+") 	c #020215",
+"! 	c #0F0000",
+"~ 	c #02021B",
+"{ 	c #030313",
+"] 	c #100000",
+"^ 	c #110000",
+"/ 	c #000030",
+"( 	c #120000",
+"_ 	c #0E0202",
+": 	c #130000",
+"< 	c #140000",
+"[ 	c #150000",
+"} 	c #00003A",
+"| 	c #130101",
+"1 	c #160000",
+"2 	c #170000",
+"3 	c #050517",
+"4 	c #180000",
+"5 	c #190000",
+"6 	c #1A0000",
+"7 	c #1B0000",
+"8 	c #120505",
+"9 	c #000051",
+"0 	c #010149",
+"a 	c #080816",
+"b 	c #200000",
+"c 	c #080817",
+"d 	c #010153",
+"e 	c #240000",
+"f 	c #000063",
+"g 	c #0A0A16",
+"h 	c #00006E",
+"i 	c #000070",
+"j 	c #2A0000",
+"k 	c #00007B",
+"l 	c #000081",
+"m 	c #000084",
+"n 	c #000085",
+"o 	c #000086",
+"p 	c #020276",
+"q 	c #000087",
+"r 	c #00008D",
+"s 	c #101010",
+"t 	c #000097",
+"u 	c #000098",
+"v 	c #000099",
+"w 	c #00009A",
+"x 	c #111111",
+"y 	c #0000A1",
+"z 	c #0000A3",
+"A 	c #121212",
+"B 	c #0000A5",
+"C 	c #0000A9",
+"D 	c #0000AA",
+"E 	c #0E0E39",
+"F 	c #0000AB",
+"G 	c #0000AC",
+"H 	c #131313",
+"I 	c #0000AD",
+"J 	c #410000",
+"K 	c #121221",
+"L 	c #121222",
+"M 	c #0301AA",
+"N 	c #151515",
+"O 	c #131327",
+"P 	c #161616",
+"Q 	c #0904A3",
+"R 	c #4C0101",
+"S 	c #17171D",
+"T 	c #23121D",
+"U 	c #18181E",
+"V 	c #191919",
+"W 	c #1B191A",
+"X 	c #560000",
+"Y 	c #281414",
+"Z 	c #2D1212",
+"` 	c #12079A",
+" .	c #2F1212",
+"..	c #5B0000",
+"+.	c #281616",
+"@.	c #5C0000",
+"#.	c #1C1C1C",
+"$.	c #291717",
+"%.	c #520606",
+"&.	c #610000",
+"*.	c #1E1D1E",
+"=.	c #1E1E1E",
+"-.	c #1C0B8F",
+";.	c #1F1F1F",
+">.	c #1F0C8B",
+",.	c #6A0000",
+"'.	c #640303",
+").	c #650404",
+"!.	c #6C0101",
+"~.	c #222224",
+"{.	c #6E0202",
+"].	c #232323",
+"^.	c #750000",
+"/.	c #471414",
+"(.	c #291081",
+"_.	c #780000",
+":.	c #242431",
+"<.	c #820000",
+"[.	c #8C0000",
+"}.	c #292938",
+"|.	c #492118",
+"1.	c #472318",
+"2.	c #4B1D2F",
+"3.	c #970000",
+"4.	c #2E2E2E",
+"5.	c #9B0000",
+"6.	c #AB0000",
+"7.	c #AC0000",
+"8.	c #AE0000",
+"9.	c #AF0000",
+"0.	c #B10000",
+"a.	c #363636",
+"b.	c #373738",
+"c.	c #58224F",
+"d.	c #453737",
+"e.	c #662840",
+"f.	c #493A3A",
+"g.	c #3D3D4D",
+"h.	c #4A3B3B",
+"i.	c #732D32",
+"j.	c #84331B",
+"k.	c #8A360F",
+"l.	c #8A361A",
+"m.	c #4E4E5B",
+"n.	c #993B0A",
+"o.	c #9B3C07",
+"p.	c #9E3E04",
+"q.	c #9F3E03",
+"r.	c #A03E03",
+"s.	c #97420C",
+"t.	c #A13F01",
+"u.	c #A23F00",
+"v.	c #A24206",
+"w.	c #5D5D5D",
+"x.	c #A6480C",
+"y.	c #A7490D",
+"z.	c #5F5F5F",
+"A.	c #616161",
+"B.	c #636363",
+"C.	c #646464",
+"D.	c #656565",
+"E.	c #666666",
+"F.	c #6F6F6F",
+"G.	c #B2612D",
+"H.	c #7F7878",
+"I.	c #7E7E7E",
+"J.	c #847D7D",
+"K.	c #BB7345",
+"L.	c #8A8282",
+"M.	c #8F8B8B",
+"N.	c #C48760",
+"O.	c #969696",
+"P.	c #979797",
+"Q.	c #C88D68",
+"R.	c #C88E68",
+"S.	c #9E9E9E",
+"T.	c #A5A5A5",
+"U.	c #A6A6A6",
+"V.	c #D09D7D",
+"W.	c #AEACAC",
+"X.	c #D9B197",
+"Y.	c #C1C1C1",
+"Z.	c #C3C3C3",
+"`.	c #C9C9C9",
+" +	c #E4C8B6",
+".+	c #D2D2D2",
+"++	c #E7CDBD",
+"@+	c #E7CEBD",
+"#+	c #EAD3C5",
+"$+	c #DBDBDB",
+"%+	c #DCDCDC",
+"&+	c #ECD9CC",
+"*+	c #DEDEDE",
+"=+	c #EEDDD1",
+"-+	c #E5E5E5",
+";+	c #F2E4DC",
+">+	c #E9E9E9",
+",+	c #F0F0F0",
+"'+	c #F4F4F4",
+")+	c #F9F5F3",
+"!+	c #F6F6F6",
+"~+	c #FBF7F4",
+"{+	c #FAFAFA",
+"]+	c #FCFCFC",
+"^+	c #FEFEFE",
+"/+	c #FFFFFF",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                  =.s _ R @.,.^.X j ' ^         ",
+"            ;.;.=.          V z.U.$+/+d.[.0.0.0.0.0.0.<.6 <     ",
+"          =.T..+F.      H w.*+/+/+/+/+%+Z 9.0.0.0.0.0.0.0.&.]   ",
+"          A m.g.K * - L O./+/+/+/+/+/+/+H.).0.0.0.0.0.0.0.0...^ ",
+"      * $ 0 l v G I I z U -+/+/+/+/+/+/+!+$.7.0.0.0.0.0.0.0.6.: ",
+"  + 9 r I I I I I I I I p b.^+/+Q.++/+/+/+L.'.0.0.0.0.0.0.0.0.( ",
+"  $ o I I I I I I I I I M T O.&+u.x.~+/+/+'++.7.0.0.0.0.0.0.0.< ",
+"    # w I I I I I I I >.o.j.*.N.u.Q./+/+/+/+J.!.0.0.0.0.0.0.0.1 ",
+"      ; F I I I I I I Q n.u.|.v.u.=+/+/+/+/+>+ .0.0.0.0.0.0.0.4 ",
+"      @ h I I I I I I I c.u.q.u.G./+/+/+/+/+/+f.3.0.0.0.0.0.0.7 ",
+"        , I I I I I I I ` p.u.u.u.y.K.V. +~+/+W.%.0.0.0.0.0.0.b ",
+"        & u I I I I I I I e.u.k.s.u.u.u.u. at +/+]+Y 0.0.0.0.0.0.5 ",
+"          d I I I I I I I -.t.l.W )+#+X.R.;+/+/+h.5.0.0.0.0.0.2 ",
+"          ~ I I I I I I I I i.u.1.Y./+/+/+/+/+/+M.{.0.0.0.0.0.[ ",
+"          ) I I I I I I I I (.r.2.C./+/+/+/+/+/+.+/.0.0.0.0.0.: ",
+"          { C I I I I I I I I Q y ~./+/+/+/+Z.I.a.8 | e J _.8.( ",
+"          3 t I I I I I I I I I I S ,+{+S.P ].            ! ^ ^ ",
+"          c o I I I I I I I I I I E P.4.x                       ",
+"          a m I I I I I I I I D k > s                           ",
+"          c n I I I I I z i / % $                               ",
+"          c q B n f } = *                                       ",
+"          g O }.:..                                             ",
+"          =.`./+E.                                              ",
+"          =.`./+D.                                              ",
+"          =.`./+B.                                              ",
+"          =.`./+A.                                              ",
+"          N #.;.A                                               ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kmessedwords.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kmessedwords.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kmessedwords.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+usr/bin/kmessedwords
+usr/share/applications/kde/kmessedwords.desktop
+usr/share/apps/kmessedwords
+usr/share/config.kcfg/kmessedwords.kcfg
+usr/share/doc/kde/HTML/en/kmessedwords/*.docbook
+usr/share/doc/kde/HTML/en/kmessedwords/*.png
+usr/share/doc/kde/HTML/en/kmessedwords/common
+usr/share/doc/kde/HTML/en/kmessedwords/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/kmessedwords.png
+usr/share/icons/hicolor/16x16/apps/kmessedwords.png
+usr/share/icons/hicolor/32x32/apps/kmessedwords.png
+usr/share/icons/hicolor/48x48/apps/kmessedwords.png
+usr/share/icons/hicolor/scalable/apps/kmessedwords.svgz
+
+../kmessedwords.xpm usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeedu/debian/kmplot.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kmplot.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kmplot.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,58 @@
+.\"                                      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 KMPLOT 1 "March 16, 2005"
+.\" 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
+kmplot \- a mathematical function plotter for KDE
+.SH SYNOPSIS
+.B kmplot
+.RI "[ " generic-options " ]"
+[ \fIURL\fP ]
+.SH DESCRIPTION
+\fBKmPlot\fP is a mathematical function plotter for KDE.
+It has a powerful built-in parser.  You can plot different functions
+simultaneously and combine them to build new functions.
+.PP
+KmPlot supports parametric functions and functions in polar
+coordinates.  Several grid modes are supported.  Plots may be printed
+with high precision in the correct scale.
+.PP
+KmPlot also provides some numerical and visual features, like
+filling and calculating the area between the plot and the first axis,
+finding maximum and minimum values,
+changing function parameters dynamically and
+plotting derivatives and integral functions.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkmplot \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kmplot/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kmplot/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kmplot/\fP.
+.SH AUTHOR
+KmPlot was written by Klaus-Dieter Moeller <kdmoeller at foni.net>,
+Matthias Messmer <bmlmessmer at web.de> and Fredrik Edemar <f_edemar at linux.se>.
+.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/kdeedu/debian/kmplot.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kmplot.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kmplot.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KmPlot for Debian
+-----------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kmplot.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kmplot.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kmplot.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+usr/bin/kmplot
+usr/lib/kde3/libkmplotpart.la
+usr/lib/kde3/libkmplotpart.so
+usr/share/applications/kde/kmplot.desktop
+usr/share/apps/kmplot
+usr/share/config.kcfg/kmplot.kcfg
+usr/share/doc/kde/HTML/en/kmplot/*.docbook
+usr/share/doc/kde/HTML/en/kmplot/*.png
+usr/share/doc/kde/HTML/en/kmplot/common
+usr/share/doc/kde/HTML/en/kmplot/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/kmplot.png
+usr/share/icons/hicolor/16x16/apps/kmplot.png
+usr/share/icons/hicolor/22x22/apps/kmplot.png
+usr/share/icons/hicolor/32x32/apps/kmplot.png
+usr/share/icons/hicolor/48x48/apps/kmplot.png
+usr/share/icons/hicolor/64x64/apps/kmplot.png
+usr/share/icons/hicolor/scalable/apps/kmplot.svgz
+usr/share/mimelnk/application/x-kmplot.desktop
+usr/share/services/kmplot_part.desktop
+
+../kmplot.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kmplot.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kmplot.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kmplot.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(kmplot):needs="X11"\
+  section="Apps/Math"\
+  hints="KDE"\
+  title="KmPlot"\
+  longtitle="KmPlot (Mathematical Function Plotter)"\
+  command="/usr/bin/kmplot"\
+  icon="/usr/share/pixmaps/kmplot.xpm"

Added: people/jriddell/KDE/3.5/kdeedu/debian/kmplot.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kmplot.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kmplot.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,277 @@
+/* XPM */
+static char * kmplot_xpm[] = {
+"32 32 242 2",
+"  	c None",
+". 	c #323331",
+"+ 	c #353734",
+"@ 	c #474549",
+"# 	c #942627",
+"$ 	c #484947",
+"% 	c #494A48",
+"& 	c #4A4B49",
+"* 	c #4A4C4A",
+"= 	c #4C4E4B",
+"- 	c #4F4D50",
+"; 	c #4D4F4C",
+"> 	c #4E504D",
+", 	c #4F514E",
+"' 	c #50524F",
+") 	c #515350",
+"! 	c #525451",
+"~ 	c #545553",
+"{ 	c #D31E22",
+"] 	c #555654",
+"^ 	c #565755",
+"/ 	c #C52728",
+"( 	c #565855",
+"_ 	c #575956",
+": 	c #595B58",
+"< 	c #5C5A5D",
+"[ 	c #5A5C59",
+"} 	c #5D5B5E",
+"| 	c #5B5D5A",
+"1 	c #5C5E5B",
+"2 	c #5F5D60",
+"3 	c #5D5F5C",
+"4 	c #605D61",
+"5 	c #615E62",
+"6 	c #5F615E",
+"7 	c #626064",
+"8 	c #E72B33",
+"9 	c #716062",
+"0 	c #995055",
+"a 	c #676866",
+"b 	c #6A686C",
+"c 	c #6C6A6E",
+"d 	c #FD2C32",
+"e 	c #6D6B6F",
+"f 	c #6E6C70",
+"g 	c #706E72",
+"h 	c #F33A3C",
+"i 	c #B1575C",
+"j 	c #F53B3D",
+"k 	c #F63C3E",
+"l 	c #F53D44",
+"m 	c #767478",
+"n 	c #F14143",
+"o 	c #D04F55",
+"p 	c #78767A",
+"q 	c #EB4647",
+"r 	c #777976",
+"s 	c #F3444A",
+"t 	c #FB4242",
+"u 	c #FC4343",
+"v 	c #F5464C",
+"w 	c #F04A4B",
+"x 	c #7D7B7F",
+"y 	c #7E7C80",
+"z 	c #7F7D81",
+"A 	c #7D7F7C",
+"B 	c #F94A49",
+"C 	c #807E82",
+"D 	c #7E807D",
+"E 	c #817F83",
+"F 	c #9C7477",
+"G 	c #867D83",
+"H 	c #EE5258",
+"I 	c #838185",
+"J 	c #848286",
+"K 	c #828481",
+"L 	c #82838C",
+"M 	c #838582",
+"N 	c #868488",
+"O 	c #F3565B",
+"P 	c #858784",
+"Q 	c #88868A",
+"R 	c #868885",
+"S 	c #F05B5C",
+"T 	c #878986",
+"U 	c #F15C5D",
+"V 	c #888A87",
+"W 	c #8B898D",
+"X 	c #898B88",
+"Y 	c #90878D",
+"Z 	c #8E8988",
+"` 	c #8C8A8E",
+" .	c #8A8C89",
+"..	c #8B8D8A",
+"+.	c #8E8C90",
+"@.	c #8C8E8B",
+"#.	c #EE636A",
+"$.	c #8D8F8C",
+"%.	c #8E908D",
+"&.	c #918F93",
+"*.	c #8D9194",
+"=.	c #929094",
+"-.	c #90928F",
+";.	c #939195",
+">.	c #929491",
+",.	c #939592",
+"'.	c #969498",
+").	c #949693",
+"!.	c #959794",
+"~.	c #969895",
+"{.	c #A09495",
+"].	c #979996",
+"^.	c #989A97",
+"/.	c #9B999D",
+"(.	c #9999A3",
+"_.	c #9A9B98",
+":.	c #979C9E",
+"<.	c #E27C83",
+"[.	c #D98182",
+"}.	c #9B9D99",
+"|.	c #9B9BA5",
+"1.	c #DF828B",
+"2.	c #9EA09D",
+"3.	c #F08285",
+"4.	c #A4A5AE",
+"5.	c #E18B97",
+"6.	c #A5A6AF",
+"7.	c #B2A1A9",
+"8.	c #A7A8B2",
+"9.	c #A9AAB4",
+"0.	c #EE8E91",
+"a.	c #AAABB5",
+"b.	c #ADAEB8",
+"c.	c #EE969B",
+"d.	c #B0B0BA",
+"e.	c #B3B1B5",
+"f.	c #F69598",
+"g.	c #F79699",
+"h.	c #DBA2A9",
+"i.	c #B6B3B8",
+"j.	c #B7B4B9",
+"k.	c #B4B5BE",
+"l.	c #B6B7C1",
+"m.	c #EBA2A8",
+"n.	c #B7B8C2",
+"o.	c #E6A5AF",
+"p.	c #BABCB9",
+"q.	c #BDBEC8",
+"r.	c #BFBFC9",
+"s.	c #E4B1B6",
+"t.	c #DEB4BD",
+"u.	c #C1C1CB",
+"v.	c #D7B8C4",
+"w.	c #C2C2CC",
+"x.	c #D4BCC6",
+"y.	c #C8C1CD",
+"z.	c #C6C3C8",
+"A.	c #E2B9C1",
+"B.	c #D6BEC8",
+"C.	c #C5C6D0",
+"D.	c #C4C9CC",
+"E.	c #C9C7CB",
+"F.	c #C7C8D2",
+"G.	c #DEBECA",
+"H.	c #D4C3CB",
+"I.	c #C8C9D3",
+"J.	c #C9CAD4",
+"K.	c #E3C0C6",
+"L.	c #CACBD5",
+"M.	c #E0C4C9",
+"N.	c #CCCCD6",
+"O.	c #D1CAD6",
+"P.	c #F1BEC3",
+"Q.	c #CDCDD7",
+"R.	c #DAC8D1",
+"S.	c #CED0CC",
+"T.	c #D2CCD8",
+"U.	c #CECED9",
+"V.	c #CFD1CE",
+"W.	c #CFD0DA",
+"X.	c #D0D2CF",
+"Y.	c #D0D1DB",
+"Z.	c #DDCCD4",
+"`.	c #D1D3D0",
+" +	c #D1D2DC",
+".+	c #DCCDDB",
+"++	c #D2D4D1",
+"@+	c #D2D3DD",
+"#+	c #D3D5D2",
+"$+	c #D6D4D8",
+"%+	c #D4D6D3",
+"&+	c #D4D5DF",
+"*+	c #D5D7D4",
+"=+	c #DDD3D9",
+"-+	c #D8D6DA",
+";+	c #D6D8D5",
+">+	c #D6D7E1",
+",+	c #D8D8E3",
+"'+	c #EDD1D6",
+")+	c #DCD9DE",
+"!+	c #DDDADF",
+"~+	c #DADBE5",
+"{+	c #EBD6D9",
+"]+	c #DBDCE6",
+"^+	c #DCDDE7",
+"/+	c #DDDEE8",
+"(+	c #DFE0EA",
+"_+	c #E2E0E4",
+":+	c #DDE3E5",
+"<+	c #E0E1EB",
+"[+	c #E1E4E0",
+"}+	c #DFE4E6",
+"|+	c #E5E2E6",
+"1+	c #E3E5E1",
+"2+	c #E3E3EE",
+"3+	c #E6E3E8",
+"4+	c #E7E4E9",
+"5+	c #E8E5EA",
+"6+	c #E9E6EB",
+"7+	c #EAE8EC",
+"8+	c #EBE9ED",
+"9+	c #EDEBEF",
+"0+	c #E9EEF0",
+"a+	c #EFECF1",
+"b+	c #F0EDF2",
+"c+	c #F1EEF3",
+"d+	c #F2EFF4",
+"e+	c #EEF3F6",
+"f+	c #F3F1F5",
+"g+	c #F4F2F6",
+"h+	c #F5F3F7",
+"i+	c #F6F4F8",
+"j+	c #F8F5FA",
+"k+	c #F9F6FB",
+"l+	c #F4F9FC",
+"m+	c #FBF8FD",
+"n+	c #F6FBFE",
+"o+	c #FCFAFE",
+"p+	c #FAFCF9",
+"q+	c #FBFDFA",
+"r+	c #F9FFFF",
+"s+	c #FEFFFC",
+"a K K K K K K K K K K K K K K K K K K K K K K K K K K K K K r   ",
+"N o+o+o+o+m+k+j+i+h+g+f+d+b+a+C.a+a+a+a+a+b+b+c+d+f+g+h+h+g+$+$ ",
+"P r+n+k+h+e+b+a+2+2+<+/+]+>+/.@ U.T.U.U.&+>+,+~+]+/+(+<+2+|+$+$ ",
+"W n+p+p+e+f+0+0+8+|+<+/+]+>+- . 4.U.,+,+,+>+,+~+]+/+(+|+2+2+S.- ",
+"Z o+k+i+h+g+9+9+2+5+<+/+,+ at +L 5 8.U.U.U.T.~+,+~+]+/+<+|+}+2+S.; ",
+"..s+p+p+e+f+b+0+0+2+<+(+,+>+C.L T.T.U.,+&+>+,+,+]+/+(+}+2+8+$+- ",
+"@.n+m+p+g+e+a+8+6+|+<+(+,+~+Q.L U.U.U.,+T.,+,+~+]+/+<+|+2+5+#+' ",
+"&.s+p+i+e+d+b+a+}+2+<+<+,+Y.z 2 9.T.,+U.>+,+,+,+]+/+<+2+|+}+$+- ",
+"%.n+p+k+e+e+0+b+0+m.c.2+,+~+Q.L U.T.,+U.,+,+,+~+]+/+|+<+2+8+*+] ",
+";.s+k+p+i+d+c+P.d 0.3.j {+>+W.` U.U.U.,+T.,+,+,+]+/+(+}+2+2+$+< ",
+">.s+k+i+p+b+'+v 2+<+_+t.s E.E 4 6.U.U.&+,+,+,+~+]+/+<+|+5+5+`.^ ",
+"'.n+p+p+g+e+t {+6+|+(+!+o.#.W.L T.T.U.,+T.,+,+~+]+/+<+|+<+6+$+< ",
+"_.n+k+l+f+g.g.9+0+<+<+(+/+s 7.m w.U.U.&+,+,+,+,+]+/+<+}+<+7+*+[ ",
+"{.s+p+i+g+t a+9+2+|+<+/+,+h.o g n.T.,+,+T.=+,+,+]+/+<+2+<+6+-+4 ",
+"_.D.p+i+[.f.$+$+2+j.<+(+d.~+s G U.k.r. at +b.,+,+b.]+>+j.D.~+6+*+3 ",
+":.D _._./ {.y E /.7 *.=.2 +.0 # L g m L } +.&.2 &.F 9 g + I $+5 ",
+"_.;.0+}+*.}+e.e.:+J &+ at +L I.y.{ y.|.6.N.z N.W.z @+q Z /.a D.;+6 ",
+"/.h+o+k+7+d+0+}+|+~+<+^+W.,+Y.i 1.U.Y.U.O.&+,+W.M.O &+(+2+6+)+4 ",
+"~.s+p+p+e+c+d+b+6+|+<+^+!+Y.E } 8 T.,+U.,+>+,+]+U A.2+|+2+}+*+| ",
+"/.n+l+i+g+e+0+0+6+2+:+/+^+,+Q.Q <.5.U.,+T.>+,+G.U /+:+<+|+8+$+< ",
+"{.s+p+p+f+g+a+0+0+<+:+/+]+~+Q.L N.n x. at +&+,+Z.l .+^+}+<+2+7+%+_ ",
+",.n+k+i+h+f+e+2+|+|+<+/+]+W.C } 8.x.l B.,+R.l t.]+/+(+}+2+2+$+< ",
+"{.r+n+p+g+c+0+d+2+2+<+/+]+,+Q.L U.O.R.H s l K.~+]+/+<+|+}+6+`.] ",
+"@.s+p+i+e+e+f+e+8+5+<+/+]+ at +k.p q.U.U.T. at +&+,+~+]+/+<+|+2+6+$+< ",
+"*.o+p+k+g+f+9+8+6+|+|+/+^+Y.|.e k.T.,+ at +&+&+,+,+]+/+<+|+<+|+S.) ",
+"Z s+k+p+h+f+9+e+6+2+(+/+]+,+Y.L U.U.U.T.&+,+~+,+]+/+<+2+<+2+-+- ",
+"` s+k+p+0+e+9+0+0+<+<+/+!+Y.` 7 d.U.,+T.>+,+,+,+^+/+|+}+}+9+#+' ",
+"..n+p+i+i+f+c+2+|+|+<+/+^+,+w.L F.U.U.,+T.,+,+,+]+/+(+2+2+2+$+- ",
+"Z n+p+p+g+e+0+d+2+5+<+/+=+~+N.L T.,+U.,+T.,+,+,+^+/+|+|+}+5+++= ",
+"T s+m+i+h+d+9+e+8+2+<+/+/+O.C f 6.U.,+U.~+=+2+=+]+/+(+2+2+5+$+- ",
+"D [+|+1+1+|+_+[+[+|+1+}+}+1+|+:+_+:+}+[+}+_+}+1+1+[+1+|+[+[+p.$ ",
+"< - ) - - ) ' - - , - ~ ! - ) - > - ~ - ~ , - ~ - - - ! - - -   "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.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 KPERCENTAGE 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
+kpercentage \- a percentage calculation teaching tool for KDE
+.SH SYNOPSIS
+.B kpercentage
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKPercentage\fP is a small math application that will help pupils to
+improve their skills in calculating percentages.
+.PP
+There is a special training section for the three basic tasks.  Finally
+the pupil can select a random mode, in which all three tasks are mixed
+randomly.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkpercentage \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kpercentage/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kpercentage/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kpercentage/\fP.
+.SH AUTHOR
+KPercentage was written by Matthias Messmer <bmlmessmer at web.de>,
+Carsten Niehaus <cniehaus at gmx.de> and Robert Gogolok <mail at robert-gogolok.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/kdeedu/debian/kpercentage.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KPercentage for Debian
+----------------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+usr/bin/kpercentage
+usr/share/applications/kde/kpercentage.desktop
+usr/share/apps/kpercentage
+usr/share/doc/kde/HTML/en/kpercentage/*.docbook
+usr/share/doc/kde/HTML/en/kpercentage/*.png
+usr/share/doc/kde/HTML/en/kpercentage/common
+usr/share/doc/kde/HTML/en/kpercentage/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/kpercentage.png
+usr/share/icons/hicolor/16x16/apps/kpercentage.png
+usr/share/icons/hicolor/22x22/apps/kpercentage.png
+usr/share/icons/hicolor/32x32/apps/kpercentage.png
+usr/share/icons/hicolor/48x48/apps/kpercentage.png
+usr/share/icons/hicolor/scalable/apps/kpercentage.svgz
+
+../kpercentage.xpm usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kpercentage.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * kpercentage_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #0033A8",
+"+ 	c #0238A6",
+"@ 	c #0041AF",
+"# 	c #0E3BAA",
+"$ 	c #133CAB",
+"% 	c #0443B1",
+"& 	c #0049A2",
+"* 	c #153DAC",
+"= 	c #0843B2",
+"- 	c #0047B4",
+"; 	c #183EAD",
+"> 	c #0D44B3",
+", 	c #004AB7",
+"' 	c #004CBA",
+") 	c #1045B4",
+"! 	c #044DB4",
+"~ 	c #1849A4",
+"{ 	c #1647B6",
+"] 	c #0D4FBD",
+"^ 	c #0055C2",
+"/ 	c #0056C3",
+"( 	c #1351B2",
+"_ 	c #0257C5",
+": 	c #1350BF",
+"< 	c #0658BF",
+"[ 	c #1651C0",
+"} 	c #0959C7",
+"| 	c #005ECB",
+"1 	c #1D54BD",
+"2 	c #1D53C3",
+"3 	c #0E5AC8",
+"4 	c #105BC2",
+"5 	c #0061CE",
+"6 	c #125BC9",
+"7 	c #155CC3",
+"8 	c #0463D0",
+"9 	c #175CCB",
+"0 	c #185DC4",
+"a 	c #195EBF",
+"b 	c #0F65D3",
+"c 	c #1F5FCE",
+"d 	c #2260CF",
+"e 	c #2361CA",
+"f 	c #2461D1",
+"g 	c #066EE3",
+"h 	c #1A68D6",
+"i 	c #2963D3",
+"j 	c #0E70DE",
+"k 	c #2B65CE",
+"l 	c #1F6AD8",
+"m 	c #2C67C9",
+"n 	c #216AD9",
+"o 	c #226CD4",
+"p 	c #246BDB",
+"q 	c #2F6EB6",
+"r 	c #266CDC",
+"s 	c #1972E8",
+"t 	c #286DDD",
+"u 	c #2971CC",
+"v 	c #296FD7",
+"w 	c #2B6FDE",
+"x 	c #2C70D9",
+"y 	c #1F74EA",
+"z 	c #2075E4",
+"A 	c #2E74CF",
+"B 	c #2F71E1",
+"C 	c #2376EB",
+"D 	c #2677ED",
+"E 	c #3474E4",
+"F 	c #2B7CDE",
+"G 	c #2D7AF0",
+"H 	c #387AD6",
+"I 	c #2F7DE5",
+"J 	c #2F7CEB",
+"K 	c #317BF2",
+"L 	c #3A7DD2",
+"M 	c #3C79E3",
+"N 	c #2582F7",
+"O 	c #337FE8",
+"P 	c #337EEE",
+"Q 	c #3481E3",
+"R 	c #2984F3",
+"S 	c #407EE1",
+"T 	c #2D85FB",
+"U 	c #3981F2",
+"V 	c #2E86F6",
+"W 	c #4281DE",
+"X 	c #3986E1",
+"Y 	c #3D85EF",
+"Z 	c #3E84F5",
+"` 	c #4E86D0",
+" .	c #4A86E4",
+"..	c #4288F2",
+"+.	c #448DE9",
+"@.	c #4689FA",
+"#.	c #468CF0",
+"$.	c #568ADB",
+"%.	c #498DF8",
+"&.	c #4A8FF3",
+"*.	c #4292FF",
+"=.	c #5290E1",
+"-.	c #4494FE",
+";.	c #5591E9",
+">.	c #5C8FE1",
+",.	c #4F91FC",
+"'.	c #4F93F7",
+").	c #5596DF",
+"!.	c #5395FA",
+"~.	c #5997E7",
+"{.	c #5499F6",
+"].	c #6996DC",
+"^.	c #639AFA",
+"/.	c #649DF6",
+"(.	c #6A9DEA",
+"_.	c #6E9EF2",
+":.	c #69A2FB",
+"<.	c #68A6F1",
+"[.	c #6AA4F7",
+"}.	c #71A1F5",
+"|.	c #7BA3DE",
+"1.	c #73A3F7",
+"2.	c #6AABEF",
+"3.	c #75A4F9",
+"4.	c #74A7F4",
+"5.	c #79A8E8",
+"6.	c #75A8F5",
+"7.	c #7BA7EE",
+"8.	c #70AAFD",
+"9.	c #78AAF7",
+"0.	c #79ABF8",
+"a.	c #79AEF5",
+"b.	c #80ABF3",
+"c.	c #79B1F0",
+"d.	c #8EABDB",
+"e.	c #7DAFFD",
+"f.	c #7AB3F2",
+"g.	c #7CB4F3",
+"h.	c #89AEF0",
+"i.	c #84B2F3",
+"j.	c #96AED9",
+"k.	c #8BB3EF",
+"l.	c #8CB4F0",
+"m.	c #8FB3F6",
+"n.	c #8FB7F3",
+"o.	c #89BAF4",
+"p.	c #94B6ED",
+"q.	c #96B8EE",
+"r.	c #9BB8E8",
+"s.	c #94BBF8",
+"t.	c #B7B3C4",
+"u.	c #95BCF9",
+"v.	c #B8B4C5",
+"w.	c #A2BAE6",
+"x.	c #9ABCF2",
+"y.	c #9DBDE7",
+"z.	c #9BBDF4",
+"A.	c #BAB6C8",
+"B.	c #A4BCE7",
+"C.	c #96C1F6",
+"D.	c #A5BDE8",
+"E.	c #98C0FC",
+"F.	c #A4C0E4",
+"G.	c #BCB9CA",
+"H.	c #A7BFEA",
+"I.	c #9AC2FE",
+"J.	c #AFBEDF",
+"K.	c #BEBBCC",
+"L.	c #A4C1F3",
+"M.	c #B4BFDA",
+"N.	c #A1C3FA",
+"O.	c #B1C0E1",
+"P.	c #ADC1E7",
+"Q.	c #C0BDCE",
+"R.	c #A7C3F5",
+"S.	c #BCC0CF",
+"T.	c #ABC3EF",
+"U.	c #A3C5FC",
+"V.	c #B9C1D6",
+"W.	c #B3C2E2",
+"X.	c #A8C4F6",
+"Y.	c #AFC3E9",
+"Z.	c #B7C2DD",
+"`.	c #C3BFD1",
+" +	c #B1C5EB",
+".+	c #BCC4D9",
+"++	c #B6C5E6",
+"@+	c #C0C4D4",
+"#+	c #B0C8F4",
+"$+	c #B7C7E7",
+"%+	c #C2C6D6",
+"&+	c #C3C7D7",
+"*+	c #C4C8D8",
+"=+	c #C1C9DE",
+"-+	c #C5C9D9",
+";+	c #B2CEF3",
+">+	c #BCCBEC",
+",+	c #BFCBE6",
+"'+	c #C6CADA",
+")+	c #B5CDF9",
+"!+	c #C9CAD4",
+"~+	c #C3CBE0",
+"{+	c #C7CBDB",
+"]+	c #C1CCE7",
+"^+	c #C5CDE2",
+"/+	c #CCCCD6",
+"(+	c #C8CDDC",
+"_+	c #C3CFEA",
+":+	c #BBD2F2",
+"<+	c #CDCED8",
+"[+	c #C7CFE5",
+"}+	c #BDD1F8",
+"|+	c #CBCFDF",
+"1+	c #CCD0E0",
+"2+	c #CFD0DA",
+"3+	c #D0D1DB",
+"4+	c #C3D3F4",
+"5+	c #CAD2E7",
+"6+	c #CED2E2",
+"7+	c #D1D2DC",
+"8+	c #C8D4EF",
+"9+	c #C2D5FC",
+"0+	c #D2D3DD",
+"a+	c #D3D4DE",
+"b+	c #BEDAFF",
+"c+	c #D4D5DF",
+"d+	c #CED6EB",
+"e+	c #D2D6E6",
+"f+	c #D5D6E0",
+"g+	c #D3D7E7",
+"h+	c #D6D7E1",
+"i+	c #D1D9EF",
+"j+	c #D8D8E3",
+"k+	c #CFDAF6",
+"l+	c #C9DDF7",
+"m+	c #D9D9E4",
+"n+	c #D6DAEA",
+"o+	c #DADBE5",
+"p+	c #D8DCEC",
+"q+	c #DBDCE6",
+"r+	c #DCDDE7",
+"s+	c #DDDEE8",
+"t+	c #D3E2F6",
+"u+	c #DEDFE9",
+"v+	c #DFE0EA",
+"w+	c #E0E1EB",
+"x+	c #E3E1E5",
+"y+	c #E2E2ED",
+"z+	c #DEE3F3",
+"A+	c #E6E3E8",
+"B+	c #E3E4EE",
+"C+	c #E7E4E9",
+"D+	c #E8E5EA",
+"E+	c #E5E6F0",
+"F+	c #E6E7F1",
+"G+	c #EAE8EC",
+"                                                                ",
+"                                                                ",
+"              . .                                               ",
+"        + u ).5.c.).A #               - L L L < .               ",
+"      , <.D.M.!+{+V.F.c.<           # a.J.J.J.C.4               ",
+"    ) g.V.q+G+E+G+E+v+`.n.<         H F.q+B+j+y.m               ",
+"    X P.x+B+C+r+o+C+F+B+Z.;.+     - a.(+D+G+&+<.*               ",
+"  , b./+y+x+|+w.p.=+B+C+0+o./     F w.q+B+f+q.o                 ",
+"  k z.o+B+u+D.O x r.q+w+q+P.x   ) 4.1+x+v+-+/.#                 ",
+"  v w.q+s+o+p.1 % i.h+s+r+J.F # Q w.x+s+f+k.8                   ",
+"  M W.q+q+j+h.] % [.j+o+r+~+Y ] [.1+o+o+~+&.*                   ",
+"  x O.m+m+c+9., ) [./+m+m+^+#.I P.x+m+e+b.k                     ",
+"  } j.h+j+f+|.[ ] e.j+h+j+++,.}.6+c+f+^+Y @ { } , % *           ",
+"  [ |.0+j+c+d.9 2 p./+7+j+H.,.W.j+0+j+9.R Z {.b.3.!.R /         ",
+"  ^ $.j+3+6+6+).W ]+a+/+e+h.1.j+6+/+]+,.[.d+j+h+h+c+5+/.w %     ",
+"  @ b Z.6+/+7+j+a+7+6+/+1+*.]+/+/+j+1.9.m+2+2+3+/+/+|+g+[.f     ",
+"    [  .n+6+/+/+|+/+6+n+>.~.j+1+/+>+%.g+|+|+1+p+m+/+/+/+8+Z )   ",
+"      6 S W.m+6+j+m+++W j _+{+/+m+3.m./+/+/+]+&.3.i+{+{+0+9.6   ",
+"        ] i E  .>.E w w ].j+`./+ +T #+-+-+/+m.f i X./+-+/+z.n   ",
+"            { [ [ ] , E d+/+!+y+ .E 8+`./+6+e.2 c m.|+/+-+#+D   ",
+"                    d b./+`.`.#+B D q+`./+j+^.] 2 e.1+`. at +8+P   ",
+"                  ] J q+`. at +x++./ w d+`.K.j+:./ 6 e./+`.`.b+K   ",
+"                  h i.6+`.&+T.g , s 8+S.K.(+a.} c z./+S.Q.#+D   ",
+"                ^ R z+Q.S.w+%.}   n R.`.G./+x.w B }+Q.K./+n.b   ",
+"              ` n x./+v.-+L.B     5 :.q+A.v.w+u.}+q+G.G.x+^.^   ",
+"              1 %.z+A.A.C+&.4     a J k+S.V.G.!+S.A.V. at +#+s     ",
+"              j u.h+%+6+N.B q       5 ,.i+'+A.t.t.t.2+l+#.6     ",
+"              d '.I.U.N.R |           e Z u.b+z+t+b+m.N 5       ",
+"                b g w w 4               a n J T K J i (         ",
+"                                              ~ &               ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+KStars data for Debian
+----------------------
+
+This package merely provides supporting data files for KStars.  The
+KStars application itself can be found in the kstars package.
+
+ -- Ben Burton <bab at debian.org>, Mon, 23 Feb 2004 08:14:22 +1100

Added: people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars-data.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+kstars/AUTHORS
+kstars/README
+kstars/README.customize
+kstars/README.ephemerides
+kstars/README.planetmath
+kstars/README.timekeeping
+kstars/TODO

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kstars.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,117 @@
+.\"                                      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 KSTARS 1 "March 16, 2005"
+.\" 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
+kstars \- a desktop planetarium for KDE
+.SH SYNOPSIS
+.B kstars
+.RI "[ " generic-options " ]"
+[ \fB\-\-date\fP \fIdate-and-time\fP ]
+[ \fB\-\-paused\fP ]
+.PP
+.B kstars \fB\-\-dump\fP
+[ \fB\-\-filename\fP \fIimage-file\fP ]
+[ \fB\-\-height\fP \fIpixels\fP ] [ \fB\-\-width\fP \fIpixels\fP ]
+[ \fB\-\-date\fP \fIdate-and-time\fP ]
+[ \fB\-\-script\fP \fIscript-file\fP ]
+.SH DESCRIPTION
+\fBKStars\fP is a graphical desktop planetarium for KDE.  It depicts an
+accurate simulation of the night sky, including stars, constellations,
+star clusters, nebulae, galaxies, all planets, the Sun, the Moon,
+comets and asteroids.  You can see the sky as it appears from any
+location on Earth, on any date.
+.PP
+The user interface is highly intuitive and flexible.  The display can
+be panned and zoomed with the mouse, and you can easily identify
+objects and track their motion across the sky.  KStars includes many
+powerful features, yet the interface is clean and simple and fun to use.
+.PP
+Normally KStars launches a full graphical user interface.  By passing the
+\fB\-\-dump\fP option, you can make KStars dump an image of the sky to
+a graphics file and exit immediately without launching a graphical user
+interface at all.  Several other options are available to control
+precisely how this image is dumped.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+Below are the kstars-specific options.
+For a full summary of options, run \fIkstars \-\-help\fP.
+.PP
+Options that can be used when starting the full graphical user interface
+are as follows.
+.TP
+\fB\-\-date\fP \fIdate-and-time\fP
+Starts with the simulation clock set to the given date and time (default is
+current date and time).
+.TP
+\fB\-\-paused\fP
+Starts with the simulation clock paused.
+.PP
+Options that can be used when dumping an image of the sky are as
+follows.
+.TP
+\fB\-\-dump\fP
+Dumps the sky image to a graphics file and exits immediately.
+Several other options (described below) are available to control
+precisely how the image is dumped.
+.TP
+\fB\-\-date\fP \fIdate-and-time\fP
+Specifies the date and time for the sky image to dump (default is
+current date and time).
+.TP
+\fB\-\-filename\fP \fIimage-file\fP
+Dumps the sky image to the given file (default is \fIkstars.png\fP).
+.TP
+\fB\-\-height\fP \fIpixels\fP
+Specifies the height of the sky image to dump (default is 480).
+.TP
+\fB\-\-script\fP \fIscript-file\fP
+Specifies a DCOP script to run before the sky image is dumped.
+The script can be used to set where the image is pointing, set the
+geographic location, set the time and date, change the zoom level, and
+adjust other view options.
+.br
+KStars includes a script builder (found in the Tools menu) to help
+with writing DCOP scripts.  The full user documentation (discussed
+below) contains a more detailed explanation of how such scripts can
+be written and used.
+.TP
+\fB\-\-width\fP \fIpixels\fP
+Specifies the width of the sky image to dump (default is 640).
+.SH SEE ALSO
+.BR indiserver (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kstars/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/kstars.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KStars for Debian
+-----------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

Added: people/jriddell/KDE/3.5/kdeedu/debian/kstars.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+kstars/AUTHORS
+kstars/README
+kstars/README.customize
+kstars/README.ephemerides
+kstars/README.planetmath
+kstars/README.timekeeping
+kstars/TODO

Added: people/jriddell/KDE/3.5/kdeedu/debian/kstars.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,36 @@
+etc/kde3/kstarsrc
+usr/bin/apmount
+usr/bin/apogee_ppi
+usr/bin/celestrongps
+usr/bin/fliccd
+usr/bin/fliwheel
+usr/bin/indiserver
+usr/bin/kstars
+usr/bin/lx200_16
+usr/bin/lx200autostar
+usr/bin/lx200basic
+usr/bin/lx200classic
+usr/bin/lx200generic
+usr/bin/lx200gps
+usr/bin/meade_lpi
+usr/bin/sbigccd
+usr/bin/skycommander
+usr/bin/temma
+usr/bin/v4ldriver
+usr/bin/v4lphilips
+usr/include/kde/kstarsinterface.h
+usr/include/kde/simclockinterface.h
+usr/share/applications/kde/kstars.desktop
+usr/share/config.kcfg/kstars.kcfg
+usr/share/doc/kde/HTML/en/kstars/*.docbook
+usr/share/doc/kde/HTML/en/kstars/*.png
+usr/share/doc/kde/HTML/en/kstars/common
+usr/share/doc/kde/HTML/en/kstars/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/kstars.png
+usr/share/icons/hicolor/16x16/apps/kstars.png
+usr/share/icons/hicolor/32x32/apps/kstars.png
+usr/share/icons/hicolor/48x48/apps/kstars.png
+usr/share/icons/hicolor/64x64/apps/kstars.png
+usr/share/icons/hicolor/scalable/apps/kstars.svgz
+
+../kstars.xpm usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeedu/debian/kstars.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+debian/celestrongps.1
+debian/fliccd.1
+debian/indiserver.1
+debian/kstars.1
+debian/lx200_16.1
+debian/lx200autostar.1
+debian/lx200classic.1
+debian/lx200generic.1
+debian/lx200gps.1
+debian/temma.1
+debian/v4ldriver.1
+debian/v4lphilips.1

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kstars.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kstars.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kstars.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,391 @@
+/* XPM */
+static char * kstars_xpm[] = {
+"32 32 356 2",
+"  	c None",
+". 	c #EFB641",
+"+ 	c #F0B640",
+"@ 	c #FDF692",
+"# 	c #FDF7BA",
+"$ 	c #EBB23F",
+"% 	c #E4902D",
+"& 	c #F9D863",
+"* 	c #FEFE86",
+"= 	c #FEFEA0",
+"- 	c #FDF6B8",
+"; 	c #EDB33F",
+"> 	c #D9721E",
+", 	c #F5BA4A",
+"' 	c #FBE06A",
+") 	c #FEFE83",
+"! 	c #FEFE8F",
+"~ 	c #FDF5B1",
+"{ 	c #ECB140",
+"] 	c #D46C1C",
+"^ 	c #F5B84A",
+"/ 	c #FCF47B",
+"( 	c #EFB642",
+"_ 	c #DD8025",
+": 	c #DE8527",
+"< 	c #E28B2A",
+"[ 	c #E3922D",
+"} 	c #E5982F",
+"| 	c #E89E32",
+"1 	c #EBA435",
+"2 	c #EEAA37",
+"3 	c #EDAB38",
+"4 	c #EEAC38",
+"5 	c #DEA135",
+"6 	c #C18328",
+"7 	c #D46D1C",
+"8 	c #F4B849",
+"9 	c #F8D662",
+"0 	c #F1BC47",
+"a 	c #F9E46C",
+"b 	c #EEB33F",
+"c 	c #EDAB37",
+"d 	c #EDAC37",
+"e 	c #EEAC37",
+"f 	c #DD8026",
+"g 	c #F8C04F",
+"h 	c #F8C553",
+"i 	c #F9CA57",
+"j 	c #F9CE5B",
+"k 	c #FAD35F",
+"l 	c #FAD863",
+"m 	c #F7C654",
+"n 	c #F3A93A",
+"o 	c #F4A638",
+"p 	c #F8CD59",
+"q 	c #EBDC6D",
+"r 	c #CAB357",
+"s 	c #D46E1F",
+"t 	c #DD8126",
+"u 	c #F4B647",
+"v 	c #FCE971",
+"w 	c #FBEF76",
+"x 	c #F1BF49",
+"y 	c #FCF685",
+"z 	c #FEFECA",
+"A 	c #FEFEB1",
+"B 	c #EEBA46",
+"C 	c #D97821",
+"D 	c #F7BC4B",
+"E 	c #F7C553",
+"F 	c #F09C32",
+"G 	c #EF8E26",
+"H 	c #E5851F",
+"I 	c #E57D19",
+"J 	c #ED6F0B",
+"K 	c #EE7811",
+"L 	c #E9CB5D",
+"M 	c #CCBA5B",
+"N 	c #C9903F",
+"O 	c #D66F1E",
+"P 	c #F6BA4A",
+"Q 	c #FCE871",
+"R 	c #FBF076",
+"S 	c #F1BF57",
+"T 	c #FCF5E8",
+"U 	c #F7F7E8",
+"V 	c #F6F689",
+"W 	c #ECB945",
+"X 	c #D6701D",
+"Y 	c #F6B646",
+"Z 	c #F6C150",
+"` 	c #F3AF41",
+" .	c #CD892D",
+"..	c #DB7716",
+"+.	c #EE6D08",
+"@.	c #FADF6A",
+"#.	c #DCD46B",
+"$.	c #C89745",
+"%.	c #D56E20",
+"&.	c #F6B94A",
+"*.	c #FCE770",
+"=.	c #FBF177",
+"-.	c #EDBB54",
+";.	c #BEB6A8",
+">.	c #C2C27E",
+",.	c #D66C1C",
+"'.	c #F1A73D",
+").	c #F7B747",
+"!.	c #F1B84B",
+"~.	c #DA9D3D",
+"{.	c #EC7D16",
+"].	c #EF7F17",
+"^.	c #FDEF7B",
+"/.	c #ECE7B9",
+"(.	c #C39681",
+"_.	c #D46B24",
+":.	c #F6B848",
+"<.	c #FCE76F",
+"[.	c #FCF278",
+"}.	c #E7B446",
+"|.	c #F6ED77",
+"1.	c #D26518",
+"2.	c #E99331",
+"3.	c #F6B243",
+"4.	c #F9D460",
+"5.	c #F39854",
+"6.	c #FDFAE2",
+"7.	c #FEFEFE",
+"8.	c #E8E8E8",
+"9.	c #A57B6C",
+"0.	c #CD641C",
+"a.	c #F6B748",
+"b.	c #FCE66F",
+"c.	c #FCF379",
+"d.	c #F1BE48",
+"e.	c #ECB643",
+"f.	c #DC7923",
+"g.	c #F6AD3F",
+"h.	c #F4B547",
+"i.	c #F7DA67",
+"j.	c #FFFFFF",
+"k.	c #FAF6F3",
+"l.	c #FAFAFA",
+"m.	c #CECECE",
+"n.	c #9C9A88",
+"o.	c #96925E",
+"p.	c #C69B49",
+"q.	c #D3681C",
+"r.	c #F6B647",
+"s.	c #FCE56E",
+"t.	c #FCF479",
+"u.	c #EFB741",
+"v.	c #A57926",
+"w.	c #D05E15",
+"x.	c #F5A83B",
+"y.	c #F6AE40",
+"z.	c #FBEC76",
+"A.	c #F5F5F5",
+"B.	c #D5D5D5",
+"C.	c #A19C89",
+"D.	c #9D935C",
+"E.	c #D9CB63",
+"F.	c #F3E672",
+"G.	c #E1D96D",
+"H.	c #C89F4B",
+"I.	c #D2661B",
+"J.	c #F5B546",
+"K.	c #FCE46D",
+"L.	c #FCF47A",
+"M.	c #EBB341",
+"N.	c #CE5912",
+"O.	c #E98D2C",
+"P.	c #F5A93B",
+"Q.	c #F4DB69",
+"R.	c #D3A84A",
+"S.	c #EFEFEF",
+"T.	c #FBFBFB",
+"U.	c #DCDCDC",
+"V.	c #9F968A",
+"W.	c #9C6C3A",
+"X.	c #DEC35C",
+"Y.	c #F5DC68",
+"Z.	c #FCEB73",
+"`.	c #FDEF77",
+" +	c #E3DB6E",
+".+	c #C8A04C",
+"++	c #D1661B",
+"@+	c #F5B346",
+"#+	c #FCF57B",
+"$+	c #EBB441",
+"%+	c #D46518",
+"&+	c #F5A437",
+"*+	c #F1AC41",
+"=+	c #F8EA75",
+"-+	c #ECECEC",
+";+	c #F2F2F2",
+">+	c #E4E4E4",
+",+	c #9B9B9B",
+"'+	c #746048",
+")+	c #DE9330",
+"!+	c #F2BD4D",
+"~+	c #FBDC67",
+"{+	c #FBE16B",
+"]+	c #FCEA73",
+"^+	c #E4DC6F",
+"/+	c #C9A34D",
+"(+	c #D1641A",
+"_+	c #F5B345",
+":+	c #FCE36C",
+"<+	c #FCF67B",
+"[+	c #EDB542",
+"}+	c #CB520E",
+"|+	c #EC902C",
+"1+	c #EEC885",
+"2+	c #E8E6D2",
+"3+	c #E9E9E9",
+"4+	c #ADA596",
+"5+	c #987E4F",
+"6+	c #E2A944",
+"7+	c #F3B549",
+"8+	c #F3B547",
+"9+	c #F2A639",
+"0+	c #F09026",
+"a+	c #F17F18",
+"b+	c #EF7913",
+"c+	c #F08A21",
+"d+	c #E6DE70",
+"e+	c #C8A54E",
+"f+	c #CE5D14",
+"g+	c #F5B244",
+"h+	c #F9DC67",
+"i+	c #EAB341",
+"j+	c #E29C7D",
+"k+	c #D6793C",
+"l+	c #E3C8A6",
+"m+	c #E7E4E1",
+"n+	c #B2A28B",
+"o+	c #AB8D51",
+"p+	c #E0BC56",
+"q+	c #F1C356",
+"r+	c #F2B74B",
+"s+	c #F6BC4C",
+"t+	c #F6C151",
+"u+	c #F3AF42",
+"v+	c #DF9733",
+"w+	c #D97A1A",
+"x+	c #ED6B07",
+"y+	c #F8C754",
+"z+	c #E7DF6F",
+"A+	c #BC7C2A",
+"B+	c #CB5511",
+"C+	c #D67924",
+"D+	c #E5E5E5",
+"E+	c #DFDAD7",
+"F+	c #B39C86",
+"G+	c #AC7B3E",
+"H+	c #DF9532",
+"I+	c #F4A73B",
+"J+	c #F7BB4B",
+"K+	c #F8BF4F",
+"L+	c #F4C051",
+"M+	c #C68D34",
+"N+	c #EE6E09",
+"O+	c #FBE66F",
+"P+	c #D8A73E",
+"Q+	c #8F4C14",
+"R+	c #9C9C9C",
+"S+	c #8E8B89",
+"T+	c #A43E0B",
+"U+	c #EC912B",
+"V+	c #F49F33",
+"W+	c #F3BB4E",
+"X+	c #EF8119",
+"Y+	c #F3A537",
+"Z+	c #ECB642",
+"`+	c #A13607",
+" @	c #CD5612",
+".@	c #F3992E",
+"+@	c #F3C659",
+"@@	c #DCB24E",
+"#@	c #EE8B22",
+"$@	c #F08C22",
+"%@	c #C4430A",
+"&@	c #D56216",
+"*@	c #F49A2F",
+"=@	c #F2C95C",
+"-@	c #DBB552",
+";@	c #EF9128",
+">@	c #F19228",
+",@	c #EEB542",
+"'@	c #C2420A",
+")@	c #D96919",
+"!@	c #F1B64C",
+"~@	c #EED467",
+"{@	c #F0992E",
+"]@	c #F4AB3D",
+"^@	c #EEB341",
+"/@	c #C04309",
+"(@	c #D25F15",
+"_@	c #F3982E",
+":@	c #F5A337",
+"<@	c #F4A93C",
+"[@	c #F7E672",
+"}@	c #F3A135",
+"|@	c #F8CD5B",
+"1@	c #EBAC3D",
+"2@	c #BA4009",
+"3@	c #CA5210",
+"4@	c #EE8F2A",
+"5@	c #F1AD43",
+"6@	c #F9EB76",
+"7@	c #EFC55A",
+"8@	c #EFAE45",
+"9@	c #F5B749",
+"0@	c #F4B94A",
+"a@	c #E8A53A",
+"b@	c #C64A0C",
+"c@	c #DF761F",
+"d@	c #F39D32",
+"e@	c #F2AA3F",
+"f@	c #F3D465",
+"g@	c #FBF37B",
+"h@	c #F8E36E",
+"i@	c #FADF69",
+"j@	c #F3C354",
+"k@	c #F5BD4E",
+"l@	c #F9C957",
+"m@	c #E5A037",
+"n@	c #B6440B",
+"o@	c #CA5311",
+"p@	c #E58326",
+"q@	c #F5A237",
+"r@	c #F4B748",
+"s@	c #F7B648",
+"t@	c #F8C453",
+"u@	c #E49933",
+"v@	c #BE4C0F",
+"w@	c #CD5A14",
+"x@	c #E28126",
+"y@	c #F1A037",
+"z@	c #F7B647",
+"A@	c #E29430",
+"B@	c #AB490F",
+"C@	c #CC5B14",
+"D@	c #D1671A",
+"E@	c #DF8328",
+"F@	c #EB9A36",
+"G@	c #F2AB40",
+"H@	c #F7BA4A",
+"I@	c #E08E2D",
+"J@	c #96440F",
+"K@	c #BB5E17",
+"L@	c #CC6B1D",
+"M@	c #D6721E",
+"N@	c #D87821",
+"O@	c #DA7E24",
+"                                                                ",
+"                            . +                                 ",
+"                          . @ # $                               ",
+"                        % & * = - ;                             ",
+"                        > , ' ) ! ~ {                           ",
+"                          ] ^ ' ) / (                           ",
+"    _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d d e c 4             ",
+"    f g h i j k l m n o p q r s t u v w x y z A ) B             ",
+"    C D g h i E F G H I J K L M N O P Q R S T U V W             ",
+"    X Y D g Z `  .        ..+. at .#.$.%.&.*.=.-.;.>.W             ",
+"    ,.'.).D !.~.            {.].^./.(._.:.<.[.}.|.W             ",
+"    1.2.3.).4.                5.6.7.8.9.0.a.b.c.d.e.            ",
+"      f.g.h.i.              j.k.l.m.n.o.p.q.r.s.t.u.v.          ",
+"      w.x.y.z.            A.7.B.C.D.E.F.G.H.I.J.K.L.M.          ",
+"      N.O.P.Q.R.      S.T.U.V.W.X.Y.b.Z.`. +.+++ at +K.#+$+        ",
+"        %+&+*+=+  -+;+>+,+'+)+!+l ~+{+K.]+`.^+/+(+_+:+<+[+      ",
+"        }+|+&+1+2+3+4+5+6+7+8+j j 9+0+a+b+c+' d+e+f+g+h+i+      ",
+"        j+k+l+m+n+o+p+q+r+s+h t+u+v+      w+x+y+z+A+B+C+        ",
+"        D+E+F+G+H+I+g.3.).J+K+L+M+            N+O+P+Q+          ",
+"        R+S+T+U+V+&+x.g.3.).W+q+              X+Y+Z+            ",
+"            `+ @. at V+&+x.g.3.+@@@              #@$@[+            ",
+"              %@&@*@V+&+x.g.=@-@              ;@>@,@            ",
+"                '@)@*@V+&+x.!@~@              {@]@^@            ",
+"                  /@(@_ at V+:@<@[@              }@|@1@            ",
+"                    2 at 3@4 at V+:@5 at 6@7@      8 at 9@0 at k a@            ",
+"                        b at c@d@:@e at f@g at h@i at j@k at l@j m@            ",
+"                          n at o@p at q@x.y.r at s@J+g t at l@u@            ",
+"                              v at w@x at y@g.3.z at J+g t at A@            ",
+"                                  B at C@D at E@F at G@H at g I@            ",
+"                                        J at K@L at M@N at O@            ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/ktouch.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/ktouch.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/ktouch.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,56 @@
+.\"                                      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 KTOUCH 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
+ktouch \- a touch typing tutor for KDE
+.SH SYNOPSIS
+.B ktouch
+.RI "[ " generic-options " ]"
+[ \fIURL\fP ]
+.SH DESCRIPTION
+\fBKTouch\fP is a program for learning touch typing \- it helps you learn to
+type on a keyboard quickly and correctly.  Every finger has its place on
+the keyboard with associated keys to press.
+.PP
+KTouch helps you learn to touch type by providing you with text to
+train on, and adjusts to different levels depending on how good you are.
+It can display which key to press next, and the correct finger to use.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+Below are the ktouch-specific options.
+For a full summary of options, run \fIktouch \-\-help\fP.
+.TP
+\fIURL\fP
+The training file to open.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/ktouch/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/ktouch/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/ktouch/\fP.
+.SH AUTHOR
+KTouch was written by Haavard Froeiland <haavard at users.sourceforge.net>
+and Andreas Nicolai <Andreas.Nicolai at gmx.net>.
+.br
+This manual page was prepared
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeedu/debian/ktouch.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/ktouch.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/ktouch.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KTouch for Debian
+-----------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/ktouch.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/ktouch.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/ktouch.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+usr/bin/ktouch
+usr/share/applications/kde/ktouch.desktop
+usr/share/apps/ktouch
+usr/share/config.kcfg/ktouch.kcfg
+usr/share/doc/kde/HTML/en/ktouch/*.docbook
+usr/share/doc/kde/HTML/en/ktouch/*.png
+usr/share/doc/kde/HTML/en/ktouch/common
+usr/share/doc/kde/HTML/en/ktouch/index.cache.bz2
+usr/share/icons/hicolor/128x128/apps/ktouch.png
+usr/share/icons/hicolor/16x16/apps/ktouch.png
+usr/share/icons/hicolor/22x22/apps/ktouch.png
+usr/share/icons/hicolor/32x32/apps/ktouch.png
+usr/share/icons/hicolor/48x48/apps/ktouch.png
+usr/share/icons/hicolor/scalable/apps/ktouch.svgz
+
+../ktouch.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/ktouch.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/ktouch.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/ktouch.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(ktouch):needs="X11"\
+  section="Apps/Education"\
+  hints="KDE"\
+  title="KTouch"\
+  longtitle="KTouch (Touch Typing Tutor)"\
+  command="/usr/bin/ktouch"\
+  icon="/usr/share/pixmaps/ktouch.xpm"

Added: people/jriddell/KDE/3.5/kdeedu/debian/ktouch.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/ktouch.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/ktouch.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,268 @@
+/* XPM */
+static char * ktouch_xpm[] = {
+"32 32 233 2",
+"  	c None",
+". 	c #013618",
+"+ 	c #003814",
+"@ 	c #003915",
+"# 	c #023A10",
+"$ 	c #003B1C",
+"% 	c #73090B",
+"& 	c #004821",
+"* 	c #014A23",
+"= 	c #064D14",
+"- 	c #602118",
+"; 	c #005319",
+"> 	c #095E29",
+", 	c #DC0003",
+"' 	c #464845",
+") 	c #474946",
+"! 	c #484947",
+"~ 	c #086F2A",
+"{ 	c #494A48",
+"] 	c #037529",
+"^ 	c #DF0A19",
+"/ 	c #4C4E4B",
+"( 	c #C51A1A",
+"_ 	c #893437",
+": 	c #A12A2E",
+"< 	c #2D6144",
+"[ 	c #0B782C",
+"} 	c #1D773E",
+"| 	c #AC3436",
+"1 	c #BE2C31",
+"2 	c #BB3131",
+"3 	c #5A5C59",
+"4 	c #5C5E5B",
+"5 	c #AB3C3E",
+"6 	c #5D5F5C",
+"7 	c #AC3D3E",
+"8 	c #CD302D",
+"9 	c #B33B3B",
+"0 	c #CE312E",
+"a 	c #5F615E",
+"b 	c #626064",
+"c 	c #119630",
+"d 	c #646266",
+"e 	c #626461",
+"f 	c #606567",
+"g 	c #656367",
+"h 	c #636562",
+"i 	c #646563",
+"j 	c #0D9E2F",
+"k 	c #C63D3F",
+"l 	c #666765",
+"m 	c #04A52D",
+"n 	c #686967",
+"o 	c #6A686C",
+"p 	c #6D6B6F",
+"q 	c #00AE34",
+"r 	c #00AF35",
+"s 	c #6F716E",
+"t 	c #0BB12F",
+"u 	c #448E55",
+"v 	c #70717A",
+"w 	c #C1504F",
+"x 	c #737175",
+"y 	c #717370",
+"z 	c #6F7376",
+"A 	c #747276",
+"B 	c #737572",
+"C 	c #C35256",
+"D 	c #777579",
+"E 	c #757774",
+"F 	c #73777A",
+"G 	c #16B433",
+"H 	c #C4545D",
+"I 	c #CA5259",
+"J 	c #2BAA33",
+"K 	c #42975B",
+"L 	c #78767A",
+"M 	c #C65559",
+"N 	c #C7565A",
+"O 	c #0EBC30",
+"P 	c #26B24F",
+"Q 	c #26B92E",
+"R 	c #28BA2F",
+"S 	c #1BC035",
+"T 	c #1FBC42",
+"U 	c #22C02C",
+"V 	c #4CA35A",
+"W 	c #41AE4D",
+"X 	c #45AE5B",
+"Y 	c #858784",
+"Z 	c #2BC530",
+"` 	c #88868A",
+" .	c #34C237",
+"..	c #8C8786",
+"+.	c #2EC733",
+"@.	c #888A87",
+"#.	c #27CC2E",
+"$.	c #4EAF64",
+"%.	c #8B898D",
+"&.	c #8D8F8C",
+"*.	c #5EAF6C",
+"=.	c #3ACF3B",
+"-.	c #939195",
+";.	c #39D145",
+">.	c #939592",
+",.	c #43CD42",
+"'.	c #959794",
+").	c #98969A",
+"!.	c #9999A3",
+"~.	c #9A9B98",
+"{.	c #A49899",
+"].	c #9B9D99",
+"^.	c #53D14F",
+"/.	c #9C9E9B",
+"(.	c #9C9CA6",
+"_.	c #9D9F9C",
+":.	c #9D9DA7",
+"<.	c #9EA09D",
+"[.	c #A19EA2",
+"}.	c #56D553",
+"|.	c #C29297",
+"1.	c #A3A0A4",
+"2.	c #A1A2AB",
+"3.	c #A5A2A7",
+"4.	c #A4A6A3",
+"5.	c #A7A4A9",
+"6.	c #A5A7A4",
+"7.	c #A6A8A5",
+"8.	c #A4A9AC",
+"9.	c #A7A9A6",
+"0.	c #A8AAA7",
+"a.	c #A9ABA8",
+"b.	c #AAACA9",
+"c.	c #B9A6A8",
+"d.	c #ABADAA",
+"e.	c #ACAEAB",
+"f.	c #ADAFAC",
+"g.	c #C1A6AB",
+"h.	c #6FDA76",
+"i.	c #AEB0AD",
+"j.	c #ACB1B3",
+"k.	c #78D580",
+"l.	c #ADB2B4",
+"m.	c #B0B2AE",
+"n.	c #B1B3AF",
+"o.	c #B1B1BB",
+"p.	c #B2B4B1",
+"q.	c #B0B5B7",
+"r.	c #B3B5B2",
+"s.	c #B4B6B3",
+"t.	c #B4B5BE",
+"u.	c #B2B7BA",
+"v.	c #B8B5BA",
+"w.	c #B5B6BF",
+"x.	c #B4B9BC",
+"y.	c #BAB8BC",
+"z.	c #BBB9BD",
+"A.	c #B9BAC4",
+"B.	c #B7BCBF",
+"C.	c #86E084",
+"D.	c #BCBABE",
+"E.	c #96D2A9",
+"F.	c #BBBCC6",
+"G.	c #BEBCC0",
+"H.	c #BCBEBB",
+"I.	c #B9BFC1",
+"J.	c #BFBDC1",
+"K.	c #C0BEC2",
+"L.	c #BCC1C3",
+"M.	c #92DE9F",
+"N.	c #C3C0C4",
+"O.	c #C4C1C5",
+"P.	c #C2C4C1",
+"Q.	c #C5C2C7",
+"R.	c #C0C5C8",
+"S.	c #C6C3C8",
+"T.	c #C7C4C9",
+"U.	c #C2C7CA",
+"V.	c #C8C5CA",
+"W.	c #C9C7CB",
+"X.	c #C7C9C6",
+"Y.	c #C5CACD",
+"Z.	c #CAC8CC",
+"`.	c #9EE7A1",
+" +	c #CBC9CD",
+".+	c #C9CBC8",
+"++	c #C6CCCE",
+"@+	c #CCCACE",
+"#+	c #C7CDCF",
+"$+	c #A9E2B3",
+"%+	c #CDCBCF",
+"&+	c #CBCECA",
+"*+	c #C9CED0",
+"=+	c #CACFD1",
+"-+	c #D0CDD1",
+";+	c #CBD0D2",
+">+	c #CCD1D4",
+",+	c #CFD1CE",
+"'+	c #D2CFD4",
+")+	c #D3D0D5",
+"!+	c #CED3D6",
+"~+	c #D4D1D6",
+"{+	c #CFD4D7",
+"]+	c #D0D5D8",
+"^+	c #D5D3D7",
+"/+	c #D1D7D9",
+"(+	c #D7D5D9",
+"_+	c #D8D6DA",
+":+	c #D9D7DB",
+"<+	c #DBD8DC",
+"[+	c #BFEEBA",
+"}+	c #DCD9DE",
+"|+	c #DEDBE0",
+"1+	c #DFDCE1",
+"2+	c #E0DEE2",
+"3+	c #E1DFE3",
+"4+	c #E2E0E4",
+"5+	c #E3E1E5",
+"6+	c #E5E2E6",
+"7+	c #E1E6E9",
+"8+	c #E7E4E9",
+"9+	c #E2E7EA",
+"0+	c #E8E5EA",
+"a+	c #D6F2DB",
+"b+	c #E9E6EB",
+"c+	c #D5F5D7",
+"d+	c #EAE8EC",
+"e+	c #EFECF1",
+"f+	c #F1EEF3",
+"g+	c #EEF3F6",
+"h+	c #F3F1F5",
+"i+	c #F4F2F6",
+"j+	c #F5F3F7",
+"                          ; ; ; ; ; =                           ",
+"                        K a+a+a+a+a+E.#                         ",
+"                        *.a+a+a+a+c+$+@                         ",
+"                        $.[+[+[+[+[+M.+                         ",
+"                        X `.`.`.`.k.P .                         ",
+"                        W C.C.h.T J j $                         ",
+"                    & j  .}.,. .S G t c ]                       ",
+"                      * J =.=.+.S O J [                         ",
+"                          V }.+.+.O ~                           ",
+"                          - u ,. .> %                           ",
+"    :.D.D.D.D.D.D.v.o ^ g.g...} < {.g.|., %.z.D.D.D.D.D.z.`     ",
+"  d O.;+++;+;+;+;+;+!.H %+Y.-+K.%+)+;+V.1 t.=+U.=+;+;+;+;+w.    ",
+"  f  +N.D.J.^+^+,+,+[.M {+s.8.x.]+]+]+%+1 A..+6.-+^+^+^+]+A.    ",
+"  i -+X.n.X./+/+<+<+2.H <+B.r.O.<+<+,+>+2 K.)+v.,+,+2+,+<+K.    ",
+"  f ~+1+1+<+4+4+2+/+8.C 2+1+3+2+3+2+4+}+1 N./+6+6+2+4+2+2+O.    ",
+"  f ]+7+6+4+4+7+7+6+1.N 7+4+7+2+7+6+6+]+2 R.6+4+3+7+4+7+7+R.    ",
+"  g <+7+9+0+6+6+9+9+8.w 9+7+9+6+7+9+b+7+1 Z.9+9+6+9+6+6+b+Z.    ",
+"  h 7+i+h+g+g+g+h+j+).M j+h+h+g+h+h+g+0+2 Y.j+h+g+h+g+g+g+++    ",
+"  i j.0.~.{.~.[._.i.%.w n.<./.[./.).9.j.1 8.j./.[./.{.[.f.9.    ",
+"  b 0.v.s.u.u.p.q.j. at .k i.v.y.p.u.s.y.e.( {.e.y.p.s.u.n.v.[.    ",
+"    6 o n n f n i b / : 5 5 9 0 0 5 5 | _ 3 i f o n f n i !     ",
+"            p K.V.X. at +Z.X.X.I.b -.U.Z.X.X.Z.V. +[.              ",
+"            v %+-+Z.>+=+-+)+%+v v.;+P.-+-+,+-+>+F.              ",
+"            L ,+H.r.,+(+/+/+!+v o.<+5.]+/+<+,+/+O.              ",
+"            L ~+K.D.<+<+<+<+(+z u./+s.(+/+<+|+/+V.              ",
+"            L 2+2+2+2+7+2+2+|+A J.4+4+2+3+7+3+4+Y.              ",
+"            F 7+7+7+2+7+7+7+4+A K.6+7+6+4+7+6+6+%+              ",
+"            B 6+6+6+9+6+6+6+9+y O.9+6+9+9+6+9+9+>+              ",
+"            E 9+g+e+g+h+g+e+0+y u.g+e+e+h+e+e+f+Y.              ",
+"            D p.~.'.>.>.>.~.p.x 6.d.'.'.>.'.'.4.f.              ",
+"            i 0.p.p.n.p.v.l.b.b ..i.y.n.v.v.n.m.{.              ",
+"              ! ! ! ! ! ' ! !     ! ! ! ' ' ! !                 "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kturtle.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kturtle.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kturtle.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,61 @@
+.\"                                      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 KTURTLE 1 "March 16, 2005"
+.\" 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
+kturtle \- an educational Logo programming environment
+.SH SYNOPSIS
+.B kturtle
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKTurtle\fP is an educational programming environment using the Logo
+programming language.  It tries to make programming as easy and
+accessible as possible.  This makes KTurtle suitable for teaching kids
+the basics of mathematics, geometry and programming.
+.PP
+The commands used to program are in the style of the Logo programming
+language.  The unique feature of Logo is that the commands are often
+translated into the speaking language of the programmer.
+.PP
+KTurtle is named after "the turtle" that plays a central role in the
+programming environment.  The user programs the turtle, using the Logo
+commands, to draw a picture on the canvas.
+.PP
+Note that this version of Logo is only focused on the educational
+qualities of the programming language and will not try to suit
+professional programmers' needs.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkturtle \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kturtle/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kturtle/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kturtle/\fP.
+.SH AUTHOR
+KTurtle was written by Cies Breijs <cies # kde.nl>,
+Walter Schreppers <Walter.Schreppers # ua.ac.be> and
+Anne-Marie Mahfouf <annemarie.mahfouf # free.fr>.
+.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/kdeedu/debian/kturtle.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kturtle.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kturtle.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KTurtle for Debian
+------------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 16 Oct 2004 15:32:36 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kturtle.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kturtle.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kturtle.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+usr/bin/kturtle
+usr/share/applications/kde/kturtle.desktop
+usr/share/apps/katepart/syntax/logohighlightstyle*
+usr/share/apps/kturtle
+usr/share/config.kcfg/kturtle.kcfg
+usr/share/doc/kde/HTML/en/kturtle/*.bz2
+usr/share/doc/kde/HTML/en/kturtle/*.docbook
+usr/share/doc/kde/HTML/en/kturtle/*.png
+usr/share/doc/kde/HTML/en/kturtle/common
+usr/share/icons/hicolor/16x16/apps/kturtle.png
+usr/share/icons/hicolor/32x32/apps/kturtle.png
+
+../kturtle.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kturtle.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kturtle.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kturtle.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(kturtle):needs="X11"\
+  section="Apps/Education"\
+  hints="KDE"\
+  title="KTurtle"\
+  longtitle="KTurtle (Logo Programming Environment)"\
+  command="/usr/bin/kturtle"\
+  icon="/usr/share/pixmaps/kturtle.xpm"

Added: people/jriddell/KDE/3.5/kdeedu/debian/kturtle.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kturtle.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kturtle.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,261 @@
+/* XPM */
+static char * kturtle_xpm[] = {
+"32 32 226 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #000200",
+"@ 	c #000300",
+"# 	c #000400",
+"$ 	c #000500",
+"% 	c #000600",
+"& 	c #010600",
+"* 	c #000700",
+"= 	c #010700",
+"- 	c #010801",
+"; 	c #020800",
+"> 	c #020900",
+", 	c #010A00",
+"' 	c #030900",
+") 	c #030A00",
+"! 	c #020B00",
+"~ 	c #020B02",
+"{ 	c #020D00",
+"] 	c #030D01",
+"^ 	c #040D02",
+"/ 	c #030E01",
+"( 	c #040E02",
+"_ 	c #021002",
+": 	c #040F02",
+"< 	c #041002",
+"[ 	c #031103",
+"} 	c #051202",
+"| 	c #061403",
+"1 	c #061404",
+"2 	c #051505",
+"3 	c #051602",
+"4 	c #051605",
+"5 	c #071704",
+"6 	c #071A05",
+"7 	c #071C05",
+"8 	c #081C06",
+"9 	c #091D06",
+"0 	c #0A1E06",
+"a 	c #0B2408",
+"b 	c #0D240A",
+"c 	c #459E35",
+"d 	c #47A037",
+"e 	c #48A138",
+"f 	c #49A239",
+"g 	c #49A23A",
+"h 	c #4BA33B",
+"i 	c #4BA43C",
+"j 	c #4EA63E",
+"k 	c #4FA63E",
+"l 	c #51A841",
+"m 	c #51A941",
+"n 	c #54AA43",
+"o 	c #57AE47",
+"p 	c #59AE48",
+"q 	c #5AAF48",
+"r 	c #59B049",
+"s 	c #5AB049",
+"t 	c #5BB04A",
+"u 	c #5BB14A",
+"v 	c #5CB14B",
+"w 	c #5CB24B",
+"x 	c #5CB24C",
+"y 	c #5DB24D",
+"z 	c #5EB34D",
+"A 	c #5EB34E",
+"B 	c #5FB44E",
+"C 	c #5FB44F",
+"D 	c #60B44F",
+"E 	c #60B54F",
+"F 	c #61B54F",
+"G 	c #60B650",
+"H 	c #61B650",
+"I 	c #62B650",
+"J 	c #62B651",
+"K 	c #62B751",
+"L 	c #62B752",
+"M 	c #63B752",
+"N 	c #63B852",
+"O 	c #63B853",
+"P 	c #64B853",
+"Q 	c #65B853",
+"R 	c #64B953",
+"S 	c #65B954",
+"T 	c #65BA54",
+"U 	c #66BA54",
+"V 	c #66BA55",
+"W 	c #67BA56",
+"X 	c #66BB55",
+"Y 	c #67BB55",
+"Z 	c #67BB56",
+"` 	c #68BB56",
+" .	c #67BC56",
+"..	c #68BC56",
+"+.	c #68BC57",
+"@.	c #69BC57",
+"#.	c #68BD58",
+"$.	c #69BD58",
+"%.	c #6ABD58",
+"&.	c #6ABD59",
+"*.	c #6ABE59",
+"=.	c #6BBE59",
+"-.	c #6BBE5A",
+";.	c #6CBE5A",
+">.	c #6CBE5B",
+",.	c #6BBF5A",
+"'.	c #6CBF5A",
+").	c #6CBF5B",
+"!.	c #6DBF5B",
+"~.	c #6DC05B",
+"{.	c #6DC05C",
+"].	c #6EC05C",
+"^.	c #6EC15C",
+"/.	c #6FC15C",
+"(.	c #6FC15D",
+"_.	c #6FC15E",
+":.	c #6FC25D",
+"<.	c #6FC25E",
+"[.	c #70C25E",
+"}.	c #70C35F",
+"|.	c #71C35E",
+"1.	c #71C35F",
+"2.	c #71C460",
+"3.	c #72C460",
+"4.	c #72C461",
+"5.	c #73C460",
+"6.	c #73C461",
+"7.	c #72C560",
+"8.	c #73C561",
+"9.	c #73C562",
+"0.	c #74C561",
+"a.	c #74C562",
+"b.	c #73C662",
+"c.	c #74C662",
+"d.	c #74C663",
+"e.	c #75C662",
+"f.	c #75C663",
+"g.	c #75C764",
+"h.	c #76C764",
+"i.	c #77C864",
+"j.	c #77C865",
+"k.	c #77C866",
+"l.	c #78C866",
+"m.	c #77C966",
+"n.	c #78C966",
+"o.	c #79C967",
+"p.	c #78CA66",
+"q.	c #79CA67",
+"r.	c #7ACA67",
+"s.	c #7ACA68",
+"t.	c #7ACB68",
+"u.	c #7BCB68",
+"v.	c #7BCB69",
+"w.	c #7BCC68",
+"x.	c #7BCC69",
+"y.	c #7BCC6A",
+"z.	c #7DCC6A",
+"A.	c #7CCD6A",
+"B.	c #7DCD6A",
+"C.	c #7DCD6B",
+"D.	c #7DCE6B",
+"E.	c #7ECE6B",
+"F.	c #7ECF6C",
+"G.	c #7FCF6B",
+"H.	c #7FCF6C",
+"I.	c #7FCF6D",
+"J.	c #80CF6D",
+"K.	c #80D06E",
+"L.	c #81D06E",
+"M.	c #81D16E",
+"N.	c #81D16F",
+"O.	c #82D16F",
+"P.	c #83D170",
+"Q.	c #82D270",
+"R.	c #83D270",
+"S.	c #83D271",
+"T.	c #84D271",
+"U.	c #83D371",
+"V.	c #84D371",
+"W.	c #84D372",
+"X.	c #84D471",
+"Y.	c #85D472",
+"Z.	c #86D473",
+"`.	c #85D573",
+" +	c #86D573",
+".+	c #86D574",
+"++	c #87D674",
+"@+	c #88D674",
+"#+	c #88D675",
+"$+	c #89D675",
+"%+	c #89D776",
+"&+	c #8AD876",
+"*+	c #8AD877",
+"=+	c #8BD978",
+"-+	c #8BD979",
+";+	c #8CDA79",
+">+	c #8DDA79",
+",+	c #8DDA7A",
+"'+	c #8EDB7A",
+")+	c #8EDB7B",
+"!+	c #8FDC7B",
+"~+	c #90DD7C",
+"{+	c #90DD7D",
+"]+	c #91DD7D",
+"^+	c #91DE7E",
+"/+	c #92DE7F",
+"(+	c #92DF7F",
+"_+	c #93DF7F",
+":+	c #92E07F",
+"<+	c #94E080",
+"[+	c #94E081",
+"}+	c #95E181",
+"|+	c #95E182",
+"1+	c #96E281",
+"2+	c #96E282",
+"3+	c #97E283",
+"4+	c #97E382",
+"5+	c #97E383",
+"6+	c #97E384",
+"7+	c #98E484",
+"8+	c #99E585",
+"9+	c #99E586",
+"0+	c #9AE586",
+"a+	c #9AE686",
+"b+	c #9BE787",
+"c+	c #9CE788",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                            . . . .                             ",
+"                          . b+9+5+}+.                           ",
+"                        . . 8+3+}+:+. .                         ",
+"                      . a+7+4+[+(+~+'+;+.                       ",
+"                      . 7+2+<+^+!+,+=+%+.                       ",
+"                      . }+_+]+!+>+*+#+Z..                       ",
+"            . . . .   . /+{+)+-+&+ at +`.S..   . . . .             ",
+"          . c+0+7+|+. . . . =+%+++Y.. . @ ' t.n.h.a..           ",
+"          . 9+6+1+_+$ + + . %+.+W.P.. + ! 2 k.f.8.1..           ",
+"            . # (+]+~ % &+#+ +U.N.I.C.w.^ 8 d.6.5 .             ",
+"              ) ~+)+] & #+Y.R.L.F.B.t.p.] 6 2.[.b               ",
+"                _ ( $+.+X.P.J.E.y.t.m.g.9.2.0 a                 ",
+"                * =  +T.O.J.C.v.q.j.f.4.}././ }                 ",
+"              . ++Y.V.M.H.z.t.n.i.e.3.[.].;.%.` .               ",
+"              . W.Q.K.G.A.t.l.h.b.3._.~.=.$.Z S .               ",
+"              . O.J.D.x.r.j.f.6.1.(.!.*.+.V P J .               ",
+"              . H.C.u.o.i.f.5.}.].>.%. .T N H B .               ",
+"              . z.t.n.h.c.2.<.{.,. at .Y R K G A w .               ",
+"              . s.n.g.0.1.(.!.*. at .Y Q K E z v r .               ",
+"                } / 7.|.^.).&...U O I C y u , {                 ",
+"                a 0 }.{.-.$.Z U M H B x t p 1 3                 ",
+"              b 1.:.7 ] #.X S L F A x s - [ n m |               ",
+"            . 5 (.!.9 < V P J D z u q o > : l k ~ .             ",
+"          . [.].'.$.4   . . . . . . . .   ; j i g e .           ",
+"          . ].-. at .W .                     . h f d c .           ",
+"            . . . .                         . . . .             ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kverbos.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kverbos.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kverbos.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,54 @@
+.\"                                      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 KVERBOS 1 "October 16, 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
+kverbos \- a Spanish verb form study application for KDE
+.SH SYNOPSIS
+.B kverbos
+.RI "[ " generic-options " ] [ " file " ]"
+.SH DESCRIPTION
+\fBKverbos\fP allows the user to learn the forms of Spanish verbs.  The program
+suggests a verb and a time and the user enters the different verb forms.
+The program corrects the user input and gives feedback.
+.PP
+The user can edit the list of the verbs that can be studied.  The program
+can build regular verb forms by itself.  Irregular verb forms have to be
+entered by the user.
+.PP
+If a form of a verb is uncertain then the internet offers good sources:
+.br
+http://csgrs6k1.uwaterloo.ca/~dmg/lando/verbos/con-jugador.html
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkverbos \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kverbos/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kverbos/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kverbos/\fP.
+.SH AUTHOR
+Kverbos was written by Arnold Kraschinski <arnold.k67 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/kdeedu/debian/kverbos.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kverbos.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kverbos.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Kverbos for Debian
+------------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kverbos.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kverbos.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kverbos.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+usr/bin/kverbos
+usr/share/applications/kde/kverbos.desktop
+usr/share/apps/kverbos
+usr/share/config.kcfg/kverbos.kcfg
+usr/share/doc/kde/HTML/en/kverbos/*.docbook
+usr/share/doc/kde/HTML/en/kverbos/*.png
+usr/share/doc/kde/HTML/en/kverbos/common
+usr/share/doc/kde/HTML/en/kverbos/index.cache.bz2
+usr/share/icons/crystalsvg/16x16/actions/kverbosuser.png
+usr/share/icons/hicolor/128x128/apps/kverbos.png
+usr/share/icons/hicolor/16x16/apps/kverbos.png
+usr/share/icons/hicolor/22x22/apps/kverbos.png
+usr/share/icons/hicolor/32x32/apps/kverbos.png
+usr/share/icons/hicolor/48x48/apps/kverbos.png
+usr/share/icons/hicolor/scalable/apps/kverbos.svgz
+
+../kverbos.xpm usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kverbos.menu
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kverbos.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kverbos.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(kverbos):needs="X11"\
+  section="Apps/Education"\
+  hints="KDE"\
+  title="Kverbos"\
+  longtitle="Kverbos (Study Spanish Verbforms)"\
+  command="/usr/bin/kverbos"\
+  icon="/usr/share/pixmaps/kverbos.xpm"

Added: people/jriddell/KDE/3.5/kdeedu/debian/kverbos.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kverbos.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kverbos.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,233 @@
+/* XPM */
+static char * kverbos_xpm[] = {
+"32 32 198 2",
+"  	c None",
+". 	c #422121",
+"+ 	c #432121",
+"@ 	c #452323",
+"# 	c #492525",
+"$ 	c #4F2626",
+"% 	c #4D2727",
+"& 	c #5A2727",
+"* 	c #562929",
+"= 	c #6E2121",
+"- 	c #712222",
+"; 	c #6B2525",
+"> 	c #752121",
+", 	c #692727",
+"' 	c #732322",
+") 	c #6B2727",
+"! 	c #7F2020",
+"~ 	c #652C2C",
+"{ 	c #762626",
+"] 	c #623030",
+"^ 	c #672E2E",
+"/ 	c #6E2B2B",
+"( 	c #7D2525",
+"_ 	c #6B2D2C",
+": 	c #6C2D2D",
+"< 	c #782828",
+"[ 	c #D60000",
+"} 	c #7E2626",
+"| 	c #693030",
+"1 	c #7D2928",
+"2 	c #E10000",
+"3 	c #912523",
+"4 	c #932523",
+"5 	c #D40A0A",
+"6 	c #ED0000",
+"7 	c #ED0402",
+"8 	c #F80000",
+"9 	c #9F2A21",
+"0 	c #E30F07",
+"a 	c #96302B",
+"b 	c #DB170A",
+"c 	c #FF0707",
+"d 	c #DA1A0B",
+"e 	c #D71F12",
+"f 	c #B03223",
+"g 	c #E31F0D",
+"h 	c #DA2615",
+"i 	c #A63D2A",
+"j 	c #DF2222",
+"k 	c #FF1818",
+"l 	c #D42F15",
+"m 	c #F02510",
+"n 	c #DE2E15",
+"o 	c #CE361A",
+"p 	c #AC413C",
+"q 	c #CF351F",
+"r 	c #E12C25",
+"s 	c #D5361C",
+"t 	c #A5493F",
+"u 	c #FF231D",
+"v 	c #E03418",
+"w 	c #BC4231",
+"x 	c #B7482E",
+"y 	c #B64837",
+"z 	c #FF2929",
+"A 	c #FF2A29",
+"B 	c #BA4C3E",
+"C 	c #FF322D",
+"D 	c #D14A2A",
+"E 	c #CA4C38",
+"F 	c #EB3B3B",
+"G 	c #C44F3F",
+"H 	c #EB4128",
+"I 	c #FF3A3A",
+"J 	c #E6492E",
+"K 	c #CA553D",
+"L 	c #FF3B3A",
+"M 	c #D8503D",
+"N 	c #FC4535",
+"O 	c #FB4A20",
+"P 	c #D15C4D",
+"Q 	c #F74D38",
+"R 	c #DC5A48",
+"S 	c #FF4E30",
+"T 	c #FF4C4C",
+"U 	c #FF4E4D",
+"V 	c #F65353",
+"W 	c #E16743",
+"X 	c #FF5E2D",
+"Y 	c #E46A4C",
+"Z 	c #F66053",
+"` 	c #D27267",
+" .	c #FF5D5D",
+"..	c #F76354",
+"+.	c #FF5F5E",
+"@.	c #FF605F",
+"#.	c #EB6E4B",
+"$.	c #E67062",
+"%.	c #FF7437",
+"&.	c #FF6B6B",
+"*.	c #FF6C6C",
+"=.	c #E57A6C",
+"-.	c #F97264",
+";.	c #FB7166",
+">.	c #FF6E6E",
+",.	c #FF7557",
+"'.	c #FC7D36",
+").	c #FF7170",
+"!.	c #F47D59",
+"~.	c #FF7575",
+"{.	c #FC7B61",
+"].	c #FA7D5D",
+"^.	c #FF7878",
+"/.	c #FF7978",
+"(.	c #F4884B",
+"_.	c #FF8268",
+":.	c #FF7F7F",
+"<.	c #FF8080",
+"[.	c #F98B6B",
+"}.	c #FF8484",
+"|.	c #FA905C",
+"1.	c #F6964D",
+"2.	c #EE9087",
+"3.	c #FF8982",
+"4.	c #FF8A8A",
+"5.	c #FE8F79",
+"6.	c #FF8C8B",
+"7.	c #FC9E44",
+"8.	c #FF9182",
+"9.	c #FF9090",
+"0.	c #FF9963",
+"a.	c #FF9C53",
+"b.	c #FF986F",
+"c.	c #FF9A68",
+"d.	c #FE987B",
+"e.	c #FF9494",
+"f.	c #F8A747",
+"g.	c #F79A91",
+"h.	c #FE9984",
+"i.	c #FAA747",
+"j.	c #FF9F67",
+"k.	c #FF9796",
+"l.	c #FFA262",
+"m.	c #FE9995",
+"n.	c #F8AC4B",
+"o.	c #FFA36E",
+"p.	c #FB9E97",
+"q.	c #FEA479",
+"r.	c #F6B154",
+"s.	c #FFA67A",
+"t.	c #FFA87A",
+"u.	c #FFA29C",
+"v.	c #FDB24C",
+"w.	c #FFA696",
+"x.	c #FFAB8C",
+"y.	c #FFAE7E",
+"z.	c #FFAD9B",
+"A.	c #FFBE51",
+"B.	c #F3C64F",
+"C.	c #FFBC65",
+"D.	c #FDBF5C",
+"E.	c #FFC153",
+"F.	c #FFC352",
+"G.	c #FFC454",
+"H.	c #FFB98F",
+"I.	c #FCC951",
+"J.	c #FFC756",
+"K.	c #FFCB5D",
+"L.	c #FFCF59",
+"M.	c #FFCE64",
+"N.	c #FFD357",
+"O.	c #FFCF77",
+"P.	c #FFD26C",
+"Q.	c #FFC8AB",
+"R.	c #FFCDA4",
+"S.	c #FFDC5C",
+"T.	c #FFD77B",
+"U.	c #FFD87B",
+"V.	c #FFD97F",
+"W.	c #FFD3AA",
+"X.	c #FFE35D",
+"Y.	c #FEE360",
+"Z.	c #FFE362",
+"`.	c #FFDE8B",
+" +	c #FFE860",
+".+	c #FFE49A",
+"++	c #FFE49B",
+"@+	c #FFF362",
+"#+	c #FFE7A7",
+"$+	c #FFE8A8",
+"%+	c #FFEAA9",
+"&+	c #FFEACA",
+"*+	c #FFEFB6",
+"=+	c #FFF0B8",
+"-+	c #FFF6C7",
+";+	c #FFF7CF",
+">+	c #FFFAD1",
+",+	c #FFFCD6",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                        ^ < t B E K 3 }         ",
+"                                ] 1 ` 2.p.6.<.~.&.*./.5.!.,     ",
+"  | (                     / 4 R -.).:.9.e.4.<.~.&.*.^.}.h.;     ",
+"  : ].#.x ' ~ ) > ! 9 q H N L T  .>.:.9.e.4.<.~.&.*.^.}.h.;     ",
+"  : {.V F r e d g 7 8 c k z I T  .>.:.9.e.4.<.~.&.*.^.}.h.;     ",
+"  : {.V F j 5 [ 2 6 8 c k z I T  .>.:.9.k.w.x.s.j.l.b.3.h.;     ",
+"  : {.V F j 5 [ 2 6 8 c k z I T +.8.Q.&+>+*+++V.M.L.S. +D.;     ",
+"  : |.V F j 5 [ 2 6 8 c k C ,.y.#+=+-+,+>+*+++V.M.L.S. +I.;     ",
+"  : B.Y.1.J h b 0 m O %.a.T.`..+%+=+-+,+>+*+++V.M.L.S. +I.;     ",
+"  : B. at +X.N.F.A.E.G.J.K.P.U.`..+%+=+-+,+>+*+++V.M.L.S. +I.;     ",
+"  : B. at +X.N.F.A.E.G.J.K.P.U.`..+%+=+-+,+>+*+++V.M.L.S. +I.;     ",
+"  : B. at +X.N.F.A.E.G.J.K.P.U.`..+%+=+-+,+>+*+++V.M.L.S. +I.;     ",
+"  : B. at +X.N.F.A.E.G.J.K.P.U.`..+%+=+-+,+>+*+++V.M.L.S. +I.;     ",
+"  : B. at +X.N.F.A.E.G.J.K.P.U.`..+%+=+-+,+>+*+++V.M.L.S. +I.;     ",
+"  : B. at +X.N.F.A.E.G.J.K.P.U.`..+%+=+-+,+;+W.H.t.c.0.C.Z.I.;     ",
+"  : B. at +X.N.F.A.E.G.J.K.P.U.`..+$+R.z.u.e.4.<.~.&.*.^.}.q.;     ",
+"  : r. at +X.N.F.A.E.G.J.K.P.O.o._.@.>.:.9.e.4.<.~.&.*.^.}.h.;     ",
+"  : {...(.n.f.i.v.7.'.X S A I T  .>.:.9.e.4.<.~.&.*.^.}.h.;     ",
+"  : {.V F j 5 [ 2 6 8 c k z I T  .>.:.9.e.4.<.~.&.*.^.}.h.;     ",
+"  : {.V F j 5 [ 2 6 8 c k z I T  .>.:.m.g.=.P G y w Y [.d.;     ",
+"  : {.V F j 5 [ 2 6 8 c k z I U ;.$.p - $             % { &     ",
+"    W Z F j 5 [ 2 6 8 c u Q M a *                               ",
+"      = i D o l n v s f _ %                                     ",
+"          . @ # % +                                             ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.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 KVOCTRAIN 1 "March 16, 2005"
+.\" 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
+kvoctrain \- a vocabulary trainer for KDE
+.SH SYNOPSIS
+.B kvoctrain
+.RI "[ " generic-options " ] [ " file " ]"
+.SH DESCRIPTION
+\fBKVocTrain\fP is a little utility to help you train your vocabulary when you
+are trying to learn a foreign language.  You can create your own database
+with the words you need.  It is intended as a replacement for index
+(flash) cards.
+.PP
+You probably remember flashcards from school.  The teacher would write the
+original expression on the front side of the card and the translation on
+the back.  Then look at the cards one after another.  If you knew the
+translation, you could put it away.  If you failed, you put it back to
+try again.
+.PP
+KVocTrain is not intended to teach you grammer or other sophisticated
+things. This is and probably will stay beyond the scope of this application.
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fIkvoctrain \-\-help\fP.
+.SH SEE ALSO
+.BR langen2kvtml (1),
+.BR spotlight2kvtml (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kvoctrain/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kvoctrain/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kvoctrain/\fP.
+.SH AUTHOR
+KVocTrain was written by Ewald Arnold <kvoctrain at ewald-arnold.de>
+and Peter Hedlund <peter at peterandlinda.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/kdeedu/debian/kvoctrain.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KVocTrain for Debian
+--------------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,20 @@
+etc/kde3/kvoctrainrc
+usr/bin/kvoctrain
+usr/bin/spotlight2kvtml
+usr/lib/libkvoctraincore.so.0
+usr/lib/libkvoctraincore.so.0.0.0
+usr/share/applications/kde/kvoctrain.desktop
+usr/share/apps/kvoctrain
+usr/share/config.kcfg/kvoctrain.kcfg
+usr/share/config.kcfg/languagesettings.kcfg
+usr/share/config.kcfg/presettings.kcfg
+usr/share/doc/kde/HTML/en/kvoctrain/*.docbook
+usr/share/doc/kde/HTML/en/kvoctrain/*.png
+usr/share/doc/kde/HTML/en/kvoctrain/common
+usr/share/doc/kde/HTML/en/kvoctrain/index.cache.bz2
+usr/share/icons/hicolor/16x16/apps/kvoctrain.png
+usr/share/icons/hicolor/22x22/apps/kvoctrain.png
+usr/share/icons/hicolor/32x32/apps/kvoctrain.png
+usr/share/icons/hicolor/48x48/apps/kvoctrain.png
+
+../kvoctrain.xpm usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kvoctrain.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,268 @@
+/* XPM */
+static char * kvoctrain_xpm[] = {
+"32 32 233 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #0D0C02",
+"@ 	c #0F0F02",
+"# 	c #121102",
+"$ 	c #131203",
+"% 	c #070772",
+"& 	c #080876",
+"* 	c #08087C",
+"= 	c #08087F",
+"- 	c #090984",
+"; 	c #1A1905",
+"> 	c #1D1B05",
+", 	c #1E1C06",
+"' 	c #231D14",
+") 	c #241E15",
+"! 	c #252507",
+"~ 	c #282607",
+"{ 	c #28251A",
+"] 	c #2A2908",
+"^ 	c #282719",
+"/ 	c #2B2907",
+"( 	c #1A1A8D",
+"_ 	c #2E2C09",
+": 	c #2F2E09",
+"< 	c #302F09",
+"[ 	c #31300A",
+"} 	c #3B3726",
+"| 	c #413F11",
+"1 	c #413D27",
+"2 	c #423E28",
+"3 	c #4C4813",
+"4 	c #4F4B13",
+"5 	c #524E11",
+"6 	c #F20000",
+"7 	c #4E4A38",
+"8 	c #515010",
+"9 	c #F60000",
+"0 	c #4E4B38",
+"a 	c #535010",
+"b 	c #4F4D33",
+"c 	c #FE0000",
+"d 	c #FF0000",
+"e 	c #5B5912",
+"f 	c #FF0D0D",
+"g 	c #FF1111",
+"h 	c #635F1D",
+"i 	c #665F40",
+"j 	c #FF1919",
+"k 	c #FF1A1A",
+"l 	c #65623F",
+"m 	c #746D24",
+"n 	c #FF2626",
+"o 	c #78741E",
+"p 	c #7A771E",
+"q 	c #7F724C",
+"r 	c #7E7B20",
+"s 	c #807C27",
+"t 	c #817F5B",
+"u 	c #83815C",
+"v 	c #8E8739",
+"w 	c #88875D",
+"x 	c #938E2C",
+"y 	c #8B895E",
+"z 	c #8D8B60",
+"A 	c #938F3B",
+"B 	c #FF5555",
+"C 	c #99912F",
+"D 	c #918D5D",
+"E 	c #9E972F",
+"F 	c #FF5E5E",
+"G 	c #9F9830",
+"H 	c #959464",
+"I 	c #A39941",
+"J 	c #9A9966",
+"K 	c #9C9A65",
+"L 	c #9E9C6A",
+"M 	c #A69967",
+"N 	c #A9A52F",
+"O 	c #A89F52",
+"P 	c #AAA43A",
+"Q 	c #AEA941",
+"R 	c #FF7777",
+"S 	c #A8A76E",
+"T 	c #A9A76C",
+"U 	c #AFAC45",
+"V 	c #ACAB6E",
+"W 	c #AEAD6D",
+"X 	c #ABAA8B",
+"Y 	c #B7AB66",
+"Z 	c #AFAD73",
+"` 	c #B5AA73",
+" .	c #B9B144",
+"..	c #FF8484",
+"+.	c #DD9393",
+"@.	c #B4B164",
+"#.	c #B4B16A",
+"$.	c #B3B16D",
+"%.	c #FF8888",
+"&.	c #B6B369",
+"*.	c #B5B36D",
+"=.	c #B7B465",
+"-.	c #B5B374",
+";.	c #B9B661",
+">.	c #B2B192",
+",.	c #FF8C8C",
+"'.	c #B8B673",
+").	c #B8B489",
+"!.	c #B5B492",
+"~.	c #C0BD4A",
+"{.	c #C3BC48",
+"].	c #BBB977",
+"^.	c #B8B693",
+"/.	c #BDBB75",
+"(.	c #BEBC78",
+"_.	c #BEB990",
+":.	c #C5C06A",
+"<.	c #C2C078",
+"[.	c #C5C26B",
+"}.	c #C4C174",
+"|.	c #C4C177",
+"1.	c #C3C17A",
+"2.	c #C5C270",
+"3.	c #C3C17C",
+"4.	c #C3C17F",
+"5.	c #C5C277",
+"6.	c #C3C182",
+"7.	c #C7C468",
+"8.	c #C4BF8C",
+"9.	c #C3C185",
+"0.	c #F6A4A4",
+"a.	c #CBC46F",
+"b.	c #C5C387",
+"c.	c #C7C59D",
+"d.	c #D3CC5A",
+"e.	c #FEA9A9",
+"f.	c #FFAAAA",
+"g.	c #CFCC79",
+"h.	c #CFCD91",
+"i.	c #D9D267",
+"j.	c #D3D181",
+"k.	c #D5D281",
+"l.	c #DBD872",
+"m.	c #E1D870",
+"n.	c #DBD883",
+"o.	c #D9D49F",
+"p.	c #DCD985",
+"q.	c #DEDB75",
+"r.	c #DEDB77",
+"s.	c #DDDA80",
+"t.	c #DDDA82",
+"u.	c #DFDC72",
+"v.	c #E3DD62",
+"w.	c #E2DC6C",
+"x.	c #DEDB7D",
+"y.	c #DCDA89",
+"z.	c #DCDA8B",
+"A.	c #FFBFBF",
+"B.	c #DCDA8F",
+"C.	c #DCDA91",
+"D.	c #D9D7AB",
+"E.	c #DDDB94",
+"F.	c #E8DA7D",
+"G.	c #E3DA8C",
+"H.	c #E3E081",
+"I.	c #E3DF93",
+"J.	c #E3E19A",
+"K.	c #E3E1A0",
+"L.	c #EBE48F",
+"M.	c #E3E2B7",
+"N.	c #ECE78B",
+"O.	c #E6E4B5",
+"P.	c #ECE98D",
+"Q.	c #E7E5B4",
+"R.	c #F3EE79",
+"S.	c #F1ED84",
+"T.	c #FFFF00",
+"U.	c #EEECA2",
+"V.	c #ECEAB6",
+"W.	c #F2EF98",
+"X.	c #EEECB5",
+"Y.	c #F4F18E",
+"Z.	c #F6F381",
+"`.	c #F5F28B",
+" +	c #F7F47C",
+".+	c #F6F095",
+"++	c #F6F388",
+"@+	c #F6F38B",
+"#+	c #F9F57B",
+"$+	c #F7F488",
+"%+	c #F5F39B",
+"&+	c #F6EFB7",
+"*+	c #F6F49E",
+"=+	c #F7F5A0",
+"-+	c #F9F69E",
+";+	c #F7F5AF",
+">+	c #FEFB7D",
+",+	c #FEFB82",
+"'+	c #F9F6AB",
+")+	c #FDFA8C",
+"!+	c #FEFB88",
+"~+	c #FEFB8A",
+"{+	c #FFFC86",
+"]+	c #FBF9A4",
+"^+	c #F8F5C4",
+"/+	c #FBF9AC",
+"(+	c #FEFC9F",
+"_+	c #FEFCA0",
+":+	c #FBF9BA",
+"<+	c #FBF9BC",
+"[+	c #FBF9BE",
+"}+	c #FEFCA7",
+"|+	c #FFFDA1",
+"1+	c #FFFDA2",
+"2+	c #FCFABB",
+"3+	c #FFFDA6",
+"4+	c #FEFCAF",
+"5+	c #FFFDA7",
+"6+	c #FFFDA8",
+"7+	c #FEFCB5",
+"8+	c #FFFDAD",
+"9+	c #FFFDAF",
+"0+	c #FFFDB0",
+"a+	c #FFFDB3",
+"b+	c #FFFDB5",
+"c+	c #FFFDB6",
+"d+	c #FFFDB8",
+"e+	c #FFFDBA",
+"f+	c #FFFDBC",
+"g+	c #F8F8F8",
+"h+	c #FBFBFB",
+"i+	c #FEFEFE",
+"j+	c #FFFFFF",
+"                                                                ",
+"                          .                                     ",
+"                        { ` 0 ^                                 ",
+"                        7 &+^+_.l .                             ",
+"      . . . . . . . . . . . . . . . . . 1 '                     ",
+"      . . . . . . . . . . . . . . . . . o.).D q . .             ",
+"      . . . . . . . . . . . . . . . . . c.V.2+d+'+I.M b 2 )     ",
+"      . d d d d d d d d d d d d d d d . ^.Q.<+e+a+8+3+-+G.v .   ",
+"      . d d d d d d d d d d d d d d d . !.O.[+f+b+9+5+|+.+Q .   ",
+"      . d d d d d 9 6 6 6 6 6 6 6 6 6 . X D.X.:+c+0+6+1+S.N .   ",
+"      . T.T.T.T.T.. . . . . . . . . . . . . . . 7+4+6+1+l.[     ",
+"      . T.T.T.T.T.. d d ( - - f.d f.- - - d d . ;+/+}+1+a._     ",
+"      . T.T.T.T.T.. j+j+d d - f.d f.- d d j+j+. K.U.]+_+{.:     ",
+"      . . . . . . . - - j+j+d f.d f.d j+j+- - . h.J.=+(+r $     ",
+"              i >.. d d d d d d d d d d d d d . b.E.*+L.e .     ",
+"            } 8.M.. d d d d d d d d d d d d d . 9.C.%+w.e .     ",
+"  . . . . . . . . . . . . . . . . e.i+c c - - . 6.B.W.U .       ",
+"  . d d d d d d d d d d d d d d . 0.= g+h+c d . 4.z.N.P .       ",
+"  . d d d k %.A.A.g d d d d d d . +.% & * h+i+. 3.y.q.o .       ",
+"  . d d d j+j+,.,...n d d d d d . . . . . . . . 1.p.:.<         ",
+"  . d d %.j+R d d g g F F d d d . t u z L Z -.'.5.t. ./         ",
+"  . d d f.j+B d d d d f.f.d d d . w y H S ].<.|.g.H.p #         ",
+"  . d d %.j+R d d g g f f d d d . J K T (.j.n.t.H.i.a .         ",
+"  . d d d j+j+,.,...n d d d d d . V W /.k.P.Y. at +$+~.>           ",
+"  . d d d j %.A.A.g d d d d d d . $.*.}.s.`.)+~+R.E .           ",
+"  . d d d d d d d d d d d d d d . #.&.2.x.++!+{+d.4 .           ",
+"  . . . . . . . . . . . . . . . . @.=.[.r.Z.,+#+x ,             ",
+"                    . . + ! | s A O ;.7.u. +>+v.5 .             ",
+"                            . . ; 8 h I Y m.F.G .               ",
+"                                  . @ ] ~ m C 3 .               ",
+"                                          . . .                 ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 KWORDQUIZ 1 "March 16, 2005"
+.\" 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
+kwordquiz \- a flashcard and vocabulary learning program for KDE
+.SH SYNOPSIS
+.B kwordquiz
+.RI "[ " generic-options " ]"
+.PP
+.B kwordquiz
+.RI "[ " generic-options " ]"
+[ \fB\-m, \-\-mode\fP \fInumber\fP ]
+[ \fB\-g, \-\-goto\fP \fIsession\fP ]
+.I file
+.SH DESCRIPTION
+\fBKWordQuiz\fP is a flashcard-based tool that helps you to master new
+vocabularies.  It may be a language or any other kind of terminology.
+.PP
+KWordQuiz can open several types of vocabulary data.  Supported
+are \fI.kvtml\fP files used by other KDE programs such as KVocTrain,
+\fI.wql\fP files used by WordQuiz for Windows, \fI.csv\fP files with
+comma-separated text, and \fI.xml.gz\fP
+files created by Pauker (\fIhttp://pauker.sourceforge.net/\fP).
+.PP
+This application is part of the official KDE edutainment module.
+.SH OPTIONS
+Below are the kwordquiz-specific options.
+For a full summary of options, run \fIkwordquiz \-\-help\fP.
+.PP
+.TP
+\fB\-m, \-\-mode\fP \fInumber\fP
+Specify the order and direction in which questions are asked.
+The \fInumber\fP argument must be 1, 2, 3, 4 or 5 (corresponding to the
+five entries in the Mode menu).
+.TP
+\fB\-g, \-\-goto\fP \fIsession\fP
+Begin a quiz immediately.  The \fIsession\fP argument may be
+\fBflash\fP (for a flashcard quiz), \fBmc\fP (for a multiple choice
+quiz) or \fBqa\fP (for a question and answer quiz).
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kwordquiz/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kwordquiz/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kwordquiz/\fP.
+.SH AUTHOR
+KWordQuiz was written by Peter Hedlund <peter at peterandlinda.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/kdeedu/debian/kwordquiz.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KWordQuiz for Debian
+--------------------
+
+This application 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 kdeedu-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 16 Oct 2004 15:32:36 +1000

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,24 @@
+etc/kde3/kwordquizrc
+usr/bin/kwordquiz
+usr/share/applnk/Edutainment/Miscellaneous/kwordquiz.desktop
+usr/share/apps/kwordquiz
+usr/share/config.kcfg/kwordquiz.kcfg
+usr/share/doc/kde/HTML/en/kwordquiz/*.bz2
+usr/share/doc/kde/HTML/en/kwordquiz/*.docbook
+usr/share/doc/kde/HTML/en/kwordquiz/*.png
+usr/share/doc/kde/HTML/en/kwordquiz/common
+usr/share/icons/crystalsvg/128x128/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/16x16/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/22x22/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/32x32/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/48x48/mimetypes/kwordquiz_doc.png
+usr/share/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
+usr/share/icons/hicolor/128x128/apps/kwordquiz.png
+usr/share/icons/hicolor/16x16/apps/kwordquiz.png
+usr/share/icons/hicolor/22x22/apps/kwordquiz.png
+usr/share/icons/hicolor/32x32/apps/kwordquiz.png
+usr/share/icons/hicolor/48x48/apps/kwordquiz.png
+usr/share/icons/hicolor/scalable/apps/kwordquiz.svg
+usr/share/mimelnk/application/x-kwordquiz.desktop
+
+../kwordquiz.xpm usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/kwordquiz.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * kwordquiz_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #191C1E",
+"+ 	c #191D1F",
+"@ 	c #1600FF",
+"# 	c #473916",
+"$ 	c #FF0000",
+"% 	c #5866A8",
+"& 	c #7F6D8C",
+"* 	c #7071AB",
+"= 	c #6A78B5",
+"- 	c #6A7CB2",
+"; 	c #717AB2",
+"> 	c #B27B00",
+", 	c #727BB3",
+"' 	c #6D7FB5",
+") 	c #747DB5",
+"! 	c #B28001",
+"~ 	c #797EB1",
+"{ 	c #B38103",
+"] 	c #757FB7",
+"^ 	c #B08304",
+"/ 	c #B18012",
+"( 	c #95815A",
+"_ 	c #957F65",
+": 	c #B58307",
+"< 	c #C27921",
+"[ 	c #B18516",
+"} 	c #A38448",
+"| 	c #B5870C",
+"1 	c #A88636",
+"2 	c #BA8700",
+"3 	c #7A86B8",
+"4 	c #B78B1E",
+"5 	c #B38C27",
+"6 	c #B08C35",
+"7 	c #BF8728",
+"8 	c #B48D28",
+"9 	c #848CB9",
+"0 	c #BC8E16",
+"a 	c #B18E3E",
+"b 	c #C4901D",
+"c 	c #C78D26",
+"d 	c #A49566",
+"e 	c #8E92BA",
+"f 	c #BD9631",
+"g 	c #BF9729",
+"h 	c #9194BC",
+"i 	c #CA9909",
+"j 	c #9295BD",
+"k 	c #B89940",
+"l 	c #B49853",
+"m 	c #C1992B",
+"n 	c #C39A23",
+"o 	c #CC8C59",
+"p 	c #BB9B3B",
+"q 	c #9397BF",
+"r 	c #CA8F54",
+"s 	c #D39B00",
+"t 	c #CD9C10",
+"u 	c #C59C26",
+"v 	c #9598C0",
+"w 	c #B99C50",
+"x 	c #CC9C1E",
+"y 	c #C19B44",
+"z 	c #BB9D4B",
+"A 	c #CF9E14",
+"B 	c #C99F1F",
+"C 	c #C89E28",
+"D 	c #BD9E4C",
+"E 	c #C69E39",
+"F 	c #BFA04E",
+"G 	c #C9A033",
+"H 	c #C69F41",
+"I 	c #8CA4CF",
+"J 	c #CCA22D",
+"K 	c #C1A250",
+"L 	c #CDA32E",
+"M 	c #C3A34A",
+"N 	c #91A5CA",
+"O 	c #BFA25D",
+"P 	c #B8A469",
+"Q 	c #98A3CA",
+"R 	c #93A6CB",
+"S 	c #99A4CB",
+"T 	c #D0A530",
+"U 	c #BAA66B",
+"V 	c #9DA4C5",
+"W 	c #9AA5CC",
+"X 	c #CEA929",
+"Y 	c #B5A77C",
+"Z 	c #CFAA2A",
+"` 	c #9FA6C8",
+" .	c #BBA873",
+"..	c #A0A7C9",
+"+.	c #D2AC2C",
+"@.	c #D1AC35",
+"#.	c #99ACD2",
+"$.	c #BFAB70",
+"%.	c #A2A9CA",
+"&.	c #D4AE2F",
+"*.	c #A3AACC",
+"=.	c #9EADCD",
+"-.	c #EAAD00",
+";.	c #A4ABCD",
+">.	c #9FAECE",
+",.	c #BEAE7E",
+"'.	c #A0AFCF",
+").	c #E8B100",
+"!.	c #E3AE1F",
+"~.	c #A9ACC8",
+"{.	c #BCAF8A",
+"].	c #ABABCE",
+"^.	c #BAAF90",
+"/.	c #E6B013",
+"(.	c #A1B0D0",
+"_.	c #AAADC9",
+":.	c #C4B074",
+"<.	c #CAAF75",
+"[.	c #DAB335",
+"}.	c #A3B2D2",
+"|.	c #A8B0D1",
+"1.	c #E2B323",
+"2.	c #BCB292",
+"3.	c #B1ADCB",
+"4.	c #DBB436",
+"5.	c #E5B518",
+"6.	c #A4B3D4",
+"7.	c #B2AECC",
+"8.	c #AEB1CD",
+"9.	c #EDB60A",
+"0.	c #A9B4CF",
+"a.	c #E5B626",
+"b.	c #F5B700",
+"c.	c #C3B691",
+"d.	c #BFB69C",
+"e.	c #B3B9AF",
+"f.	c #F0B911",
+"g.	c #B4BAB0",
+"h.	c #B5BBB1",
+"i.	c #BABBA5",
+"j.	c #E5BC2B",
+"k.	c #EBBB21",
+"l.	c #C2B99F",
+"m.	c #BBBAB1",
+"n.	c #E6BD2C",
+"o.	c #FABB02",
+"p.	c #C1BAA6",
+"q.	c #E5BD36",
+"r.	c #E7BE2D",
+"s.	c #F7BE03",
+"t.	c #EEBD24",
+"u.	c #E7BE37",
+"v.	c #B3BFCD",
+"w.	c #FFBF00",
+"x.	c #FAC00A",
+"y.	c #FFC000",
+"z.	c #F3C11C",
+"A.	c #FDC200",
+"B.	c #F4C21E",
+"C.	c #FEC300",
+"D.	c #E7C43B",
+"E.	c #E6C444",
+"F.	c #FFC400",
+"G.	c #BAC2CA",
+"H.	c #FFC600",
+"I.	c #C6C2B4",
+"J.	c #F8C523",
+"K.	c #C2C4C1",
+"L.	c #EBC840",
+"M.	c #C3C7B7",
+"N.	c #F4C830",
+"O.	c #FFC719",
+"P.	c #FCC918",
+"Q.	c #F3C83A",
+"R.	c #BFC7D0",
+"S.	c #BACAD1",
+"T.	c #F0CB3A",
+"U.	c #FECA1A",
+"V.	c #EFCB43",
+"W.	c #BBCBD2",
+"X.	c #F8CC28",
+"Y.	c #FFCB1C",
+"Z.	c #BCCCD3",
+"`.	c #B3CEE6",
+" +	c #FACD2A",
+".+	c #FFCD20",
+"++	c #B4CFE7",
+"@+	c #FBCE2B",
+"#+	c #B5D0E8",
+"$+	c #FED021",
+"%+	c #CACCC9",
+"&+	c #FDD02E",
+"*+	c #BBCFE8",
+"=+	c #BAD1E3",
+"-+	c #B6D2E9",
+";+	c #CBCECA",
+">+	c #FED12F",
+",+	c #BCD0E9",
+"'+	c #BDD1EA",
+")+	c #FFD231",
+"!+	c #BCD3E5",
+"~+	c #F8D343",
+"{+	c #C8D0D8",
+"]+	c #FFD332",
+"^+	c #BFD2EC",
+"/+	c #C2D2E6",
+"(+	c #FDD633",
+"_+	c #BDD5E7",
+":+	c #C6D2E0",
+"<+	c #C3D3E7",
+"[+	c #FDD63D",
+"}+	c #C4D4E8",
+"|+	c #FED73E",
+"1+	c #C5D5E9",
+"2+	c #FFD83F",
+"3+	c #C7D6EA",
+"4+	c #C8D7EB",
+"5+	c #C9D8EC",
+"6+	c #FFDB4B",
+"7+	c #D5D7D4",
+"8+	c #D1D4F1",
+"9+	c #FDDD4B",
+"0+	c #FFDC4C",
+"a+	c #CDD9E7",
+"b+	c #FCDE54",
+"c+	c #CEDAE8",
+"d+	c #FEDF4D",
+"e+	c #CFDBEA",
+"f+	c #E8D3D6",
+"g+	c #D4DCE5",
+"h+	c #D0DDEB",
+"i+	c #D8DDE0",
+"j+	c #D2DEEC",
+"k+	c #D3DFED",
+"l+	c #D4E0EE",
+"m+	c #D5E1EF",
+"n+	c #DFE1DE",
+"o+	c #D9E2EA",
+"p+	c #DAE3EB",
+"q+	c #DBE4EC",
+"r+	c #DDE5EE",
+"s+	c #DEE6EF",
+"t+	c #DFE7F0",
+"u+	c #E0E9F1",
+"v+	c #E4E9EC",
+"w+	c #E1EAF2",
+"x+	c #E5EAED",
+"y+	c #E2EBF3",
+"z+	c #E6ECEE",
+"A+	c #E7EDEF",
+"B+	c #E9EEF0",
+"C+	c #EAEFF2",
+"D+	c #EBF0F3",
+"E+	c #ECF1F4",
+"F+	c #F0F2EF",
+"G+	c #F1F3F0",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                      > : 2 {                   ",
+"                                ! s ).s.F.P.U.z.5.t !           ",
+"  * v v v v v v j j j j h e 1 x o.w.x.O.O.O.O.Y.J.)+X.n } 9     ",
+"  8.G+F+F+F+C+C+D+B+B+A+A+D b.w.x.O.w.O.x.O.O.J.$+)+J.[+n.$.3   ",
+"  7.F+D+D+F+F+F+x+C+x+t+<./.O.F.o.w.o.A E M H G J.)+J.2+[+[._   ",
+"  7.E+F+D+x+x+x+C+x+C+n+x Y.O.w.w./.y i+t+m+q+g+O a.)+)+[+[+5   ",
+"  3.C+8+@ @ @ @ @ @ @ & /.O.P.O.b.D o+m+s+m+m+m+m+D N.)+[+[+X   ",
+"  3.C+x+C+A+A+z+z+z+D+a Y.O.O.w.x i+o+r+m+m+o+m+l+I.a.N.[+[+Q.  ",
+"  3.D+x+t+C+t+t+t+y+y+<.!.O.Y.t.D m+m+p+p+l+l+k+l+c.t.)+2+2+~+{ ",
+"  ].C+D+E+t+D+C+C+x+C+y+o c 7 o C+r+p+m+m+l+o+k+k+7 )+|+[+2+u.  ",
+"  3.x+f+$ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ $ < a.)+|+[+6+5   ",
+"  %.t+x+z+x+v+t+w+r+t+u+m+r+o+o+m+l+l+k+m+_+%+y N.)+)+[+|+[.(   ",
+"  3.t+y+u+t+v+s+s+r+m+s+m+m+m+o+l+k+k+j+j+M.n J.)+)+N.2+u.U ]   ",
+"  %.x+G.. . . . . . . . . . . . . . . . # 0 J.)+)+2+)+4.P !+'   ",
+"  ].v+v+v+r+s+r+q+r+o+q+o+l+j+k+j+j+j+%+m )+)+)+)+2+T {.4+3+)   ",
+"  ` s+r+r+r+r+p+q+o+m+m+l+k+j+j+j+5+_+y )+J.)+)+|+G I.}+!+!+~   ",
+"  ].q+R.. . . . . . . . . . . . . G.Z.T )+)+)+)+G i.!+^+3+-+'   ",
+"  V r+p+q+p+r+m+m+q+q+q+q+j+j+e+e+}+l.t.)+N.|+u.^./+^+!+!+<+)   ",
+"  ` m+q+p+m+p+q+l+k+j+j+5+e+e+c+a+_+{.N.a.T N. at .R.!+3+'+'+=+,   ",
+"  W r+m+m+o+l+l+k+l+5+5+j+j+_+5+5+a+$.m 2.Z.w 4 :+}+-+-+-+,+,   ",
+"  V p+m+m+l+k+k+5+m+l+j+5+c+j+c+4+_+l.K.4+^+^+{.=+'+/+/+=+++;   ",
+"  Q m+o+l+k+j+k+k+e+c+a+j+5+_+_+_+5+Z.h.h.h.i.e.=+/+,+`.*+++-   ",
+"  Q l+l+k+5+5+k+e+c+_+5+c+a+5+5+_+3+p r.r.u.Z l ++,+*+`.=+`.=   ",
+"  ~ |.8.6.0.6.(.(.}.(.(.#.#.'.'.;.d V.0+6+9+6 I R R R I Q Q %   ",
+"                                  [ 0+9+6+L.                    ",
+"                                    E.0+b+b+^                   ",
+"                                    0 E.E.E.T /                 ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeedu/debian/langen2kvtml.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/langen2kvtml.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/langen2kvtml.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,83 @@
+.\"                                      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 LANGEN2KVTML 1 "November 22, 2002"
+.\" 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
+langen2kvtml \- convert Langenscheidt data files to KVocTrain data files
+.SH SYNOPSIS
+.B langen2kvtml
+[ \fB\-\-lang=\fP\fIxx\fP ] [ \fB\-\-trans=\fP\fIxx\fP ]
+[ \fB\-\-author=\fP\fIname\fP ] [ \fB\-\-longlesson\fP ]
+[ \fB\-\-outdir=\fP\fIdir\fP ] [ \fB\-\-proxy=\fP\fIproxy\fP ]
+{ \fB\-\-country=\fP\fIxx\fP | \fIvocfile\fP ... }
+.SH DESCRIPTION
+\fBlangen2kvtml\fP is a script that will convert Langenscheidt
+data files (*.voc) to KVocTrain data files (*.kvtml).
+.PP
+For each Langenscheidt data file given on the command-line, a
+corresponding KVocTrain data file will be created.  If no Langenscheidt
+data files are given, a set of data files for the given country (see
+the \fB\-\-country\fP option) will be downloaded from the internet and
+converted.  If neither data files nor a country are specified, country
+GB (Great Britain) will be assumed.
+.PP
+Note that you \fBmust\fP run KVocTrain at least once before this script
+can be used.  In some circumstances this script will edit the user's
+KVocTrain preferences file.
+.PP
+This utility is part of the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-\-lang=\fP\fIxx\fP
+Specifies the original language used in the data file(s).  The script
+will try to guess this based on the names of the Langenscheidt data files.
+.TP
+\fB\-\-trans=\fP\fIxx\fP
+Specifies the translated language used in the data file(s).  This
+defaults to de (Deutsch).
+.TP
+\fB\-\-author=\fP\fIname\fP
+Specifies the author of the data file(s).  This defaults to
+http://www.vokabeln.de.
+.TP
+\fB\-\-longlesson\fP
+Specifies that long lesson names should be used in the converted
+KVocTrain data file(s).  Short lesson names are the default.
+.TP
+\fB\-\-outdir=\fP\fIdir\fP
+Specifies that the converted KVocTrain data files be written in the
+given directory.  This defaults to the current directory.
+.TP
+\fB\-\-proxy=\fP\fIproxy\fP
+Specifies a proxy to use when downloading Langenscheidt data files from
+the internet.
+.TP
+\fB\-\-country=\fP\fIxx\fP
+Requests that Langenscheidt data files for the given country be
+downloaded from the internet and converted.  The country should be
+specified by the code used at \fIhttp://www.vokabeln.de/\fP, such as
+GB for Great Britain, D for Germany and so on.
+.SH SEE ALSO
+.BR kvoctrain (1),
+.BR spotlight2kvtml (1).
+.PP
+Langenscheidt data files can be downloaded directly from
+\fIhttp://www.vokabeln.de/files.htm\fP.
+.SH AUTHOR
+langen2kvtml was written by Andreas Neuper.
+.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/kdeedu/debian/libkdeedu-dev.docs
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+libkdeedu/AUTHORS
+libkdeedu/README

Added: people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+usr/bin/test_extdate
+usr/bin/test_extdatepicker
+usr/include/kde/libkdeedu/kdeeduglossary.h
+usr/include/kde/libkdeedu/keduvocdata.h
+usr/include/kde/libkdeedu/kplotaxis.h
+usr/include/kde/libkdeedu/kplotobject.h
+usr/include/kde/libkdeedu/kplotwidget.h
+usr/lib/libextdate.la
+usr/lib/libextdate.so
+usr/lib/libkdeeducore.la
+usr/lib/libkdeeducore.so
+usr/lib/libkdeeduplot.la
+usr/lib/libkdeeduplot.so
+usr/lib/libkdeeduui.la
+usr/lib/libkdeeduui.so
+usr/lib/libkvoctraincore.la
+usr/lib/libkvoctraincore.so

Added: people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu-dev.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+debian/test_extdate.1
+debian/test_extdatepicker.1

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

Added: people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+usr/lib/libextdate.so.1
+usr/lib/libextdate.so.1.2.0
+usr/lib/libkdeeducore.so.1
+usr/lib/libkdeeducore.so.1.2.0
+usr/lib/libkdeeduplot.so.1
+usr/lib/libkdeeduplot.so.1.2.0
+usr/lib/libkdeeduui.so.3
+usr/lib/libkdeeduui.so.3.0.5

Added: people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.override
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkdeedu3.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+# This package contains several libraries.
+libkdeedu3: package-name-doesnt-match-sonames libkdeeduplot1 libkdeeducore1 libextdate1 libkdeeduui1

Added: people/jriddell/KDE/3.5/kdeedu/debian/libkiten-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkiten-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkiten-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+usr/include/kde/libkiten
+usr/lib/libkiten.la
+usr/lib/libkiten.so

Added: people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.install
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+usr/lib/libkiten.so.1
+usr/lib/libkiten.so.1.0.0
+usr/share/apps/kiten
+usr/share/config.kcfg/kiten.kcfg
+usr/share/icons/crystalsvg/16x16/actions/kanjidic.png
+usr/share/icons/crystalsvg/22x22/actions/edit_add.png
+usr/share/icons/crystalsvg/22x22/actions/edit_remove.png
+usr/share/icons/crystalsvg/22x22/actions/kanjidic.png
+usr/share/icons/locolor/16x16/actions/edit_add.png
+usr/share/icons/locolor/16x16/actions/edit_remove.png

Added: people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.links
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/libkiten1.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+/usr/share/edict/edict /usr/share/apps/kiten/edict
+/usr/share/edict/kanjidic /usr/share/apps/kiten/kanjidic

Added: people/jriddell/KDE/3.5/kdeedu/debian/lx200_16.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/lx200_16.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/lx200_16.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 LX200_16 1 "March 16, 2005"
+.\" 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
+lx200_16 \- LX200 16" driver for INDI telescope control
+.SH SYNOPSIS
+.B lx200_16
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBlx200_16\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/lx200autostar.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/lx200autostar.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/lx200autostar.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 LX200AUTOSTAR 1 "March 16, 2005"
+.\" 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
+lx200autostar \- LX200 Autostar driver for INDI telescope control
+.SH SYNOPSIS
+.B lx200autostar
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBlx200autostar\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/lx200classic.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/lx200classic.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/lx200classic.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 LX200CLASSIC 1 "March 16, 2005"
+.\" 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
+lx200classic \- LX200 Classic driver for INDI telescope control
+.SH SYNOPSIS
+.B lx200classic
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBlx200classic\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/lx200generic.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/lx200generic.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/lx200generic.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 LX200GENERIC 1 "March 16, 2005"
+.\" 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
+lx200generic \- LX200 Generic driver for INDI telescope control
+.SH SYNOPSIS
+.B lx200generic
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBlx200generic\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/lx200gps.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/lx200gps.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/lx200gps.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 LX200GPS 1 "March 16, 2005"
+.\" 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
+lx200gps \- LX200 GPS driver for INDI telescope control
+.SH SYNOPSIS
+.B lx200gps
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBlx200gps\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/patches/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/patches/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/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-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/kdeedu/debian/patches/libtool.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/patches/libtool.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/patches/libtool.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+--- kdeedu/admin/libtool.m4.in	2005-02-04 09:36:19.000000000 +1100
++++ kdeedu/admin/libtool.m4.in	2005-09-01 23:16:53.380383208 +1000
+@@ -1424,7 +1424,7 @@
+   libsuff=
+   if test "x$LINUX_64_MODE" = x64; then
+     # Some platforms are per default 64-bit, so there's no /lib64
+-    if test -d /lib64; then
++    if test -d /lib64 && ! test -L /lib64; then
+       libsuff=64
+     fi
+   fi

Added: people/jriddell/KDE/3.5/kdeedu/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,248 @@
+#!/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
+
+libdocdir = debian/libkdeedu-dev/usr/share/doc/libkdeedu-dev
+
+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
+
+ifeq ($(DEB_BUILD_GNU_TYPE),alpha-linux)
+  # Required to avoid SIGFPE in kstars (#226966).
+  export CFLAGS += -mieee
+  export CXXFLAGS += -mieee
+endif
+
+# ifeq ($(DEB_BUILD_GNU_TYPE),arm-linux)
+#   # Required since boost.python is broken on arm (#245893).
+#   BOOST_FLAGS=--disable-kig-python-scripting
+#   BOOST_TEST=true
+# else
+#   BOOST_TEST=-e $(objdir)/kig/scripting/libscripting.la
+# endif
+
+# We now have boost.python working on all platforms (as of 1.32.0).
+BOOST_TEST=-e $(objdir)/kig/scripting/libscripting.la
+
+-include debian/debiandirs
+
+debian/debiandirs: admin/debianrules
+	perl -w admin/debianrules echodirs > debian/debiandirs
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	# Apply Debian specific patches
+	if test ! -f patch-stamp; then \
+		for patch in $(CURDIR)/debian/patches/*.diff ;\
+		do \
+			echo APPLYING PATCH\: $${patch##*/};\
+			patch -p1 < $$patch ;\
+		done ;\
+		touch patch-stamp ;\
+	fi
+
+	# KDE CVS does not have aclocal.m4 or configure
+	# if test ! -f configure; then \
+	# 	$(MAKE) -f admin/Makefile.common ;\
+	# fi
+	$(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) $(BOOST_FLAGS)
+
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp 
+	dh_testdir
+
+	cd $(objdir) && \
+	$(MAKE)
+
+	# Ensure that the boost scripting library built okay.
+	if ! test $(BOOST_TEST); then \
+		echo "ERROR: The boost scripting library was not built."; \
+		false; \
+	fi
+
+	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)
+
+	rm -rf po
+
+	# 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
+
+	# Remove kiten's copies of edict and kanjidic since we'll symlink to
+	# the debian versions instead.
+	rm debian/tmp/usr/share/apps/kiten/edict
+	rm debian/tmp/usr/share/apps/kiten/kanjidic
+
+	# Generate HTML docs.
+	for i in `find debian/tmp -name "index.docbook"`; do \
+	  ( cd `dirname $$i`; meinproc `basename $$i` ); \
+	done
+
+	# Split into separate binary packages.
+	dh_install --sourcedir=debian/tmp -Xkmathtool --list-missing
+
+	# Install library documentation.
+	$(INSTALL_DIR) $(libdocdir)
+	$(INSTALL_FILE) libkdeedu/extdate/README $(libdocdir)/README.extdate
+	$(INSTALL_FILE) libkdeedu/kdeeduplot/README $(libdocdir)/README.kdeeduplot
+
+	# 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
+
+	# Install the correct upstream changelogs.
+	for pkg in `dh_listpackages`; do \
+	  case "$$pkg" in \
+	    kalzium | kbruch | khangman | kig | klettres | kmessedwords | kstars | ktouch ) \
+	      DH_OPTIONS='' dh_installchangelogs -p$$pkg $$pkg/ChangeLog ;; \
+	    * ) \
+	      DH_OPTIONS='' dh_installchangelogs -p$$pkg ;; \
+	  esac; \
+	done
+
+	dh_installdocs
+	dh_installexamples
+	dh_installman
+	dh_installmenu
+	dh_installmime
+	dh_strip
+	dh_link
+	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
+	dh_fixperms
+	dh_makeshlibs -V
+	dh_installdeb
+	dh_perl
+	dh_shlibdeps -ldebian/libkdeedu3/usr/lib -ldebian/libkiten1/usr/lib
+	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/kdeedu/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: people/jriddell/KDE/3.5/kdeedu/debian/shlibs.local
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/shlibs.local	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/shlibs.local	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+libkiten 1 libkiten1 (= ${Source-Version})

Added: people/jriddell/KDE/3.5/kdeedu/debian/source.lintian-overrides
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/source.lintian-overrides	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/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/kdeedu/debian/spotlight2kvtml.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/spotlight2kvtml.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/spotlight2kvtml.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 SPOTLIGHT2KVTML 1 "March 16, 2005"
+.\" 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
+spotlight2kvtml \- convert a Spotlight Online vocabulary list to a
+KVocTrain data file
+.SH SYNOPSIS
+.B spotlight2kvtml
+.I spotfile month year
+.SH DESCRIPTION
+\fBspotlight2kvtml\fP is used to convert a Spotlight Online vocabulary
+list to a KVocTrain data file (*.kvtml).
+.PP
+The given vocabulary list (\fIspotfile\fP) must be in plain text format
+(i.e., you will need to convert the downloaded RTF or Word document into
+a plain text file).  The name of the new KVocTrain data file
+will be derived from the given \fIspotfile\fP.
+.PP
+The given month and year will be used in the title and lesson names
+in the new KVocTrain data file.
+.PP
+Note that Spotlight Online changes its vocabulary list format from time
+to time, so spotlight2kvtml might be out of date and might not behave
+correctly.
+.PP
+This utility is part of the official KDE edutainment module.
+.SH SEE ALSO
+.BR kvoctrain (1),
+.BR langen2kvtml (1).
+.PP
+Spotlight Online vocabulary lists can be downloaded from
+\fIhttp://www.spotlight-online.de/\fP.
+.SH AUTHOR
+spotlight2kvtml was written by Ewald Arnold <kvoctrain at ewald-arnold.de>
+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/kdeedu/debian/temma.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/temma.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/temma.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 TEMMA 1 "March 16, 2005"
+.\" 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
+temma \- Temma Takahashi driver for INDI telescope control
+.SH SYNOPSIS
+.B temma
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBtemma\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/test_extdate.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/test_extdate.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/test_extdate.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,47 @@
+.\"                                      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 TEST_EXTDATE 1 "October 16, 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
+test_extdate \- text-based tests for the ExtDate classes
+.SH SYNOPSIS
+.B test_extdate
+.SH DESCRIPTION
+This is a simple test program for testing the non-GUI functionality of the
+ExtDate classes.  It compares the results of several operations against
+the results from QDate and writes the results to the console.
+.PP
+The \fBExtDate library\fP consists of a group of classes allowing KDE
+applications to access calendar dates outside of the limited range of
+years imposed by QDate.
+.PP
+The QDate class has a limited range of valid dates.  It does not
+recognize dates prior to 14 Oct 1752 (when the Gregorian calendar
+was adopted by England), nor dates after 31 Dec 8000.  Both of these
+limits are arbitrary.
+.PP
+This library is part of the official KDE edutainment module.
+.SH SEE ALSO
+.BR test_extdatepicker (1).
+.PP
+See \fI/usr/share/doc/libkdeedu-dev/README.extdate\fP for further
+information on this library.
+.SH AUTHOR
+The ExtDate library was written by Jason Harris <jharris at 30doradus.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/kdeedu/debian/test_extdatepicker.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/test_extdatepicker.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/test_extdatepicker.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 TEST_EXTDATEPICKER 1 "October 16, 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
+test_extdatepicker \- GUI-based tests for the ExtDate classes
+.SH SYNOPSIS
+.B test_extdatepicker
+[ \fIgeneric-options\fP ]
+.SH DESCRIPTION
+This is a simple test program for testing the graphical functionality of
+the ExtDate classes.  It presents a KDatePicker widget and an
+ExtDatePicker widget side by side for user interaction.
+.PP
+The \fBExtDate library\fP consists of a group of classes allowing KDE
+applications to access calendar dates outside of the limited range of
+years imposed by QDate.
+.PP
+The QDate class has a limited range of valid dates.  It does not
+recognize dates prior to 14 Oct 1752 (when the Gregorian calendar
+was adopted by England), nor dates after 31 Dec 8000.  Both of these
+limits are arbitrary.
+.PP
+This library is part of the official KDE edutainment module.
+.SH OPTIONS
+For a full summary of options, run \fItest_extdatepicker \-\-help\fP.
+.SH SEE ALSO
+.BR test_extdate (1).
+.PP
+See \fI/usr/share/doc/libkdeedu-dev/README.extdate\fP for further
+information on this library.
+.SH AUTHOR
+The ExtDate library was written by Jason Harris <jharris at 30doradus.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/kdeedu/debian/v4ldriver.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/v4ldriver.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/v4ldriver.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 V4LDRIVER 1 "March 16, 2005"
+.\" 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
+v4ldriver \- Video4Linux Generic driver for INDI telescope control
+.SH SYNOPSIS
+.B v4ldriver
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBv4ldriver\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdeedu/debian/v4lphilips.1
===================================================================
--- people/jriddell/KDE/3.5/kdeedu/debian/v4lphilips.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeedu/debian/v4lphilips.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 V4LPHILIPS 1 "March 16, 2005"
+.\" 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
+v4lphilips \- Philips Webcam driver for INDI telescope control
+.SH SYNOPSIS
+.B v4lphilips
+[ \fB\-v\fP ]
+.SH DESCRIPTION
+KStars allows you to configure
+and control astronomical instruments such as telescopes and focusers via
+the INDI protocol.  \fBv4lphilips\fP is a device driver for supporting
+particular types of external hardware.
+.PP
+You should normally not need to run this driver directly.  Instead you
+should use KStars to configure and operate your astronomical instruments.
+Most operations can be found under the Devices menu within KStars.
+.PP
+KStars will start the INDI server internally, and the INDI server will
+in turn start this device driver.
+.PP
+Much more detailed information can be found in the KStars Handbook, as
+described below.
+.PP
+KStars is a graphical desktop planetarium for KDE, and forms part of
+the official KDE edutainment module.
+.SH OPTIONS
+.TP
+\fB\-v\fP
+Write more verbose output to stderr.
+.SH SEE ALSO
+.BR indiserver (1),
+.BR kstars (1).
+.PP
+The KStars Handbook contains detailed information on how to use INDI for
+telescope control.  You can read this handbook in the KDE Help Centre.
+Alternatively you can enter the URL
+\fIhelp:/kstars/indi.html\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kstars/indi.html\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdeedu-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kstars/indi.html\fP.
+.SH AUTHOR
+KStars was written by Jason Harris <jharris at 30doradus.org>,
+Heiko Evermann <heiko at evermann.de>, Thomas Kabelmann <tk78 at gmx.de>,
+Pablo de Vicente <pvicentea at wanadoo.es>, Jasem Mutlaq <mutlaqja at ikarustech.com>,
+Carsten Niehaus <cniehaus at gmx.de>, Mark Hollomon <mhh at mindspring.com>,
+Vincent Jagot <vincent.jagot at free.fr> and
+Martin Piskernig <martin.piskernig at stuwo.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/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+not made with DEB_TAR_SRCDIR include /usr/share/cdbs/1/rules/tarball.mk

Added: people/jriddell/KDE/3.5/kdegames/debian/atlantik-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/atlantik-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/atlantik-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+/usr/include/kde/atlantik
+/usr/include/kde/atlantic
+/usr/lib/libatlantic.so
+/usr/lib/libatlantikclient.so
+/usr/lib/libatlantikui.so

Added: people/jriddell/KDE/3.5/kdegames/debian/atlantik.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/atlantik.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/atlantik.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+/usr/games/atlantik
+/usr/lib/libatlantic.la
+/usr/lib/libatlantic.so.*
+/usr/lib/libatlantikclient.la
+/usr/lib/libatlantikclient.so.*
+/usr/lib/libatlantikui.la
+/usr/lib/libatlantikui.so.*
+/usr/lib/kde3/kio_atlantik.la
+/usr/lib/kde3/kio_atlantik.so
+/usr/share/services/atlantik.protocol
+/usr/share/doc/kde/HTML/en/atlantik/*
+/usr/share/applications/kde/atlantik.desktop
+/usr/share/icons/hicolor/48x48/apps/atlantik.png
+/usr/share/icons/hicolor/32x32/apps/atlantik.png
+/usr/share/icons/hicolor/16x16/apps/atlantik.png
+/usr/share/apps/atlantik/*
+../icons/atlantik.xpm /usr/share/pixmaps
+../icons/atlantik-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/atlantik.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/atlantik.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/atlantik.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/atlantik /usr/share/doc/atlantik/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/atlantik.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/atlantik.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/atlantik.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(atlantik):\
+	needs="x11"\
+	section="Games/Board"\
+	hints="KDE,Monopoly"\
+	title="Atlantik"\
+	icon32x32="/usr/share/pixmaps/atlantik.xpm"\
+	icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+	command="/usr/games/atlantik"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,984 @@
+kdegames (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
+
+kdegames (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  6 Dec 2005 12:27:52 +0000
+
+kdegames (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+
+  * Include correct path in debian/libkdegames-doc.install
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 26 Nov 2005 16:40:53 +0000
+
+kdegames (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Generate .pot files
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 22 Nov 2005 16:57:38 +0000
+
+kdegames (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Sync with Debian
+  * New game, knetwalk
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 23:48:35 +0000
+
+kdegames (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Schepler <schepler at debian.org>  Tue, 18 Oct 2005 11:15:22 +0200
+
+kdegames (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * GCC 4.0 transition: Tighten Build-Depends on libarts1-dev and
+    kdelibs4-dev to ensure we get g++-4.0 compiled versions.
+  * Remove obsolete Conflicts/Replaces/Provides against packages not in
+    sarge.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 26 Aug 2005 02:25:46 -0700
+
+kdegames (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Schepler <schepler at debian.org>  Thu,  2 Jun 2005 05:59:32 -0700
+
+kdegames (4:3.4.3-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_02_gcc_403_fix.diff to fix GCC 4.0.3 compile fail
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 29 Oct 2005 15:19:59 +0000
+
+kdegames (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  7 Oct 2005 19:56:00 +0000
+
+kdegames (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:46 +0000
+
+kdegames (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE release
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 00:34:15 +0000
+
+kdegames (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 26 May 2005 18:43:53 +0000
+
+kdegames (4:3.4.0-0ubuntu2) hoary; urgency=low
+
+  * Replace 02_disable_no_undefined.diff with blank file. Since it is
+    in the .orig it can not be deleted.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 16 Mar 2005 13:40:26 +0000
+
+kdegames (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * Remove duplicate patch 02_disable_no_undefined.diff
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 16 Mar 2005 03:07:55 +0000
+
+kdegames (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+  * Sync with Debian
+  * Remove usage of tarball.mk from rules
+
+ -- Chris Halls <chris.halls at credativ.co.uk>  Tue,  8 Mar 2005 16:00:48 +0000
+
+kdegames (4:3.4.0-0pre1) alioth; urgency=low
+
+  * New upstream release.
+  * Change to using upstream tar.bz2.
+  * Remove debian/*.docs, since on closer inspection none of the files
+    they installed were at all helpful.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat,  5 Mar 2005 14:54:17 -0800
+
+kdegames (4:3.3.2-1) unstable; urgency=low
+
+  * Uploading to unstable.
+  * Includes updates from KDE_3_3_BRANCH (mostly translation updates).
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 19 Jan 2005 19:48:32 -0800
+
+kdegames (4:3.3.2-1ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+
+ -- Andreas Mueller <amu at canonical.com>  Fri, 31 Dec 2004 16:55:41 +0100 
+
+kdegames (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+  * Drop useless static libs.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 17 Dec 2004 21:55:40 -0800
+
+kdegames (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rename 01_kdegames_branch.diff to 10_kdegames_branch.diff.
+  * New patch 04_disable_static_la_final.diff, to keep --enable-final
+    from messing up the static libraries.
+    + debian/rules: Reenable --enable-final.
+  * kde.mk: Add calls to dh_desktop.
+    + debian/control: Build-Depends on debhelper (>= 4.2.21) to ensure
+      dh_desktop is available.
+
+ -- Daniel Schepler <schepler at debian.org>  Sun, 31 Oct 2004 12:29:16 -0800
+
+kdegames (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 25 Aug 2004 22:33:05 -0400
+
+kdegames (4:3.2.92-1) experimental; urgency=low
+
+  * New upstream release.
+  * Remove debian/patches/03_lib_link.diff; replace with
+    debian/patches/02_disable_no_undefined.diff.
+  * Update XPM menu icons for konquest to match updated icons in
+    source.
+  * Clean up ktron description to get rid of linda warning.
+
+ -- Daniel Schepler <schepler at debian.org>  Sun,  1 Aug 2004 18:11:08 -0700
+
+kdegames (4:3.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove --enable-final argument to configure, in order to make
+    the static libraries a bit more sane.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed,  9 Jun 2004 15:54:41 -0700
+
+kdegames (4:3.2.2-2) unstable; urgency=low
+
+  * Remove obsolete kderemove tag from menu files.
+  * CVS updates from KDE_3_2_BRANCH.
+  * Reorganization of debian/ directory:
+    + Create debian/patches/01_kdegames_branch.diff (not to be committed
+      to KDE CVS), and rename other patches.
+    + Move manpages to debian/man.
+    + Make debian/rules determine automatically the upstream changelog
+      to be used for each package.
+  * Change the maintainer to the Debian QT/KDE Maintainers, and add
+    myself as uploader.
+
+ -- Daniel Schepler <schepler at debian.org>  Thu, 29 Apr 2004 22:19:32 -0700
+
+kdegames (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Forcibly update libtool files to current Debian versions, in order
+    to reduce unnecessary binary dependencies.
+  * New patch lib-link.diff: Add enough direct dependencies to libraries
+    to avoid pages and pages of undefined symbol warnings during link.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 17 Apr 2004 21:39:24 -0700
+
+kdegames (4:3.2.1-2) unstable; urgency=low
+
+  * Supply correct filename for old patch to be removed.
+    Closes: #237650.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 12 Mar 2004 13:17:51 -0800
+
+kdegames (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * First upload of 3.2 to unstable.
+  * Remove megami references from kdegames-doc-html.  Closes: #235428.
+  * Drop kmines_complete_vs_solver.diff, since the issue has been
+    resolved upstream.
+  * Drop mask_pngs.tar.gz.uu, which is no longer needed with the new
+    upstream tarball.
+  * Backport addition of kfouleggs icon from HEAD.  Closes: #142816.
+  * Added quotes to menu files to quiet lintian warnings.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 12 Mar 2004 00:09:30 -0800
+
+kdegames (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+    + Fixes kreversi startup at non-default size.  Closes: #198431.
+    + Kfouleggs now asks for the player's name the first time a high
+      score is reached, instead of using the default "Anonymous".
+      Closes: #165966.
+    + Added option to kbounce to disable sound.  Closes: #181545.
+  * Convert to cdbs, using an updated version of kde.mk.
+  * New packages: kgoldrunner, libkdegames-doc, kolf-dev.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 21 Feb 2004 10:01:10 -0800
+
+kdegames (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Apply revised version of patch from Danilo Piazzalunga
+    <danilopiazza at libero.it> to disable completeReveal mode while
+    the solver is running in kmines.  Closes: #224684.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 14 Jan 2004 11:13:40 -0800
+
+kdegames (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+    + Fixes compilation with Qt3.2.  Closes: #211478.
+  * Standards-Version 3.6.1 (no changes needed).
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 27 Sep 2003 19:38:23 -0700
+
+kdegames (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-Depend on kdelibs4-dev new enough to Depend on libxml2-utils,
+    and remove the temporary Build-Depends from debian/control.
+  * Move to Standards-Version 3.6.0, after checking that all shared
+    libraries have all needed binary dependencies.
+  * Regenerate menu icons now that there is no longer any colormap
+    requirement.
+  * Add 16x16 menu icons.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 30 Jul 2003 15:35:25 -0700
+
+kdegames (4:3.1.2-2) unstable; urgency=low
+
+  * Apply updates from KDE_3_1_BRANCH.  (Fixes atlantik crashes
+    with newer monopd servers.)
+  * Temporarily Build-Depend on libxml2-utils until kdelibs4-dev
+    gets fixed.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 21 Jun 2003 17:23:50 -0700
+
+kdegames (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update a couple package descriptions.  Closes: #181608, #188999.
+  * Update sections of kdegames and libkdegames-dev.
+  * Bump to Standards-Version 3.5.10 (no changes needed).
+
+ -- Daniel Schepler <schepler at debian.org>  Mon, 19 May 2003 17:34:19 -0700
+
+kdegames (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #125991, #182088.)
+    Makes running autoconf and automake no longer necessary.
+  * Removed now-obsolete --with-xinerama from debian/rules.
+  * atlantik-dev Depends: libkdegames-dev.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 14 Mar 2003 04:43:19 -0800
+
+kdegames (4:3.1.0-2) unstable; urgency=low
+
+  * Finally, a sid upload of kdegames >= 3!
+    Fixes: #143624, #169737, #169739.
+  * Rename kdecarddecks to kdegames-card-data, to parallel
+    kdewallpapers => kdebase-data, etc.
+  * Remove libksirtet packages, since libksirtet is no longer installed.
+  * Create atlantik-dev package, in order to allow atlantikdesigner
+    from kdeaddons to compile.
+  * Update short description of katomic -- "atomic entertainment handbook"
+    seems to have been taken from the title of the docs and is probably
+    fairly inaccurate.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat,  8 Feb 2003 15:26:46 -0800
+
+kdegames (4:3.1.0-1) unstable; urgency=low
+
+  * New upstream version.
+  * Add new games: atlantik, klickety, kolf, megami.
+  * Split libksirtet into its own packages.
+  * Split kfouleggs into its own package.
+  * Create new kdegames-doc-html package.
+  * Remove cruft no longer necessary when upgrading from Woody
+    or later, as well as obsolete Depends and Enhances on kdebase.
+  * Downgrade gnubg to suggests of kbackgammon.
+  * Wrote short manual pages for kwin4proc and lskatproc, simply
+    telling users not to run them directly.
+  * Change policy to 3.5.8 (no changes needed).
+
+ -- Daniel Schepler <schepler at debian.org>  Sun,  1 Dec 2002 05:34:24 -0800
+
+kdegames (4:3.0.8-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Ralf Nolden <nolden at kde.org>  Sun, 22 Sep 2002 09:36:44 +0200
+ 
+kdegames (4:3.0.3-2) experimental; urgency=low
+
+  * Build using g++-3.2.
+  * Move icons to /usr/share/pixmaps.
+  * Need to use automake because of update to admin/Makefile.common.
+  * Update to new CXXFLAGS rules, bump policy to 3.5.7.
+
+ -- Daniel Schepler <schepler at debian.org>  Sun, 15 Sep 2002 17:08:59 -0700
+
+kdegames (4:3.0.3-1) experimental; urgency=low
+
+  * New upstream release. 
+
+ -- Daniel Stone <dstone at kde.org>  Thu, 15 Aug 2002 23:31:30 +1000
+
+kdegames (4:3.0.2-0) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Daniel Schepler <schepler at debian.org>  Thu,  4 Jul 2002 20:49:17 -0700
+
+kdegames (4:3.0.1-0.1) experimental; urgency=low
+
+  * Ktuberling isn't an arcade game...
+  * Change kpat's dependency from kdebase4-data to kdebase-data.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 29 May 2002 02:39:49 -0700
+
+kdegames (4:3.0.1-0) experimental; urgency=low
+
+  * Add new kdegames metapackage; adjust other packages' replaces
+    and conflicts accordingly.
+  * Remove dependencies on kdebase-libs.
+  * Update for debhelper 4.
+  * Added menu icons.
+
+ -- Daniel Schepler <schepler at debian.org>  Thu, 25 Apr 2002 02:17:54 -0700
+
+kdegames (4:3.0.0-0rc4-1) experimental; urgency=low
+
+  * Updated packaging for KDE 3.0.
+  * Updated and reformatted package descriptions.
+  * Renamed packages: kabalone to kenolaba, kjezz to kbounce.
+  * Moved libkdegames to libkdegames1, created libkdegames-dev.
+  * Compile a static version of libkdegames for the dev package.
+  * Patch the .desktop files to point to /usr/games in place, instead
+    of with each release.
+
+ -- Daniel Schepler <schepler at debian.org>  Sun, 24 Mar 2002 16:24:53 -0800
+
+kdegames (4:2.2.2-2) unstable; urgency=low
+
+  * Fixed spelling errors in descriptions.
+    (Closes: #124843, #124844, #124852, #124853)
+  * Fixed menu entry placement and added some menu hints.
+    (Closes: #128730, #128731, #128732, #128733, #128737, #128757)
+  * Fixed ktuberling's "save picture".  (Closes: #125880)
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 16 Feb 2002 21:50:34 -0800
+
+kdegames (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Remove .cvsignore file as well from katomic.  (Closes: #120793)
+  * Tweak admin/debianrules to support debug in DEB_BUILD_OPTIONS.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 24 Nov 2001 23:42:35 -0800
+
+kdegames (4:2.2.0-final-2) unstable; urgency=low
+
+  * Remove CVS directory from installed katomic data.  (Closes: #109367)
+
+ -- Daniel Schepler <schepler at debian.org>  Mon, 20 Aug 2001 21:01:01 -0700
+
+kdegames (4:2.2.0-final-1) unstable; urgency=low
+
+  * Updated to official 2.2 release.
+  * Updated rules and control for building on alpha, prelinking on i386.
+  * Updated menu and .desktop files to give full paths to game binaries.
+    (Hopefully closes: #107868.)
+
+ -- Daniel Schepler <schepler at debian.org>  Mon, 20 Aug 2001 00:33:45 -0700
+
+kdegames (4:2.2-cvs20010630-1) unstable; urgency=low
+
+  * First upload of 2.2 packages.
+  * Bumped Standards-Version again.
+  * Added real description for ksmiletris.
+  * Use Enhances: kdebase.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 30 Jun 2001 10:45:57 -0700
+
+kdegames (4:2.1.2-1) unstable; urgency=low
+
+  * Fixed menu entries.  Closes: #96452, #99055
+  * Some minor fixes to packaging.
+  * CVS updates up to date; this changed the KDE version number in
+    admin/Makefile.common, but added few other changes.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 30 May 2001 14:38:05 -0700
+
+kdegames (4:2.2-cvs20010529-1) experimental; urgency=low
+
+  * Disabling shared KHighscore files until it actually works without
+    world writable files...
+  * Updated build depends to ensure autoconf 2.13 is installed.
+  * New klines package.
+
+ -- Daniel Schepler <schepler at debian.org>  Tue, 29 May 2001 21:59:55 -0700
+
+kdegames (4:2.2-cvs20010518-1) experimental; urgency=low
+
+  * Removed unnecessary libkdegames.postinst script, ldconfig call
+    is now generated by debhelper.
+  * Wrote skeletal man pages for all the games.
+  * Made binaries using KHighscore setgid games, added code to create
+    high score files in postinst scripts.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 18 May 2001 11:54:37 -0700
+
+kdegames (4:2.2-alpha1-1) experimental; urgency=low
+
+  * Tracking 2.2 CVS.
+  * New kbattleship package.
+  * Kbackgammon does support gnubg now.  Added recommendation of
+    gnubg back in.
+  * Started using debhelper v3.
+  * Updated build depends.
+  * Split carddecks from libkdegames package, added dependencies on
+    the new package.
+  * Fixed a bug with shlibs generation for libkdegames.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 28 Apr 2001 06:28:56 -0700
+
+kdegames (4:2.1.1-4) unstable; urgency=low
+
+  * Added description for katomic package.  Closes: #93822
+  * On closer inspection, kbackgammon's support for gnubg hasn't been
+    implemented yet.  Removed recommendation of gnubg.
+
+ -- Daniel Schepler <schepler at debian.org>  Mon, 16 Apr 2001 17:25:28 -0700
+
+kdegames (4:2.1.1-3) unstable; urgency=low
+
+  * Try the upload once again.  It seems using the official upstream
+    tarball will have to wait for the next release.
+  * Added recommendation for gnubg to kbackgammon.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed,  4 Apr 2001 00:33:30 -0700
+
+kdegames (4:2.1.1-2) unstable; urgency=low
+
+  * New maintainer (closes: #89595).
+  * Upstream tarball is now the officially distributed version.  This
+    allowed for deleting a few Build-Depends.
+  * Notched up Standards-Version to 3.5.2 (no changes necessary).
+
+ -- Daniel Schepler <schepler at debian.org>  Sun,  1 Apr 2001 01:10:26 -0800
+
+kdegames (4:2.1.1-1.0.1) unstable; urgency=low
+ 
+  * Build with older libc
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 26 Mar 2001 02:31:00 -0700
+
+kdegames (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Mar 2001 02:31:00 -0700
+
+kdegames (4:2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Adding kdewallpapers to kpat's depends
+  * Upping standards version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdegames (4:2.1-beta2-1) unstable; urgency=low
+ 
+  * New upstream beta
+  * New kbackgammon game
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 22 Jan 2001 06:00:00 -0700
+
+kdegames (4:2.1-20010115-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fix high score problem (Closes: #74663)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
+
+kdegames (4:2.1-20010106-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More depends/build-depends fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
+
+kdegames (4:2.1-20010101-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing descriptions and typos (Closes: #80608, 80606)
+  * Fixing copyright statements ... or rather updating it
+  
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 01 Jan 2001 03:20:00 -0700
+
+kdegames (4:2.1-20001218-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in missing conflicts for kdegames
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Dec 2000 23:50:00 -0700
+
+kdegames (4:2.1-20001213-1) unstable; urgency=low
+  
+  * New upstream cvs version
+  * removing task
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 13 Dec 2000 15:00:00 -0700
+
+kdegames (4:2.0-final-8) unstable; urgency=low
+ 
+  * More upstream fixes
+  * documentation cleanup
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 25 Nov 2000 07:07:00 -0700
+
+kdegames (4:2.0-final-7) unstable; urgency=low
+ 
+  * shlibs cleanup
+  * reworkinb build rules
+  * lintian override file addition
+  * documentation cleanup
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 21 Nov 2000 09:48:00 -0700
+
+kdegames (4:2.0-final-6) unstable; urgency=low
+  
+  * Upstream fixes to ksnake
+  * fixing build-depends for non-x4 systems
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 18 Nov 2000 19:40:00 -0700
+
+kdegames (4:2.0-final-5) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 18 Nov 2000 08:30:00 -0700
+
+kdegames (4:2.0-final-4) unstable; urgency=low
+ 
+  * more upstream fixes
+  * adding in menu hints
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
+                                                                                
+kdegames (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 23:00:00 -0700
+                                                                                
+kdegames (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
+
+kdegames (4:2.0-20001011-0) unstable; urgency=low
+  
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
+                                                                                
+kdegames (4:2.0-20001006-0) unstable; urgency=low
+ 
+  * New updateam fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 06 Oct 2000 22:00:00 -0700
+                                                                                
+kdegames (4:2.0-20001005-0) unstable; urgency=low
+ 
+  * New updateam fixes
+  * Compiling against non-versioned kdelibs once again
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
+                                                                                
+kdegames (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
+                                                                                
+kdegames (4:2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Updating build-depends
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdegames (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes 
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
+
+kdegames (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes (-beta5)
+  * Fixing missing menu items when individually installed (Closes: #71922)
+  * Fixed bad description for kblackbox (Closes: #71929, #71505, #71541, #71626)
+  * Fixed bad spelling (Closes: #71543)
+  * Fixing ksirtet grammer and listing (Closes: #71544)
+  * Fixing ktron description (Closes: #71545)
+  * Fixing lskat description (Closes: #71546)
+  * How about round 2 Joey?  :)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Sep 2000 18:00:00 -0700
+
+kdegames (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
+
+kdegames (4:2.0-20000905-0) unstable; urgency=low
+
+  * More upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 05 Sep 2000 17:00:00 -0700
+
+kdegames (4:2.0-20000901-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Merging package fixes into upstream CVS
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
+ 
+kdegames (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
+
+kdegames (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 22:30:00 -0700
+
+kdegames (4:2.0-20000524-1.0) experimental; urgency=low
+ 
+  * New upstream CVS version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 24 May 2000 04:15:00 -0700
+
+kdegames-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
+
+kdegames-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
+
+kdegames-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 08 Mar 2000 22:30:00 -0700
+
+kdegames-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+
+  * Adding in build-depends
+  * more upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
+
+kdegames-cvs (4:2.0-20000223-1.0) experimental; urgency=low
+
+  * new version from CVS
+  * Migrating game binaries to /usr/games and chowning to games.games
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 23 Feb 2000 22:00:37 -0700
+
+kdegames-cvs (4:2.0-19991001-1) experimental; urgency=low
+
+  * new version from CVS
+  * Fixing up dependencies
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Oct 1999 14:25:37 -0400
+
+kdegames-cvs (4:2.0-19990912-1) experimental; urgency=low
+
+  * new version from CVS
+  * Updating the pre/post scripts to come in line with debian policy
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 12 Sep 1999 23:25:37 -0400
+
+kdegames-cvs (4:2.0-19990820-1) experimental; urgency=low
+
+  * new version from CVS
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 20 Aug 1999 20:08:37 -0400
+
+kdegames-cvs (4:2.0-19990626-1) experimental; urgency=low
+
+  * new version from CVS
+  * migrated back into /opt/kde (leaving it an option in debianrules)
+
+ -- Stephan Kulow <coolo at kde.org>  Sat, 26 Jun 1999 20:08:37 +0200
+
+kdegames-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * migrating from /opt to /
+  * working in new build items to bring package more in line with
+    current Debian packaging
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 24 May 1999 07:00:09 -0400
+
+kdegames (4:2.0-19990309-1) experimental; urgency=low
+
+  * new upstream version with Qt 2.0
+
+ -- Stephan Kulow <coolo at kde.org>  Tue,  9 Mar 1999 23:30:09 +0100
+
+kdegames (4:1.1-19990306-1) unstable; urgency=low
+
+  * new upstream version out of CVS (many translation updates and some
+    security fixes
+
+ -- Stephan Kulow <coolo at kde.org>  Sat,  6 Mar 1999 18:03:04 +0100
+
+kdegames (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo at kde.org>  Wed, 17 Feb 1999 19:09:41 +0100
+
+kdegames (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:43 +0100
+
+kdegames (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
+
+kdegames (2:980710-1.0-1) unstable; urgency=low
+
+  * New upstream release 1.0
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 12 Jul 1998 19:41:57 +0200
+
+kdegames (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 19 Apr 1998 15:49:10 +0200
+
+kdegames (2:980310-3) frozen; urgency=low
+
+  * removed this ugly dependency on a specific kdebase version
+  * new compile cycle with fixed kdelibs. This time from CVS
+  * add undocumented man page
+
+ -- Stephan Kulow <coolo at kde.org>  Fri,  3 Apr 1998 17:08:37 +0200
+
+kdegames (2:980310-2) frozen; urgency=low
+
+  * new compile cycle with qt-1.33 and libstc++-2.8
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 24 Mar 1998 20:28:34 +0100
+
+kdegames (2:980310-1) experimental; urgency=low
+
+  * increased epoche
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 10 Mar 1998 20:37:20 +0100
+
+kdegames (980310-1) experimental; urgency=low
+
+  * changed README notice
+  * New upstream release
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 10 Mar 1998 20:29:22 +0100
+
+kdegames (980228-1) experimental; urgency=low
+
+  * made bindir to kde_bindir
+  * changed bindir to /usr/games
+  * changed section to contrib
+  * New upstream release
+
+ -- Stephan Kulow <coolo at kde.org>  Sat, 28 Feb 1998 22:36:27 +0100
+
+kdegames (980227-1) experimental; urgency=low
+
+  * fixed rules file
+  * changed maintainer field
+  * New upstream release
+
+ -- Stephan Kulow <coolo at kde.org>  Sat, 28 Feb 1998 02:03:54 +0100
+
+kdegames (1:Beta2-2.1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Fri,  5 Dec 1997 21:18:16 +0100
+
+kdegames (1:Beta2-2) unstable; urgency=low
+
+  * removed virtual package names.
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun, 30 Nov 1997 17:05:03 +0100
+
+kdegames (1:Beta2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun, 23 Nov 1997 18:59:30 +0100
+
+kdegames (1:Beta1.2-2) unstable; urgency=low
+
+  * new compile cycle with bugfixes
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun,  9 Nov 1997 19:46:23 +0100
+
+kdegames (1:Beta1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Mon, 27 Oct 1997 11:43:21 +0100
+
+kdegames (1:Beta1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Mon, 20 Oct 1997 11:46:00 +0200
+
+kdegames (971019-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Sun, 19 Oct 1997 16:08:30 +0200
+
+kdegames (971013-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Mon, 13 Oct 1997 08:26:28 +0200
+
+kdegames (971009-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Thu,  9 Oct 1997 10:55:21 +0200
+
+kdegames (971008-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Wed,  8 Oct 1997 10:11:29 +0200
+
+kdegames (971006-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Tue,  7 Oct 1997 12:09:00 +0200
+
+kdegames (971006-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Mon,  6 Oct 1997 09:27:43 +0200
+
+kdegames (971005-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Sun,  5 Oct 1997 17:35:44 +0200
+
+kdegames (971003-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Fri,  3 Oct 1997 08:28:31 +0200
+
+kdegames (971002-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Thu,  2 Oct 1997 08:55:37 +0200
+
+kdegames (970930-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Tue, 30 Sep 1997 11:42:58 +0200
+
+kdegames (970929-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Mon, 29 Sep 1997 09:43:07 +0200
+
+kdegames (970926-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Fri, 26 Sep 1997 08:11:13 +0200
+
+kdegames (970923-4) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Thu, 25 Sep 1997 09:05:39 +0200
+
+kdegames (970923-3) unstable; urgency=low
+
+  * new use kderules.
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Wed, 24 Sep 1997 11:07:21 +0200
+
+kdegames (970923-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Wed, 24 Sep 1997 09:29:54 +0200
+
+kdegames (970923-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Tue, 23 Sep 1997 08:43:44 +0200
+
+kdegames (970921-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Sun, 21 Sep 1997 13:53:35 +0200
+
+kdegames (970920-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Andreas Jellinghaus <aj at dungeon.inka.de>  Sat, 20 Sep 1997 15:10:11 +0200

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

Added: people/jriddell/KDE/3.5/kdegames/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,480 @@
+Source: kdegames
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.21), autoconf (>= 2.50), automake1.9, libtool, kdelibs4-dev (>= 4:3.5.1), libarts1-dev (>= 1.5.1), groff-base, sharutils, bzip2
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-doc
+Section: games
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Daniel Schepler <schepler at debian.org>
+Standards-Version: 3.6.2
+
+Package: kdegames
+Architecture: all
+Section: kde
+Depends: atlantik (>= ${Source-Version}), kasteroids (>= ${Source-Version}), katomic (>= ${Source-Version}), kbackgammon (>= ${Source-Version}), kbattleship (>= ${Source-Version}), kblackbox (>= ${Source-Version}), kbounce (>= ${Source-Version}), kenolaba (>= ${Source-Version}), kfouleggs (>= ${Source-Version}), kgoldrunner (>= ${Source-Version}), kjumpingcube (>= ${Source-Version}), klickety (>= ${Source-Version}), klines (>= ${Source-Version}), kmahjongg (>= ${Source-Version}), kmines (>= ${Source-Version}), kolf (>= ${Source-Version}), konquest (>= ${Source-Version}), kpat (>= ${Source-Version}), kpoker (>= ${Source-Version}), kreversi (>= ${Source-Version}), ksame (>= ${Source-Version}), kshisen (>= ${Source-Version}), ksirtet (>= ${Source-Version}), ksmiletris (>= ${Source-Version}), ksnake (>= ${Source-Version}), ksokoban (>= ${Source-Version}), kspaceduel (>= ${Source-Version}), ktron (>= ${Source-Version}), ktuberling (>= ${Source-Version}), kwin4 (>= ${Source-Version}), lskat (>= ${Source-Version})
+Suggests: kdegames-doc-html (>= ${Source-Version})
+Description: KDE Games metapackage
+ This is an empty package which depends on the current version of
+ every game in the kdegames distribution.
+
+Package: kdegames-doc-html
+Architecture: all
+Section: doc
+Suggests: www-browser, doc-base, kdegames
+Description: KDE games documentation in HTML format
+ By default the games 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 games 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/en/<package>/, for instance
+ /usr/share/doc/kde/HTML/en/kasteroids/.
+
+Package: libkdegames1
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: KDE games library and common files
+ This library provides a common infrastructure for several of the
+ games in the KDE distribution. Features include standardized menu
+ items, high score handling, card display, and network connections
+ including chat capabilities.
+
+Package: libkdegames-dev
+Architecture: any
+Section: libdevel
+Depends: kdelibs4-dev (>= 4:3.2.0), libkdegames1 (= ${Source-Version})
+Description: KDE games library headers
+ This package is necessary if you want to develop your own games using
+ the KDE games library.
+
+Package: libkdegames-doc
+Architecture: all
+Section: doc
+Suggests: www-browser, doc-base, libkdegames-dev
+Recommends: kdelibs4-doc, qt3-doc
+Description: API documentation for the KDE games library
+ This package contains the developers' documentation for libkdegames.
+ You may want to install it if you wish to develop games for KDE.
+
+Package: kdegames-card-data
+Architecture: all
+Section: games
+Recommends: kpat | kpoker | lskat
+Description: Card decks for KDE games
+ Several different collections of card images for use by KDE games.
+
+Package: atlantik
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Suggests: atlantikdesigner, monopd
+Description: KDE client for Monopoly-like network games
+ This is a KDE client for playing Monopoly-like boardgames 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 property includes several major cities in North
+ America and Europe.
+
+Package: atlantik-dev
+Architecture: any
+Section: devel
+Priority: extra
+Depends: ${shlibs:Depends}, atlantik (= ${Source-Version}), libkdegames-dev (>= 4:3.2.0)
+Description: Development files for Atlantik
+ This package contains header files for compiling programs against the
+ libraries which come with Atlantik.
+
+Package: kasteroids
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Asteroids for KDE
+ You know this game.  It is based on Warwick Allison's QwSpriteField
+ widget.
+ .
+ The objective of kasteroids is to destroy all the asteroids on the
+ screen to advance to the next level. Your ship is destroyed if it
+ makes contact with an asteroid.
+
+Package: katomic
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Atomic Entertainment game for KDE
+ This is a puzzle game, in which the object is to assemble a molecule
+ from its atoms on a Sokoban-like board.  On each move, an atom goes
+ as far as it can in a specified direction before being stopped by a
+ wall or another atom.
+
+Package: kbackgammon
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Suggests: gnubg
+Description: A Backgammon game for KDE
+ KBackgammon is a backgammon program for KDE2. It is based on the
+ code, ideas and concepts of KFibs (which is a FIBS client for
+ KDE1). For a short time, KBackgammon was called bacKgammon (if you
+ know somebody who is still using bacKgammon, please force them to
+ upgrade :-)).
+
+Package: kbattleship
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Battleship game for KDE
+ This is an implementation of the Battleship game.  Each player tries
+ to be the first to sink all the opponent's ships by firing "blindly"
+ at them.  The game has options to play over a network connection or
+ against the computer.
+
+Package: kblackbox
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: A simple logical game for the KDE project
+ KBlackBox is a game of hide and seek played on an grid of boxes. Your
+ opponent (Random number generator, in this case) has hidden several
+ balls within this box. By shooting rays into the box and observing
+ where they emerge it is possible to deduce the positions of the
+ hidden balls. The fewer rays you use to find the balls, the lower
+ your score.
+
+Package: kbounce
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Jezzball clone for the K Desktop Environment
+ This is a clone of the popular Jezzball game originally created by
+ Microsoft. Jezzball is one of the rare and simple games requiring
+ skill, timing, and patience in order to be successful.  A ball begins
+ to bounce off of an area enclosed by four borders (like a
+ square). You must move your pointer to certain areas within the
+ square. Upon clicking, a new border is constructed at a relatively
+ quick pace. You can change the direction of the borders by 90 degrees
+ as well. Ultimately, you must force the ball to bounce around in a
+ smaller, and smaller area as time goes by without the ball ever
+ touching the borders as they are being constructed. If a ball touches
+ a certain part of the border as it is being built, the game is over.
+ After 75% of the original space has been blocked off from the moving
+ ball, you advance one level, and one more ball is added to the mix in
+ the following level.
+ .
+ This game was previously known as kjezz.
+
+Package: kenolaba
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Enolaba board game for KDE
+ kenolaba is a simple board strategy game that is played by two
+ players. There are red and yellow pieces for each player. Beginning
+ from a start position where each player has 14 pieces, moves are
+ drawn until one player has pushed 6 pieces of his opponent out of the
+ board.
+ .
+ This game was previously known as kabalone, and was inspired by the
+ board game Abalone by Abalone SA, France.
+
+Package: kfouleggs
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: A KDE clone of the Japanese PuyoPuyo game
+ KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced
+ features such as multiplayer games against human or AI, and network
+ play.  If you have played Tetris or one of its many clones, you will
+ find KFouleggs easy to learn.
+
+Package: kgoldrunner
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: A KDE clone of the Loderunner arcade game
+ KGoldrunner, a game of action and puzzle solving.  Run through the
+ maze, dodge your enemies, collect all the gold and climb up to the
+ next level.
+ .
+ You must guide the hero with the mouse or keyboard and collect all
+ the gold nuggets, then you can climb up into the next level.  Your
+ enemies are also after the gold and they will kill you if they catch
+ you!
+ .
+ The problem is you have no weapon to kill them.  All you can do is
+ run away, dig holes in the floor to trap them or lure them into some
+ area where they cannot hurt you.  After a short time a trapped enemy
+ climbs out of his hole, but if it closes before that, he will die and
+ reappear somewhere else.
+
+Package: kjumpingcube
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Tactical one or two player game
+ KJumpingCube is a simple tactical game. You can play it against the
+ computer or against a friend. The playing field consists of squares
+ that contains points.  By clicking on the squares you can increase
+ the points and if the points reach a maximum the points will jump to
+ the squares neighbours and take them over. Winner is the one, who
+ owns all squares.
+
+Package: klickety
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: A Clickomania-like game for KDE
+ Klickety is an adaptation of the (perhaps) well-known Clickomania
+ game; it is very similar to the "same" game.
+
+Package: klines
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Color lines for KDE
+ KLines is a simple game. It is played by one player, so there is only
+ one winner :-). You play for fun and against the high score. It was
+ inspired by a well known game - "Color lines", written for DOS by
+ Olga Demina, Igor Demina, Igor Ivkin and Gennady Denisov back in
+ 1992.
+ .
+ The main rules of the game are as simple as possible: you move (using
+ the mouse) marbles from cell to cell and build lines (horizontal,
+ vertical or diagonal). When a line contains 5 or more marbles, they
+ are removed and your score grows. After each turn the computer drops
+ three more marbles.
+
+Package: kmahjongg
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: the classic mahjongg game for KDE project
+ Your mission in this game is to remove all tiles from the game board. A
+ matching pair of tiles can be removed, if they are 'free', which means that
+ no other tiles block them on the left or right side.
+
+Package: kmines
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Minesweeper for KDE
+ KMines is the classic Minesweeper game. You must uncover all the
+ empty cases without blowing on a mine.
+ .
+ When you uncover a case, a number appears : it indicates how many
+ mines surround this case. If there is no number the neighbour cases
+ are automatically uncovered. In your process of uncovering secure
+ cases, it is very useful to put a flag on the cases which contain a
+ mine.
+
+Package: knetwalk
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: a game for system administrators
+ You are the system administrator and your goal is to connect each
+ computer to the central server. Click the right mouse button for
+ turning the cable in a clockwise direction, and left mouse
+ button for turning the cable in a counter-clockwise direction.  Start the
+ LAN with as few turns as possible
+
+Package: kolf
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Minigolf game for KDE
+ This is a minigolf game for KDE that allows you to go through different
+ golf courses and waste an exorbitant amount of time.
+
+Package: kolf-dev
+Architecture: any
+Section: devel
+Priority: extra
+Depends: ${shlibs:Depends}, kolf (= ${Source-Version}), libkdegames-dev (>= 4:3.2.0)
+Description: Development files for Kolf
+ This package contains headers and development libraries for compiling
+ Kolf plugins.
+
+Package: konquest
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: KDE based GNU-Lactic Konquest game
+ This the KDE version of Gnu-Lactic Konquest, a multi-player strategy
+ game. The goal of the game is to expand your interstellar empire
+ across the galaxy and, of course, crush your rivals in the process.
+
+Package: kpat
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, kdebase-data, kdegames-card-data
+Description: KDE solitaire patience game
+ KPatience is a collection of 14 card games. All the games are single
+ player games.
+
+Package: kpoker
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, kdegames-card-data
+Description: KDE based Poker clone
+ KPoker is a KDE compliant clone of those highly addictive pocket
+ video poker games which are sometimes called "Videopoker" as well.
+
+Package: kreversi
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Reversi for KDE
+ Reversi is a simple strategy game that is played by two
+ players. There is only one type of piece - one side of it is black,
+ the other white. If a player captures a piece on the board, that
+ piece is turned and belongs to that player. The winner is the person
+ that has more pieces of his own color on the board and if there are
+ no more moves possible.
+
+Package: ksame
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: SameGame for KDE
+ KSame is a simple game. It's played by one player, so there is only
+ one winner :-) You play for fun and against the high score. It has
+ been inspired by SameGame, that is only famous on the Macintosh
+ platform.
+
+Package: kshisen
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Shisen-Sho for KDE
+ KShisen-Sho is a single-player-game similar to Mahjongg and uses the
+ same set of tiles as Mahjongg.
+ .
+ The object of the game is to remove all tiles from the field.
+
+Package: ksirtet
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Tetris and Puyo-Puyo games for KDE
+ This program is a clone of the well known game Tetris. You must fit
+ the falling pieces to form full lines. You can rotate and translate
+ the falling piece. The game ends when no more piece can fall ie when
+ your incomplete lines reach the top of the board.
+ .
+ Every time you have destroyed 10 lines, you gain a level and the
+ pieces fall quicker (exactly the piece falls from a line each
+ 1/(1+level) second).
+
+Package: ksmiletris
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Tetris like game for KDE
+ This is a game with falling blocks composed of different types of
+ smilies. The object of the game is to "crack a smile" by guiding
+ blocks so there are two or more of the same symbol vertically.
+
+Package: ksnake
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Snake Race for KDE
+ Snake Race is a game of speed and agility. You are a hungry snake and
+ are trying to eat all the apples in the room before getting out!
+
+Package: ksokoban
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Sokoban game for KDE
+ The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
+ the Japanese company Thinking Rabbit, Inc. "Sokoban" is japanese for
+ "warehouse keeper". The idea is that you are a warehouse keeper
+ trying to push crates to their proper locations in a warehouse.
+ .
+ The problem is that you cannot pull the crates or step over them. If
+ you are not careful, some of the crates can get stuck in wrong places
+ and/or block your way.
+ .
+ It can be rather difficult just to solve a level. But if you want to
+ make it even harder, you can try to minimise the number of moves
+ and/or pushes you use to solve the level.
+ .
+ To make the game more fun for small kids (below 10 years or so), some
+ collections with easier levels are also included in KSokoban. These
+ are marked (easy) in the level collection menu. Of course, these
+ levels can be fun for adults too, for example if you don't want to
+ expose yourself to too much mental strain.
+
+Package: kspaceduel
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Arcade two-player space game for KDE
+ KSpaceduel is an space arcade game for two players.
+ .
+ Each player controls a ship that flies around the sun and tries to
+ shoot at the other ship. You can play KSpaceduel with another person,
+ against the computer, or you can have the computer control both ships
+ and play each other.
+
+Package: ktron
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Tron clone for the K Desktop Environment
+ The object of the game is to avoid running into walls, your own tail,
+ and that of your opponent.
+
+Package: ktuberling
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Potato Guy for KDE
+ KTuberling is a game intended for small children. Of course, it may
+ be suitable for adults who have remained young at heart.
+ .
+ It is a potato editor. That means that you can drag and drop eyes,
+ mouths, moustache, and other parts of face and goodies onto a
+ potato-like guy.  Similarly, you have a penguin on which you can drop
+ other stuff.
+ .
+ There is no winner for the game. The only purpose is to make the
+ funniest faces you can.
+ .
+ There is a museum (like a "Madame Tusseau" gallery) where you can
+ find many funny examples of decorated potatoes. Of course, you can
+ send your own creations to the programmer, Eric Bischoff, who will
+ include them in the museum if he gets some spare time.
+
+Package: kwin4
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Description: Connect Four clone for KDE
+ Four wins is a game for two players. Each player is represented by a
+ colour (yellow and red). The goal of the game is to get four
+ connected pieces of your colour into a row, column or any
+ diagonal. This is done by placing one of your pieces into any of the
+ seven columns. A piece will begin to fill a column from the bottom,
+ i.e. it will fall down until it reaches the ground level or another
+ stone. After a move is done it is the turn of the other player. This
+ is repeated until the game is over, i.e. one of the players has four
+ pieces in a row, column or diagonal or no more moves are possible
+ because the board is filled.
+
+Package: lskat
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}, kdegames-card-data
+Description: Lieutnant Skat card game for KDE
+ Lieutnant skat (from German Offiziersskat) is a card game for two
+ players. It is roughly played according to the rules of Skat but with
+ only two players and simplified rules.
+ .
+ Every player has a set of cards in front of him/her, half of them
+ covered and half of them open. Both players try to win more than 60
+ of the 120 possible points. After 16 moves all cards are played and
+ the game ends.

Added: people/jriddell/KDE/3.5/kdegames/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,584 @@
+This package was updated by Ivan E. Moore II <rkrusty at debian.org>.
+This package was debianized by Andreas Jellinghaus <aj at dungeon.inka.de>.
+Thanks to Brandon Mitchell <bhmit1 at mail.wm.edu> for his work on the
+libc5 version.
+
+It was downloaded via CVS from cvs.kde.org.
+
+Copyright:
+
+Everything in kdegames (unless otherwise stated below) are licensed under the
+GPL or LGPL.  Please see /usr/share/common-licenses/* for full licenses.
+
+The kdocbook documentation for the applications is under the GFDL
+license.  The complete text of this license is included below.
+
+kpat :
+  basicCard.cpp -- support classes for patience type card games
+
+     Copyright (C) 1995  Paul Olav Tvete
+
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notice appear in all copies and
+ * that
+ * both that copyright notice and this permission notice appear in
+ * supporting documentation.
+ *
+ * This file is provided AS IS with no warranties of any kind.  The
+ * author
+ * shall have no liability with respect to the infringement of
+ * copyrights,
+ * trade secrets or any patents by this file or any part thereof.  In no
+ * event will the author be liable for any lost revenue or profits or
+ * other special, indirect and consequential damages.
+ 
+some kpat bitmaps are :
+ except for the card bitmaps contained in the files
+
+   newface.bm  rank.bm     suit.bm
+
+which are
+
+      (c) Copyright 1989, Donald R. Woods and Sun Microsystems, Inc.
+      (c) Copyright 1990, David Lemke and Network Computing Devices Inc.
+
+      See the statement below for the terms of the copyright.
+
+ * Copyright 1990 Heather Rose and Sun Microsystems, Inc.
+ *
+ * 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, and
+ * that the names of Donald Woods and Sun Microsystems not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Heather Rose and Sun Microsystems not be
+ used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Heather Rose and Sun Microsystems make
+ * no representations about the suitability of this software for any purpose.
+ * It is provided "as is" without express or implied warranty.
+ *
+ * THE ABOVE-NAMED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT
+ * SHALL HEATHER ROSE OR SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Author:
+ *              Heather Rose
+ *              hrose at sun.com
+ *
+ *              Sun Microsystems, Inc.
+ *              2550 Garcia Avenue
+ *              Mountain View, CA  94043
+ */
+
+/*
+ * Copyright 1990 David Lemke and Network Computing Devices
+ *
+ * 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, and that the name of Network Computing Devices not be
+ * used in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  Network Computing
+ * Devices makes no representations about the suitability of this software
+ * for any purpose.  It is provided "as is" without express or implied
+ * warranty.
+ *
+ * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+ * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+ * OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:
+ *              Dave Lemke
+ *              lemke at ncd.com
+ *
+ *              Network Computing Devices, Inc
+ *              350 North Bernardo Ave
+ *              Mountain View, CA 94043
+ *
+ *      @(#)copyright.h 2.2     90/04/27
+ *
+ 
+% Copyright (c) 1989, Donald R. Woods and Sun Microsystems, Inc.
+%
+% 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, and
+% that the names of Donald Woods and Sun Microsystems not be used in
+% advertising or publicity pertaining to distribution of the software without
+% specific, written prior permission.  Donald Woods and Sun Microsystems make
+% no representations about the suitability of this software for any purpose.
+% It is provided "as is" without express or implied warranty.
+%
+% THE ABOVE-NAMED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+% INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT
+% SHALL DONALD WOODS OR SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+% CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+% DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+% TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+% OF THIS SOFTWARE.
+%
+% History: Spider is a solitaire card game that can be found in various books
+% of same; the rules are presumed to be in the public domain.  The author's
+% first computer implementation was on the Stanford Artificial Intelligence Lab
+% system (SAIL).  It was later ported to the Xerox Development Environment.
+% The card images are loosely based on scanned-in images but were largely
+% redrawn by the author with help from Larry Rosenberg.
+%
+% This program is written entirely in NeWS and runs on OPEN WINDOWS 1.0.
+% It could be made to run much faster if parts of it were written in C, using
+% NeWS mainly for its display and input capabilities, but that is left as an
+% exercise for the reader.  Spider may also run with little or no modification
+% on subsequent releases of OPEN WINDOWS, but no guarantee is made on this
+% point (nor any other; see above!).  To run Spider, feed this file to 'psh'.
+%
+% Author:       Don Woods
+%               woods at sun.com
+%
+%               Sun Microsystems, Inc.
+%               2550 Garcia Avenue
+%               Mountain View, CA  94043
+*/ 
+
+kreversi is based on code of Mats Luthman's <Mats.Luthman at sylog.se>, but he
+and kreversi's author agreed on releasing it under GPL.
+
+ktetrix :
+Copyright (C) 1994 by Eirik Eng. Do whatever you want with this code. 
+
+parts are from gnu libtool :
+## libtool.m4 - Configure libtool for the target system.  -*-Shell-script-*-
+## Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+## 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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.
+
+
+--------------------
+
+                  GNU Free Documentation License
+                    Version 1.2, November 2002
+
+
+   Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+       59 Temple Place, Suite 330, Boston, MA  02111-1307  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/kdegames/debian/icons/atlantik-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/atlantik-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/atlantik-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,74 @@
+/* XPM */
+static char *atlantik16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 52 1",
+"  c black",
+". c #191919",
+"X c gray22",
+"o c #393939",
+"O c #414141",
+"+ c gray28",
+"@ c gray33",
+"# c #565656",
+"$ c #486448",
+"% c #4C614C",
+"& c #5F795F",
+"* c gray38",
+"= c #646464",
+"- c #717171",
+"; c #767D76",
+": c #797979",
+"> c #7E7E7D",
+", c #7E7E7E",
+"< c #7F827F",
+"1 c #808380",
+"2 c #848484",
+"3 c #868686",
+"4 c #898989",
+"5 c #859985",
+"6 c #9A9B9A",
+"7 c #9D9F9D",
+"8 c #A0A0A0",
+"9 c gray64",
+"0 c #A1AEA1",
+"q c #B4B4B4",
+"w c #90C990",
+"e c #A9DAA9",
+"r c #BEF2BE",
+"t c #C2C2C0",
+"y c gray80",
+"u c #D7D7D7",
+"i c gainsboro",
+"p c #C3E2C3",
+"a c #E6E6E6",
+"s c #E7E7E7",
+"d c gray91",
+"f c #EAEAEA",
+"g c gray92",
+"h c #EDEEED",
+"j c #EFEFEF",
+"k c #ECFBEC",
+"l c gray94",
+"z c #F1F1F1",
+"x c gray98",
+"c c #FDFDFB",
+"v c gray100",
+"b c None",
+/* pixels */
+"b*************bb",
+"*tc>c>c>c>c>ctXb",
+"*cr&r&r&k&r&rwXb",
+"*>&&&&&&;&&&&$Xb",
+"*cr&rrrekrr&rwXb",
+"*>&&r%rekrr&&$Xb",
+"*cr&rrrekrr&rwXb",
+"*>&06<1775r&&$Xb",
+"#vpyu=-h9Xr&rwXb",
+"=>>vvvvhXXr&&$Xb",
+"=v4 vi x#Xr&rwXb",
+"*>2vzi9z#X&&&$Xb",
+"*c2vfuqa.Xr&rwXb",
+"*w3 vv z+Xw$wwXb",
+"bX:vffvaOXXXXXbb",
+"bbXXXXXXXbbbbbbb"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/atlantik.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/atlantik.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/atlantik.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,231 @@
+/* XPM */
+static char *atlantik[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 193 2",
+"   c #000000",
+".  c #060807",
+"X  c #0A0A0A",
+"o  c #131414",
+"O  c #161619",
+"+  c #151B16",
+"@  c #171A19",
+"#  c #1B1B1D",
+"$  c #1E1D20",
+"%  c #1B211B",
+"&  c #242424",
+"*  c #212F23",
+"=  c #2A2A2A",
+"-  c #243225",
+";  c #263528",
+":  c #2A3B2C",
+">  c #323232",
+",  c #3C3C3C",
+"<  c #2D422F",
+"1  c #2E4130",
+"2  c #324634",
+"3  c #344836",
+"4  c #3E4140",
+"5  c #403F40",
+"6  c #454545",
+"7  c #4A494A",
+"8  c #425242",
+"9  c #535353",
+"0  c #5B5B5B",
+"q  c #5E745E",
+"w  c #616161",
+"e  c #6A6B6A",
+"r  c #667766",
+"t  c #737173",
+"y  c #757E76",
+"u  c #7D7D7D",
+"i  c #5C7296",
+"p  c #4E60AB",
+"a  c #5264A6",
+"s  c #5568A2",
+"d  c #4D9B4D",
+"f  c #6C836C",
+"g  c #6E8F6F",
+"h  c #639563",
+"j  c #699469",
+"k  c #708E6E",
+"l  c #718571",
+"z  c #748D74",
+"x  c #749573",
+"c  c #77917D",
+"v  c #759B75",
+"b  c #7C947C",
+"n  c #7B9A7C",
+"m  c #74A774",
+"M  c #7DA37D",
+"N  c #7FA97F",
+"B  c #75B375",
+"V  c #70D670",
+"C  c #6D8682",
+"Z  c #759190",
+"A  c #6F8ABA",
+"S  c #7FA480",
+"D  c #7EA883",
+"F  c #708AD3",
+"G  c #708ADC",
+"H  c #6F89E6",
+"J  c #85456A",
+"K  c #866A53",
+"L  c #99654F",
+"P  c #9A6651",
+"I  c #90765D",
+"U  c #CC3D30",
+"Y  c #CF4133",
+"T  c #8D925A",
+"R  c #92975F",
+"E  c #9E9954",
+"W  c #849372",
+"Q  c #869B7E",
+"!  c #8FA374",
+"~  c #91A17F",
+"^  c #91AB7F",
+"/  c #98A17E",
+"(  c #BDCB5B",
+")  c #B0C166",
+"_  c #D1A434",
+"`  c #C9D55E",
+"'  c #D3DF5C",
+"]  c #838383",
+"[  c #8A8A8A",
+"{  c #829782",
+"}  c #819C83",
+"|  c #8A9C8B",
+" . c #949594",
+".. c #949A94",
+"X. c #9A9C9A",
+"o. c #84A483",
+"O. c #85AA85",
+"+. c #87AD8A",
+"@. c #89A389",
+"#. c #8AAD8B",
+"$. c #8DAB90",
+"%. c #87B18B",
+"&. c #8BB28C",
+"*. c #8FB390",
+"=. c #93AE81",
+"-. c #94AC8B",
+";. c #9CA582",
+":. c #91AD93",
+">. c #9DA19C",
+",. c #94B494",
+"<. c #96B49A",
+"1. c #94BB94",
+"2. c #9AB59A",
+"3. c #98BD95",
+"4. c #99BB99",
+"5. c #A0A49F",
+"6. c #A3BC89",
+"7. c #A8B39F",
+"8. c #A5A5A5",
+"9. c #A4A8A3",
+"0. c #ABABAB",
+"q. c #A0BFA0",
+"w. c #A9B4A0",
+"e. c #ACB1AB",
+"r. c #B5B5B5",
+"t. c #BABBBA",
+"y. c #96C596",
+"u. c #97C299",
+"i. c #9BC49C",
+"p. c #9DCB9D",
+"a. c #B6D49C",
+"s. c #BFDF9D",
+"d. c #A3C5A3",
+"f. c #A2CEA2",
+"g. c #A8C7A8",
+"h. c #AACBAB",
+"j. c #A3D2A3",
+"k. c #A7D4A9",
+"l. c #A3DCA3",
+"z. c #ACD4AB",
+"x. c #ADDCAD",
+"c. c #AFD1B1",
+"v. c #B4CDB4",
+"b. c #BBC1BA",
+"n. c #B8CBB9",
+"m. c #B0D8AA",
+"M. c #B2D4B2",
+"N. c #B3DAB3",
+"B. c #B9DDB9",
+"V. c #ACE3AC",
+"C. c #B3E4B4",
+"Z. c #B6E9B6",
+"A. c #B6ECB9",
+"S. c #BCE6BB",
+"D. c #BAECBA",
+"F. c #BDF1BD",
+"G. c #C7B890",
+"H. c #D2C49B",
+"J. c #C0C1BF",
+"K. c #D5EA9E",
+"L. c #CEECA8",
+"P. c #C2EFBC",
+"I. c #D7EBA0",
+"U. c #DFFFB5",
+"Y. c #C5C5C5",
+"T. c #C6C9C5",
+"R. c #C9CDC7",
+"E. c #CCCCCC",
+"W. c #CDD2CC",
+"Q. c #D0D7CE",
+"!. c #D3D3D3",
+"~. c #D5DCD4",
+"^. c #DBDCDB",
+"/. c #C1E4C2",
+"(. c #C4EBC4",
+"). c #C9EEC9",
+"_. c #C5F3C5",
+"`. c #C6F9C6",
+"'. c #CCF5CC",
+"]. c #C9F8C2",
+"[. c #CCFACC",
+"{. c #DCE2DB",
+"}. c #D1FFC9",
+"|. c #D1F6D1",
+" X c #D4FBD4",
+".X c #E3E3E3",
+"XX c #E5EBE4",
+"oX c #EBECEB",
+"OX c #ECF3EB",
+"+X c #F0F7EF",
+"@X c #F4F4F4",
+"#X c #FEFEFE",
+"$X c None",
+/* pixels */
+"  O # # # O $ O @ $ O @ $ o $ $ o $ $ o $ # @ $ $ # X       X $X",
+"O Y.OXOXW.e.+Xb.b.OX0.W.OX>.{.XXX.oX^.8.OXE.r.OXOXW.4       X $X",
+"# OX_.`.k.&.`.u.1.Z.M u.m.v M.(.| )./.:. Xc.4.|.[.V.3       X $X",
+"$ OX`.`.x.;.H.;./ G.W u.C.v m.I. at .|.(.-.U.a.4.[.[.V.3       X .X",
+"# W.z.x.i.I U L P Y K +.i.j ) ` { M.h.! ' ) ,.N.N.y.:       X .X",
+"O e.*.#.R S %.+.o.o.D S @.~ :.:.2.7.2.2.<.#.j m ,.M ;       X .X",
+"# OX[.I._ *.F.Z.C.p.j.C.S.V.(.|.|. X X X XN.d V  XC.3       X .X",
+"# b.i.6.E %.A.C.p.O.+.z.S.x.(.|.|.|.|.|.|.c.h B f.&.;       X .X",
+"O b.i.6.E +.D.f.O.f.i.-.N.x.).|.|.|.|.|.[.c.h B d.&.;       X .X",
+"$ OX[.I._ +.j.+.f.V.u.,.S.m.).|.|.|.[.'.[.c.d V  XV.3       X .X",
+"O e.*.=.T +.x.&.u.1.&.B.(.x.).|.|.|.|.'.[.z.j m 3.M -       X .X",
+"@ W.k.k.1.O.C.j.O.&.N.S.(.B.).|.|.|.|.[.[.z.-.N.N.y.:       X .X",
+"$ OX_.F.f.o.V.k.p.f.N.B./.k.(.).'.'.'.'.[.k.2.[.[.V.3       X .X",
+"O 5.o.S x S f.1.,.3.4.q.g.,.h.M.B./.(._.'.z.n @.O.x -       X .X",
+"# {.C.w.J g +.n x z c Q } g } @.:.q.z.(.'.m.s F P.j.1       X .X",
+"$ XXZ.w.J | W.^.~.!.E.~.^.^.^.E.l l l N._.x.a G ].l.2       X .X",
+"o >.n b 8.T.E.E.r.0 > i Y.!.Y.X.0 % x n F.z.c } @.x -       X .X",
+"# XXB.n.!.!.!.!.!.E.E.E.E.Y. .e 0 o b ,.2.z.<.`._.V.2       X .X",
+"# ~.f.v.#X#X#X#X#X#X#X#X at X0.e w 7 o f } _.h.-.S.C.p.1       X .X",
+"o >.{ r.#X^.!. at X#XoXE.!..X0.e 0 X X q k._.k.C Z +.v -       X .X",
+"$ OXk.t.!.6 > r.#X9.= 6 E.0.e 0 $ o S h._.x.a H [.V.3       X .X",
+"# T.,.t.E.& o  .#X] o & t.0.e w 4 o f *.k.4.i A m.1.:       X .X",
+"@ e. at .r.OX8.[ ^. at XE.I  .E.0.e w 7 o q r t y o.u.1.N ;       X .X",
+"$ OXh.r.#X#X#X at XoXoXoX.X!.8.7 0 0 + ! l 8.| 2.[.`.V.3       X .X",
+"$ OXh.r.+X0. .!.oXY.Z  .Y.8.$ 0 0 % q.#.[.z.3.`.`.V.3       X .X",
+"@ N.u.t.Y.& O [ oXI o & 8.8.5 w 0 % y.v V.1.D V.V.l.3       X .X",
+". < 8 t.Y., & X..X] # > 8.8.9 0 & X < - 3 : ; 3 < 3 +       X $X",
+"    # r..Xt.r.E.!.Y.X.8.t.8.w &                             X $X",
+"    . 9 oX.XoX.X.X^..X^.^.] &                               X $X",
+"      X = = = = = = = = = O                                 X $X",
+"                                                            $X$X",
+"$X                                                    $X$X$X$X$X"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kasteroids-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kasteroids-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kasteroids-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+/* XPM */
+static char *kasteroids16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 10 1",
+"  c black",
+". c navy",
+"X c blue",
+"o c #FFA858",
+"O c yellow",
+"+ c #808080",
+"@ c #A0A0A4",
+"# c #FFDCA8",
+"$ c #C0C0C0",
+"% c None",
+/* pixels */
+"%   % #%%%%%%%%%",
+" $+@ %Oo%%%%%%%%",
+" $$@ %% %%%%%%%%",
+"%   %%%%% %%%%%%",
+"%%%%%%%%%#O%%%%%",
+" %%%%%%%%%o %%%%",
+"#O%%%%%%%%%% %%%",
+"%o %%%%%  %%% %%",
+"%%%%%%% $$ %%% %",
+"%%% #%% $XX % % ",
+"%%%%Oo%% ..X %%%",
+"%%%%% %%% ..X %%",
+"%%%%%% %%% $$ %%",
+"%%%%%%% % %  %%%",
+"%%%%%%%% %%%%%%%",
+"%%%%%%%%% %%%%%%"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kasteroids.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kasteroids.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kasteroids.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,134 @@
+/* XPM */
+static char *kasteroids[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 96 2",
+"   c black",
+".  c #000001",
+"X  c #161715",
+"o  c #1A1B19",
+"O  c #1B1B1B",
+"+  c #1C1C19",
+"@  c #2F302E",
+"#  c #353732",
+"$  c #353635",
+"%  c #3A3A39",
+"&  c #3D3E38",
+"*  c #3C3E3B",
+"=  c #3F3E3B",
+"-  c #4B4A45",
+";  c #4C4B45",
+":  c #51514B",
+">  c #52534C",
+",  c #53534D",
+"<  c #52534F",
+"1  c #52554E",
+"2  c #54564D",
+"3  c #585950",
+"4  c #5A5A54",
+"5  c #5A5C54",
+"6  c #5C5C55",
+"7  c #5E5E56",
+"8  c #5A5A5C",
+"9  c #67665D",
+"0  c #666664",
+"q  c #6D6B63",
+"w  c #6E6D66",
+"e  c #6E6F66",
+"r  c #717167",
+"t  c #71716A",
+"y  c #75746A",
+"u  c #767674",
+"i  c #787870",
+"p  c #7D7D75",
+"a  c #7E7E7C",
+"s  c navy",
+"d  c #0202AC",
+"f  c #0202DC",
+"g  c #1212DC",
+"h  c #4E4EE4",
+"j  c red",
+"k  c #EE7604",
+"l  c #83847A",
+"z  c #84857B",
+"x  c #85847A",
+"c  c #89897D",
+"v  c #8B8B7F",
+"b  c #FFA858",
+"n  c #F6B66C",
+"m  c #808080",
+"M  c #828284",
+"N  c #868684",
+"B  c #898981",
+"V  c #8B8B83",
+"C  c #8D8B82",
+"Z  c #8C8D82",
+"A  c #8F8F83",
+"S  c #8C8C85",
+"D  c #8D8E84",
+"F  c #8D9086",
+"G  c #96958A",
+"H  c #97968C",
+"J  c #99998D",
+"K  c #929294",
+"L  c #9C9B90",
+"P  c #A0A090",
+"I  c #A0A094",
+"U  c #AAAA9E",
+"Y  c #ABAAA0",
+"T  c #ADADA1",
+"R  c gray66",
+"E  c #AAAAAC",
+"W  c #AEAEAC",
+"Q  c #B3B4A4",
+"!  c #B4B4A4",
+"~  c #BAB8A7",
+"^  c #BFBEB1",
+"/  c #BEBEBC",
+"(  c #C0C0B3",
+")  c #C4C1B2",
+"_  c #FFDCA8",
+"`  c #C0C0C0",
+"'  c #C2C2C4",
+"]  c #C6C6C4",
+"[  c #CECECC",
+"{  c #D6D6D4",
+"}  c #FFFFC0",
+"|  c gray90",
+" . c gray93",
+".. c #FEFEFC",
+"X. c gray100",
+"o. c None",
+/* pixels */
+"o.o.o.o.o.        o.o.o.      o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.",
+"o.o.o.  X * 6 t y   o.o.  } _   o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.",
+"o.o.  o $ < p C I P   o.  _ j n   o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.",
+"o.  + * - q S c Y T   o.o.  n j b   o.o.o.o.o.o.o.o.o.o.o.o.o.o.",
+"o.+ # , 5 r x F ~ Q   o.o.o.  b k   o.o.o.o.o.o.o.o.o.o.o.o.o.o.",
+"  @ < , e x G U (   o.o.o.o.        o.o.o.o.o.o.o.o.o.o.o.o.o.o.",
+"  * 6 3 S C J ! )   o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.",
+"  % 1 e J v Z (   o.o.o.o.o.o.o.o.o.      o.o.o.o.o.o.o.o.o.o.o.",
+"  6 > H x F v   o.o.o.o.o.o.o.o.o.o.  } _   o.o.o.o.o.o.o.o.o.o.",
+"o.  ; i 9     o.o.o.o.o.o.o.o.o.o.o.  _ j n   o.o.o.o.o.o.o.o.o.",
+"o.o.      o.o.o.o.o.o.o.o.o.o.o.o.o.o.  n j b   o.o.o.o.o.o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.  b k   o.o.o.o.o.o.o.o.",
+"      o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.      o.o.o.o.o.o.o.o.",
+"  } _   o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.      o.o.o.o.o.",
+"  _ j n     o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.  ` X.  o.o.o.o.",
+"o.  n j b   o.o.o.o.o.o.o.o.o.o.          o.o.o.  8 ` X.  o.o.o.",
+"o.o.  b k   o.o.o.o.o.o.o.o.o.  0 a ] { R   o.o.o.  m ` X.  o.o.",
+"o.o.o.      o.o.o.o.o.o.o.o.o.  M / {  .| E   o.  a   8 ` X.  o.",
+"o.o.o.o.o.o.o.      o.o.o.o.o.  E [ / X. .' R   K ` `   m ` X.  ",
+"o.o.o.o.o.o.o.  } _   o.o.o.o.  N / / f f h / E   ` E a   m 8   ",
+"o.o.o.o.o.o.o.  _ j n   o.o.o.  u W /   d X.h ` R   m   o.    o.",
+"o.o.o.o.o.o.o.o.  n j b   o.o.o.  a /   s d X.h / E   o.o.o.o.o.",
+"o.o.o.o.o.o.o.o.o.  b k   o.o.o.o.  m `   s d g h ` E   o.o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.      o.o.o.o.o.  m `   s d g h / E   o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.      o.  a   m `   s d   ` m   o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.  ` X.  K ` /   m `     ` m     o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.  8 ` X.  ` E m   m ` ` m   / m   o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.o.  m ` X.  m   o.  m m   ` E   o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.  8 ` X.  o.o.o.      m   o.o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.  m ` X.  o.o.o.o.o.  o.o.o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.  m 8   o.o.o.o.o.o.o.o.o.o.o.",
+"o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.    o.o.o.o.o.o.o.o.o.o.o.o."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/katomic-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/katomic-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/katomic-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,99 @@
+/* XPM */
+static char *katomic16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 77 1",
+"  c black",
+". c #000202",
+"X c #000B0B",
+"o c #000D0D",
+"O c #000F0F",
+"+ c #0C0C0C",
+"@ c #0C0D0D",
+"# c #001B1B",
+"$ c #031B1B",
+"% c #001C1C",
+"& c #031C1C",
+"* c #091717",
+"= c #170000",
+"- c #180000",
+"; c #161616",
+": c #161717",
+"> c #1B1616",
+", c #1A1D1D",
+"< c #1C1D1D",
+"1 c #1D1C1C",
+"2 c #1D1D1D",
+"3 c #082121",
+"4 c #1A2828",
+"5 c #241818",
+"6 c #261A1A",
+"7 c #321A1A",
+"8 c #004040",
+"9 c #004949",
+"0 c #007373",
+"q c #007474",
+"w c #037878",
+"e c #4A0000",
+"r c #570E0E",
+"t c #7F0000",
+"y c #7F0A0A",
+"u c #4E5050",
+"i c #4F5050",
+"p c #5E4646",
+"a c #515151",
+"s c #008181",
+"d c #008282",
+"f c #02D2D2",
+"g c #00E8E8",
+"h c #15E7E7",
+"j c #17E5E5",
+"k c #418282",
+"l c #41B6B6",
+"z c #42B4B4",
+"x c #840F0F",
+"c c #883636",
+"v c #A90303",
+"b c #DB0303",
+"n c #E20000",
+"m c #E80000",
+"M c #FE0000",
+"N c red",
+"B c #FF0303",
+"V c #F51D1D",
+"C c #F81515",
+"Z c #E94242",
+"A c #E56565",
+"S c #848484",
+"D c #92A9A9",
+"F c #9DABAB",
+"G c #B29D9D",
+"H c #A4A2A2",
+"J c #A5A7A7",
+"K c #A6A5A5",
+"L c #ABADAD",
+"P c #ACACAC",
+"I c #ADACAC",
+"U c #B1CACA",
+"Y c #CDB1B1",
+"T c #C7C7C7",
+"R c #C7C8C8",
+"E c #C8C7C7",
+"W c None",
+/* pixels */
+"WWWW#gsWWWWWWWWW",
+"WWWWXlkWWWWWWWWW",
+"WWWWWSSWWWWWWWWW",
+"WWWWWSSWWWWWWWWW",
+"WWWWWiJ at WWWWWWWW",
+"WWWW rAx=WWWWWWW",
+"WWWWemNNv62224w9",
+"WWWWtNNNCYREEUhs",
+"WWWWyNNNb7222,&O",
+"WWW:GZnVcWWWWWWW",
+"WW:IL6-pH at WWWWWW",
+" 3FI:WW at KaWWWWWW",
+"&fl>WWWWiD*WWWWW",
+"Oq8WWWWW&jwWWWWW",
+"WWWWWWWWO08WWWWW",
+"WWWWWWWWWWWWWWWW"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/katomic.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/katomic.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/katomic.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,43 @@
+/* XPM */
+static char *katomic[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 5 1",
+"  c black",
+". c cyan",
+"X c red",
+"o c gray100",
+"O c None",
+/* pixels */
+"OOOOOOOOOO...OOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOO...OOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOO...OOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOooOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOooOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOooOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOooOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOooOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOooOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOooOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOooOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOXXXXXOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOXXXXXXXOOOOOOOOOOOOOOO",
+"OOOOOOOOOXXXXXXXXXOOOOOOOOOO...O",
+"OOOOOOOOOXXXXXXXXXoooooooooo...O",
+"OOOOOOOOOXXXXXXXXXoooooooooo...O",
+"OOOOOOOOOXXXXXXXXXOOOOOOOOOOOOOO",
+"OOOOOOOOOXXXXXXXXXOOOOOOOOOOOOOO",
+"OOOOOOOOOoXXXXXXXOOOOOOOOOOOOOOO",
+"OOOOOOOOoooXXXXXoOOOOOOOOOOOOOOO",
+"OOOOOOOoooOOOOOooOOOOOOOOOOOOOOO",
+"OOOOOOoooOOOOOOOooOOOOOOOOOOOOOO",
+"OOOOOoooOOOOOOOOooOOOOOOOOOOOOOO",
+"OOOOoooOOOOOOOOOOooOOOOOOOOOOOOO",
+"OO...oOOOOOOOOOOOooOOOOOOOOOOOOO",
+"OO...OOOOOOOOOOOOOooOOOOOOOOOOOO",
+"OO...OOOOOOOOOOOOO...OOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOO...OOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOO...OOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kbackgammon-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kbackgammon-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kbackgammon-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,39 @@
+/* XPM */
+static char *kbackgammon16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 17 1",
+"  c black",
+". c gray19",
+"X c #400000",
+"o c #400040",
+"O c #404000",
+"+ c #585858",
+"@ c #800000",
+"# c #C05800",
+"$ c #FF8000",
+"% c #808080",
+"& c #A0A0A0",
+"* c #FFDCA8",
+"= c #C3C3C3",
+"- c gainsboro",
+"; c #FFC0C0",
+": c #FFFFC0",
+"> c None",
+/* pixels */
+">>>>>>>>>>>>>>>>",
+">>>>>>>>>>>>>>>>",
+"@.%X&X%#X.%X&X%#",
+"@+=.=O&%@+=.=O&#",
+"+%*+-+-##%-+-%=%",
+"#&-&*&*%#&*%-&*%",
+"%*--:=:%$=:-:=:$",
+"#::::::$%::::::%",
+"%::::::%#::::::$",
+"#:=:=:;&#:=:=:-%",
+"%*&-&-=#%*&-&-&#",
+"#-+-+-%+#-+-+-&+",
+"#=O=.=+O#=O=.=+@",
+"+%.&X&Oo#%.&X&OX",
+">>>>>>>>>>>>>>>>",
+">>>>>>>>>>>>>>>>"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kbackgammon.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kbackgammon.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kbackgammon.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,188 @@
+/* XPM */
+static char *kbackgammon[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 150 2",
+"   c black",
+".  c #020201",
+"X  c #070705",
+"o  c #11110D",
+"O  c #14140F",
+"+  c #1E110D",
+"@  c #1E1E17",
+"#  c #330000",
+"$  c #350201",
+"%  c #380503",
+"&  c #23231A",
+"*  c #3A2D22",
+"=  c #38382A",
+"-  c #3A3A2C",
+";  c #3D3D2E",
+":  c #3F3F30",
+">  c #400000",
+",  c #4C0000",
+"<  c #510000",
+"1  c #562323",
+"2  c #641717",
+"3  c #6A1D1D",
+"4  c #643130",
+"5  c #7B2E2E",
+"6  c #424231",
+"7  c #444433",
+"8  c #4F4F3B",
+"9  c #54543F",
+"0  c #5E513D",
+"q  c #4B4B41",
+"w  c #565641",
+"e  c #53534B",
+"r  c #595943",
+"t  c #5B5B45",
+"y  c #5E5E47",
+"u  c #5D5D53",
+"i  c #7B4848",
+"p  c #7A6D52",
+"a  c #717158",
+"s  c #757558",
+"d  c #77775A",
+"f  c #7A7A5C",
+"g  c #6F6F64",
+"h  c #797962",
+"j  c #7E7E78",
+"k  c #800000",
+"l  c #853838",
+"z  c #855251",
+"x  c #9B4E4D",
+"c  c #9A4E4E",
+"v  c #A46969",
+"b  c #A87575",
+"n  c #828261",
+"m  c #878765",
+"M  c #82826A",
+"N  c #898967",
+"B  c #998C69",
+"V  c #91916D",
+"C  c #93936F",
+"Z  c #969671",
+"A  c #95957B",
+"S  c #999973",
+"D  c #9C9C77",
+"F  c #9E9E77",
+"G  c #94948B",
+"H  c #99998F",
+"J  c #A5A58F",
+"K  c #A8A880",
+"L  c #AFAF84",
+"P  c #BAAD82",
+"I  c #B7B78A",
+"U  c #BABA8C",
+"Y  c #BCBC8E",
+"T  c #BBBB92",
+"R  c #ADADA3",
+"E  c #BABAA2",
+"W  c #BDBDA4",
+"Q  c #C2B6AF",
+"!  c #C9BCAE",
+"~  c #C4C493",
+"^  c #C9C997",
+"/  c #CCCC99",
+"(  c #CECE9B",
+")  c #D8CC99",
+"_  c #D1D19D",
+"`  c #CBCBA5",
+"'  c #D0C3AE",
+"]  c #D7CAAE",
+"[  c #D6D6A1",
+"{  c #DDD1AD",
+"}  c #D8D8A3",
+"|  c #DBDBA5",
+" . c #DDDDA7",
+".. c #D3D3B9",
+"X. c #DFDFB9",
+"o. c #E5D8AD",
+"O. c #EBDEAD",
+"+. c #E8E8AE",
+"@. c #E2E2BB",
+"#. c #EDEDB2",
+"$. c #EFEFB4",
+"%. c #F2E5AC",
+"&. c #F0F0BC",
+"*. c #F4F4B8",
+"=. c #F7F7BA",
+"-. c #FCFCBE",
+";. c #C3C3C3",
+":. c #C4C4C2",
+">. c #C5C5C2",
+",. c #C7C7C2",
+"<. c #C8C8C2",
+"1. c #CACAC2",
+"2. c #CBCBC2",
+"3. c #CCCCC2",
+"4. c #CDCDC2",
+"5. c #CFCFC2",
+"6. c #D0D0C2",
+"7. c #D2D2C2",
+"8. c #D5D5C2",
+"9. c #D7D7C1",
+"0. c #D6D6C2",
+"q. c #D8D8C1",
+"w. c #D9D9C1",
+"e. c #DADAC1",
+"r. c #DDDDC1",
+"t. c #DEDEC1",
+"y. c #DFDFC1",
+"u. c #E1E1C1",
+"i. c #E2E2C1",
+"p. c #E3E3C1",
+"a. c #E4E4C1",
+"s. c #E5E5C1",
+"d. c #E7E7C1",
+"f. c #E8E8C1",
+"g. c #EBEBC0",
+"h. c #EDEDC0",
+"j. c #F0F0C0",
+"k. c #F1F1C0",
+"l. c #F2F2C0",
+"z. c #F3F3C0",
+"x. c #F4F4C0",
+"c. c #F6F6C0",
+"v. c #F7F7C0",
+"b. c #F8F8C0",
+"n. c #FAFAC0",
+"m. c #FBFBC0",
+"M. c #FDFDC0",
+"N. c #FEFEC0",
+"B. c #FFFFC0",
+"V. c None",
+/* pixels */
+"V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.",
+"V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.",
+"V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.",
+"> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > ",
+"k < , 5 c l , , c c 2 , 3 c x k k < , 5 c l , , c c 2 , 3 c c k ",
+"k +   j ;.R   X >.;.u   e >.4.k k +   j >.R   X <.;.u . e ;.1.k ",
+"k *   J ;...  & 4.;.M   h >.5.k k *   J ;...  & 4.;.M . z ;.7.2 ",
+"k 0   ` ;.s.O 6 0.;.K   D ;.7.k k 0   ` ;.s.O 6 0.;.K X F ;.X.k ",
+"k p   &.;.h.= t r.<./   Y 1.r.k 2 p   &.;.h.= t r.<./   Y 1.t.k ",
+"k B @ M.;.x.w d s.5.$.  } 7.s.k k B & M.;.x.w d a.6.$.  } 7.s.k ",
+"k P ; M.<.M.f C g.9.M.o *.9.h.k k P ; M.,.m.f C g.0.N.O *.w.g.2 ",
+"k ) t M.7.-.S L l.p.M.7 M.p.l.k k ) t M.5.M.S L z.y.N.7 n. at .=.k ",
+"k %.N -.p.M.U ( m.s.M.n M.g.m.k k %.B -.p.M.U ( m.g.M.n m.f.n.k ",
+"k %.~ M.l.M.} +.M.l.M.U M.l.M.k k %.~ -.l.M.} +.M.x.M.U m.l.M.k ",
+"k %.-.M.M.M.-.M.M.M.M.-.M.M.M.k k %.-.M.M.M.M.M.M.M.M.M.M.M.M.k ",
+"k %.M.M.M.M.M.M.M.M.M.M.M.M.M.k k %.M.M.M.M.M.M.M.M.M.M.M.M.M.k ",
+"k %.M.M.M.M.M.M.M.M.M.M.M.M.M.k k %.M.M.M.M.M.M.M.M.M.M.M.M.M.k ",
+"k %.M.M.M.M.M.M.M.M.M.M.M.M.M.k k %.M.M.M.M.M.M.M.M.M.M.M.M.M.k ",
+"k %.l.M.^ M.x.M.M.^ M.x.M.^ -.k k %.l.M.^ M.x.M.M.^ -.l.-.^ M.k ",
+"k %.s.M.N M.g.x.=.C M.s.M.C =.k k %.s.M.N M.g.x.-.C M.s.M.C =.k ",
+"k O.t.M.8 M.s.l. .s -.7.M.s [ k k O.r.M.8 M.s.l.} d M.5.M.s _ k ",
+"k o.0.M.& #.r.g.U 9 M.<.M.r I 2 k o.5.M.& #.r.g.U w M.,.M.t U k ",
+"2 { 1.M.  _ 0.p.F = M.,.b.- S k k { 4.-.  _ 9.s.F = m.;.m.= S k ",
+"k ] >. .  L 7.9.f o l.;.=.@ z k k ] ,. .  L 5.9.f O l.;.l.O d k ",
+"k ] :.T . C ,.7.t   @.>.X.  t 2 k ' ;.T   C <.5.y   @.;.X.  t k ",
+"k ! :.A   a ;.3.:   W >.E   : k k ! ;.A   a >.<.6   W ;.E   ; k ",
+"k ! :.g   q ;.>.&   H ;.G   @ k k Q ;.g   q ;.,.&   H >.G   @ k ",
+"k v b 4 $ 1 b b % # z b i # $ k k v b 4 # 1 b b % # z b i # $ k ",
+", , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ",
+"V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.",
+"V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.",
+"V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kbattleship-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kbattleship-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kbattleship-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,262 @@
+/* XPM */
+static char *kbattleship16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 240 2",
+"   c #3A4173",
+".  c #3A4273",
+"X  c #3A4274",
+"o  c #3A4374",
+"O  c #3B4374",
+"+  c #3B4375",
+"@  c #3A4376",
+"#  c #3C4375",
+"$  c #3C4376",
+"%  c #3C4474",
+"&  c #3C4475",
+"*  c #3C4575",
+"=  c #3D4474",
+"-  c #3D4475",
+";  c #3D4575",
+":  c #3C4476",
+">  c #3C4576",
+",  c #3D4476",
+"<  c #3D4576",
+"1  c #3D4577",
+"2  c #3D4677",
+"3  c #3E4575",
+"4  c #3F4575",
+"5  c #3E4476",
+"6  c #3E4576",
+"7  c #3E4676",
+"8  c #3E4677",
+"9  c #3F4676",
+"0  c #3F4677",
+"q  c #404676",
+"w  c #424776",
+"e  c #444877",
+"r  c #424979",
+"t  c #454C7A",
+"y  c #454D7B",
+"u  c #454D7E",
+"i  c #474D7C",
+"p  c #464D7E",
+"a  c #464E7E",
+"s  c #474F7E",
+"d  c #494C7D",
+"f  c #494E7D",
+"g  c #494F7E",
+"h  c #49517F",
+"j  c #5D4F70",
+"k  c #5D5177",
+"l  c #53606F",
+"z  c #58626F",
+"x  c #635170",
+"c  c #7D5164",
+"v  c #696F71",
+"b  c #6F7678",
+"n  c #6D747C",
+"m  c #707175",
+"M  c #767376",
+"N  c #73777D",
+"B  c #767478",
+"V  c #767A70",
+"C  c #737D7F",
+"Z  c #7B7F7B",
+"A  c #494F80",
+"S  c #475283",
+"D  c #485080",
+"F  c #485180",
+"G  c #495181",
+"H  c #485381",
+"J  c #4B5380",
+"K  c #4B5383",
+"L  c #4B5483",
+"P  c #4E5385",
+"I  c #4C5482",
+"U  c #4D5482",
+"Y  c #4D5582",
+"T  c #4F5683",
+"R  c #4C5484",
+"E  c #505986",
+"W  c #565D89",
+"Q  c #595F87",
+"!  c #5D648D",
+"~  c #5D6B93",
+"^  c #656D83",
+"/  c #656E86",
+"(  c #656D8B",
+")  c #606F97",
+"_  c #697289",
+"`  c #6B748C",
+"'  c #65759B",
+"]  c #6A7190",
+"[  c #6F739B",
+"{  c #6A789F",
+"}  c #767F80",
+"|  c #767E82",
+" . c #7B7E82",
+".. c #707890",
+"X. c #717A93",
+"o. c #757C97",
+"O. c #6A7CA3",
+"+. c #6C7BA2",
+"@. c #7E8368",
+"#. c #7D816D",
+"$. c #758082",
+"%. c #768082",
+"&. c #778085",
+"*. c #788183",
+"=. c #798384",
+"-. c #7B8585",
+";. c #7A8486",
+":. c #7A8586",
+">. c #7B8587",
+",. c #7B8288",
+"<. c #79848E",
+"1. c #7C8789",
+"2. c #7E898B",
+"3. c #7F888A",
+"4. c #7F888B",
+"5. c #7F8A8A",
+"6. c #7C888C",
+"7. c #7F8A8D",
+"8. c #867773",
+"9. c #887176",
+"0. c #9C7769",
+"q. c #917270",
+"w. c #A45250",
+"e. c #A65D5A",
+"r. c #A16156",
+"t. c #AE7464",
+"y. c #BA7663",
+"u. c #BA7468",
+"i. c #C17F5B",
+"p. c #DA6947",
+"a. c #C77362",
+"s. c #8C7F80",
+"d. c #8D8F4C",
+"f. c #818858",
+"g. c #85885C",
+"h. c #8E807D",
+"j. c #A6AB53",
+"k. c #ABB054",
+"l. c #C38757",
+"z. c #D48C5C",
+"x. c #D19058",
+"c. c #CC9965",
+"v. c #CEA666",
+"b. c #E68053",
+"n. c #E18A5D",
+"m. c #EB914C",
+"M. c #ED9851",
+"N. c #F08352",
+"B. c #F6A159",
+"V. c #ECA26A",
+"C. c #F6B66B",
+"Z. c #FDC763",
+"A. c #818283",
+"S. c #828485",
+"D. c #808B8D",
+"F. c #818B8D",
+"G. c #828B8F",
+"H. c #828D8F",
+"J. c #838D8F",
+"K. c #808392",
+"L. c #818994",
+"P. c #818B96",
+"I. c #838C93",
+"U. c #858893",
+"Y. c #868992",
+"T. c #868F91",
+"R. c #858A9D",
+"E. c #8D8F9E",
+"W. c #889195",
+"Q. c #8A9397",
+"!. c #8E9597",
+"~. c #8C9799",
+"^. c #8C969C",
+"/. c #8F989C",
+"(. c #978E8F",
+"). c #9D8985",
+"_. c #919A9B",
+"`. c #919B9C",
+"'. c #92989F",
+"]. c #929B9F",
+"[. c #9A9393",
+"{. c #989B9D",
+"}. c #999F9F",
+"|. c #878EAC",
+" X c #898FA0",
+".X c #898DA7",
+"XX c #8E94A4",
+"oX c #8D94AD",
+"OX c #939DA0",
+"+X c #959DB0",
+"@X c #9AA4A9",
+"#X c #9BA7A8",
+"$X c #9DAAAD",
+"%X c #A5918D",
+"&X c #B68A83",
+"*X c #A2ABAD",
+"=X c #A2ADAF",
+"-X c #ACADAF",
+";X c #A0ADB2",
+":X c #A2ACB1",
+">X c #A4ADB0",
+",X c #ABB6B8",
+"<X c #B4BFBF",
+"1X c #A1B4CD",
+"2X c #AFBBC0",
+"3X c #AFC7DC",
+"4X c #B8C0C2",
+"5X c #BCC7C7",
+"6X c #BAC1CB",
+"7X c #BDC3D0",
+"8X c #FED98C",
+"9X c #FEDB8C",
+"0X c #FEE383",
+"qX c #FEE68A",
+"wX c #FEE394",
+"eX c #FEF3A2",
+"rX c #FEF2AC",
+"tX c #FEF5AD",
+"yX c #FEF0B3",
+"uX c #FEF6B2",
+"iX c #FEF9BF",
+"pX c #FEFBBF",
+"aX c #C5CBD9",
+"sX c #C5CADA",
+"dX c #C5CCDA",
+"fX c #C7CDDD",
+"gX c #C6CCDE",
+"hX c #C8CDDD",
+"jX c #C9CFDD",
+"kX c #C9CEDE",
+"lX c #C8CDE0",
+"zX c #C8DCEA",
+"xX c #CFE2EF",
+"cX c #D2E0EB",
+"vX c #DFEEF5",
+"bX c #FEFCC5",
+"nX c #FFFCCA",
+"mX c #FEFDCC",
+"MX c #FEFED5",
+"NX c #FEFEDD",
+/* pixels */
+"gXdX7X:X,X=X_.J.6XdXfXfXdXhXlXhX",
+"|.oX+X<X4X5X=X_.XXE..XY.K.^.U.R.",
+"` $X2X-X=X:X at X1.S.n d.g.V ^ _ [ ",
+"z P. at X'.N F.^.m M  .Z #.v o...! ",
+"l f.k.j. at .B (.q.y.u.).[.!.'.Y.W ",
+"<.6.2.-.,.b A.t.b.C.n.&X%XOXP.Y ",
+"%.6.F.} } *.8.m.qXtX8XN.a.{.( g ",
+"C H.F.C =.F.0.Z.tXnXiX8Xp.x p g ",
+"5.H.F.:.:.h.z.0XmXNXMXyXV.e.k g ",
+"W.I.~.:.:.h.M.eXbXiXuXwXB.w.S E ",
+"Q.]._.I.| 9.i.c.z.v.l.r.c j p J ",
+"/ X.( ! Y L g g g Y P S J K J J ",
+"3 5 5 8 r r p y p u J +.+.5 @ 5 ",
+"3 q 3 3 3 @ 3 : @ 3 3 ' 3X1XS @ ",
+"3 @ 3 : 3 3 3 = @ 3 3 3 O.zXcX~ ",
+"3 . 3 r 3 @ 3 w . @ 3 : @ ~ xXvX"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kbattleship.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kbattleship.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kbattleship.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,294 @@
+/* XPM */
+static char *kbattleship[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 256 2",
+"   c #353D71",
+".  c #3C4375",
+"X  c #3D4578",
+"o  c #394476",
+"O  c #414D59",
+"+  c #404676",
+"@  c #404678",
+"#  c #414876",
+"$  c #434A7A",
+"%  c #494D7D",
+"&  c #494776",
+"*  c #435260",
+"=  c #4C5564",
+"-  c #45507E",
+";  c #49507D",
+":  c #554872",
+">  c #505A64",
+",  c #5B567F",
+"<  c #5B6568",
+"1  c #5F6A70",
+"2  c #7C485E",
+"3  c #7C535B",
+"4  c #614D70",
+"5  c #6F5062",
+"6  c #6F5674",
+"7  c #7C4D63",
+"8  c #715A77",
+"9  c #636755",
+"0  c #747747",
+"q  c #737657",
+"w  c #686869",
+"e  c #636C7D",
+"r  c #676D75",
+"t  c #69727C",
+"y  c #6C7577",
+"u  c #706A6C",
+"i  c #726A7F",
+"p  c #717866",
+"a  c #737479",
+"s  c #747D7C",
+"d  c #7A7A7E",
+"f  c #717376",
+"g  c #3D4D80",
+"h  c #434D80",
+"j  c #4B4E81",
+"k  c #4B5382",
+"l  c #4F5883",
+"z  c #495786",
+"x  c #515583",
+"c  c #515986",
+"v  c #525A89",
+"b  c #595E8A",
+"n  c #5B638B",
+"m  c #5A6489",
+"M  c #5A6792",
+"N  c #666C84",
+"B  c #666D89",
+"V  c #6A6E97",
+"C  c #636890",
+"Z  c #667284",
+"A  c #6C7383",
+"S  c #6B738C",
+"D  c #6F7983",
+"F  c #66749B",
+"G  c #757D81",
+"H  c #737C8B",
+"J  c #7A7E83",
+"K  c #747C94",
+"L  c #737A9B",
+"P  c #727BA3",
+"I  c #758183",
+"U  c #798284",
+"Y  c #7B8589",
+"T  c #7D8886",
+"R  c #7D888B",
+"E  c #758288",
+"W  c #7C8492",
+"Q  c #7A809A",
+"!  c #7E8994",
+"~  c #778391",
+"^  c #6C82A9",
+"/  c #7D86A4",
+"(  c #7686A9",
+")  c #7C93B3",
+"_  c #80575F",
+"`  c #945856",
+"'  c #895561",
+"]  c #945661",
+"[  c #98685B",
+"{  c #887A7A",
+"}  c #9B7269",
+"|  c #9E7E7A",
+" . c #947570",
+".. c #906967",
+"X. c #A5564F",
+"o. c #A05654",
+"O. c #B85B56",
+"+. c #A86652",
+"@. c #A7785E",
+"#. c #B8604B",
+"$. c #B56D5E",
+"%. c #AB6B62",
+"&. c #A27B6A",
+"*. c #A97872",
+"=. c #BC7465",
+"-. c #DB5F3D",
+";. c #DA693D",
+":. c #EA7D3E",
+">. c #C25745",
+",. c #C9664B",
+"<. c #C36753",
+"1. c #CE754D",
+"2. c #D5664B",
+"3. c #DA754D",
+"4. c #D97A52",
+"5. c #C27563",
+"6. c #E46546",
+"7. c #E4724D",
+"8. c #E77550",
+"9. c #F27A47",
+"0. c #8E7E81",
+"q. c #97983A",
+"w. c #B8BB2C",
+"e. c #B4BA36",
+"r. c #868A44",
+"t. c #939743",
+"y. c #858456",
+"u. c #86877C",
+"i. c #9D847F",
+"p. c #91986F",
+"a. c #919773",
+"s. c #8A8B6B",
+"d. c #9BA477",
+"f. c #A1867D",
+"g. c #A2AA78",
+"h. c #A8B077",
+"j. c #BAC126",
+"k. c #C68158",
+"l. c #DF8B5F",
+"z. c #CF816B",
+"x. c #C38070",
+"c. c #EE8C43",
+"v. c #E38B5D",
+"b. c #EE935C",
+"n. c #F58C4A",
+"m. c #F79D55",
+"M. c #E49167",
+"N. c #FC9E60",
+"B. c #FCAD4E",
+"V. c #FCAF5D",
+"C. c #FDBE4C",
+"Z. c #FCB757",
+"A. c #ECA472",
+"S. c #FDB768",
+"D. c #FDBE71",
+"F. c #F7A866",
+"G. c #FAC052",
+"H. c #FDC668",
+"J. c #F8C87E",
+"K. c #FFD66D",
+"L. c #FFD378",
+"P. c #FEDD7C",
+"I. c #FFD370",
+"U. c #FEE87C",
+"Y. c #82848C",
+"T. c #818B8D",
+"R. c #8A8A8B",
+"E. c #878484",
+"W. c #848D92",
+"Q. c #8A8D91",
+"!. c #898E9B",
+"~. c #81889A",
+"^. c #879284",
+"/. c #869093",
+"(. c #87919A",
+"). c #889394",
+"_. c #8B949A",
+"`. c #8E999B",
+"'. c #8E9897",
+"]. c #9E8C8B",
+"[. c #928888",
+"{. c #929A9B",
+"}. c #939598",
+"|. c #8D96A5",
+" X c #8898B6",
+".X c #919CA2",
+"XX c #9399AA",
+"oX c #9294A7",
+"OX c #9196B3",
+"+X c #9499B3",
+"@X c #9698B7",
+"#X c #868DA7",
+"$X c #97A1A4",
+"%X c #9AA3A5",
+"&X c #9CA5A9",
+"*X c #9DA9AC",
+"=X c #97A2A8",
+"-X c #AB8B86",
+";X c #A69694",
+":X c #B48581",
+">X c #A2ADAB",
+",X c #AAA9AB",
+"<X c #A5A3A6",
+"1X c #A2AAB3",
+"2X c #ADAFBE",
+"3X c #A4B1B3",
+"4X c #ABB4BA",
+"5X c #ADBABC",
+"6X c #AAB3B5",
+"7X c #B2BBBC",
+"8X c #8FA7C3",
+"9X c #9DB3CC",
+"0X c #9CB6D0",
+"qX c #ADB5C1",
+"wX c #A5BCD2",
+"eX c #B0B2C3",
+"rX c #B4B6CD",
+"tX c #B3BEC2",
+"yX c #B4B8CA",
+"uX c #B8B9CD",
+"iX c #AEC0D4",
+"pX c #B4C1C5",
+"aX c #BBC4C6",
+"sX c #B1C5DD",
+"dX c #FED383",
+"fX c #FEDD8D",
+"gX c #FFDD84",
+"hX c #FEE584",
+"jX c #FFEC8E",
+"kX c #FEE993",
+"lX c #FDEE9C",
+"zX c #FFE49F",
+"xX c #FFF29C",
+"cX c #FFF095",
+"vX c #FEE7A3",
+"bX c #FEF3A4",
+"nX c #FEF5AE",
+"mX c #FFFAAC",
+"MX c #FEF8A4",
+"NX c #FFF6BF",
+"BX c #FEF9B3",
+"VX c #FEFCBA",
+"CX c #C3CCD1",
+"ZX c #C7D1D3",
+"AX c #C4DBEC",
+"SX c #DBE2EE",
+"DX c #DBE3F2",
+"FX c #D6EAF5",
+"GX c #FEFCC4",
+"HX c #FFFECB",
+"JX c #FEFED3",
+"KX c #FEFEDB",
+"LX c #ECFAFD",
+"PX c #E7F5FC",
+"IX c #F1FCFE",
+"UX c #E6EAF5",
+/* pixels */
+"SXDXSXSXDXaX|.*X3X3X>X&X%X/.'.T pXUXSXSXSXDXDXSXUXDXSXSXDXDXSXDX",
+"rXyXyXqXqXeX1XtXtXpX6X1X%X'.'.T.1XqXeXqXuXuXuXuX2XeXrXyXrXuXyXyX",
+"OXOXOXOXOX+XpXaXaXaXZXZXtX{.{.{.oX at X+X@X at X@X at X!.r #X+X at XoXoX_.oX",
+"/ / #X|..X1X5X7X7X7XtX5X6X{.{.'._.!.R Y L ~.^.t Y.!.Q.E.J J H / ",
+"F L `.*X4XqX6X,X5X1X*X$X$X{.R R {.[.J t y.e.s.0.{ f t N N S P L ",
+"t Z &XtXpXtX<X7X>X&X3X5X3X1XT.J G f r t w t.q.0 r.B N S S N V V ",
+"e D ! CXaX7X,X,XR.u R $X(.R r < f u a Y.y q q.9 9 Z L K ~.V C C ",
+"O > = ~ R ! ! W H r < /.$X=Xd { { a y Q.R.W.W R w D K K K B n b ",
+"* r < p.d.;Xh.h.p.u.y Q.<X]...` $.[.*.:X].'.`.$Xs W.`./.R Y n b ",
+". y < j.w.w.j.q.0 p w u E.[.0.[.5.3.2.$.*.i.-X;X*X%X{.$X{.! c c ",
+"1 E I /.).).^.R R U w y T E.u.$.,.6.m.v.7.5.:X;X;X}.`.<X{.H l l ",
+"(.`.R E E G J I E U I s G { %.3.n.F.hXL.V.M.z.-X-X-X}.>X.XS j k ",
+"E Y E T T I I E U J s U I ..,.B.L.kXbXlXfXS.9.8.5.=.;X>X{.m % ; ",
+"G I T .X`.I s s s G I R U } :.Z.jXxXVXVXnXfXN.9.3.5.%X! C ; ; ; ",
+"s y U .X).I I s G U T T.I @.G.K.kXnXGXNXBXBXkXF.6.<.8 $ $ - % k ",
+"I I U )./.I U I U R /.R { ,.Z.P.vXHXJXJXJXGXmXdX8.2.` $ j % ; $ ",
+"T R T.`.).R T.T T T Y.W. .n.H.hXBXKXKXKXJXJXHXvXA.b.,._ 4 & % $ ",
+"/.T.T T.T.R U G I U { } k.G.U.MXGXKXKXKXKXHXGXzXJ.l.O.] 6 , x j ",
+"(./.T `..XW.U U J U Y &.:.C.hXVXKXKXJXKXHXGXVXvXL.m.#.2 - v b v ",
+").).R W.`.'.Y T T U Y.| ,.H.jXVXVXnXmXMXxXxXgXD.m.9.-.2 h $ l l ",
+"W.W.W..X$X(.R T.T R R.*.4.H.I.U.H.S.U.K.G.Z.c.2.>.` ` : $ j - z ",
+"`.{.$X*X%X`.).T.G A A 3 ' +.] ` #.X.+.[ ` 3 5 : : j h $ j - k l ",
+"R )..X.X!.K S n x j j % % $ X : # % $ h k h g h - k l k z l z c ",
+"; ; ; b n x x l c c v l k k k k k k v b c b v z k l k l j j j X ",
+". . . . . X X @ $ ; k ; ; ; ; k j k k v l c n M M j X X o . X @ ",
+"+ + + + @ @ . . X . . . # + # X $ @ . . . z (  X0XP $ o o o . . ",
+". $ $ + . @ X # . @ . . . # . X X o @ @ . @ F ) iXAX0Xz   o # X ",
+". . . . . . . . o # . . @ X . . . . . . @ X c F 8XAXFXAX( o   o ",
+". . o . X # + . . # . o # + . . + . o . . + + l ^ 0XAXPXPX Xz . ",
+"@ @   o . . . o . . # @ . . + . . . . o . .     o F 0XFXIXPXwXz ",
+"+ . . . . + # + . .   . . # & . o . . . . . o   . . M 9XFXIXIXsX",
+". .   . + # & # . . + . . + # + . . + . . . o . . . . m 0XFXLXIX"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kblackbox-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kblackbox-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kblackbox-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,30 @@
+/* XPM */
+static char *kblackbox16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 8 1",
+"  c black",
+". c gray19",
+"X c #404000",
+"o c #585858",
+"O c #808000",
+"+ c #C0C000",
+"@ c #808080",
+"# c None",
+/* pixels */
+"######     #####",
+"###   .o...    #",
+"   ......o..o.. ",
+" o.ooooo......o ",
+" ..XOOO.oooo.o. ",
+" .+O.XXOO...o.. ",
+" .X+...XO+.. at .o ",
+"# ...o..OO+.o.. ",
+"# .....X+O+.o.o ",
+"# .o..++O+X.o.. ",
+"## ...X....o.. #",
+"## ..OOX..oo.o #",
+"##  ..+O.o.o. ##",
+"####   ....o. ##",
+"#######   .o ###",
+"##########   ###"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kblackbox.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kblackbox.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kblackbox.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,293 @@
+/* XPM */
+static char *kblackbox[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 255 2",
+"   c black",
+".  c #0C0C0C",
+"X  c gray5",
+"o  c #161616",
+"O  c #1B1B35",
+"+  c #1E1E36",
+"@  c #1E1E37",
+"#  c #29290B",
+"$  c #2A2A0C",
+"%  c #2C2C0A",
+"&  c #34341C",
+"*  c #393919",
+"=  c #202020",
+"-  c gray13",
+";  c #232323",
+":  c gray14",
+">  c #252525",
+",  c gray15",
+"<  c #272727",
+"1  c #2A2A27",
+"2  c #282828",
+"3  c gray16",
+"4  c #2A2A2A",
+"5  c gray17",
+"6  c #2A2A2F",
+"7  c #2C2C2C",
+"8  c #2D2D2D",
+"9  c gray18",
+"0  c #2F2F2F",
+"q  c #212134",
+"w  c #232336",
+"e  c #242431",
+"r  c #242437",
+"t  c #262635",
+"y  c #272735",
+"u  c #272736",
+"i  c #202038",
+"p  c #21213A",
+"a  c #222238",
+"s  c #25253A",
+"d  c #272739",
+"f  c #2B2B32",
+"g  c #292937",
+"h  c #2A2A34",
+"j  c #2A2A35",
+"k  c #2B2B34",
+"l  c #2B2B35",
+"z  c #2A2A37",
+"x  c #2B2B37",
+"c  c #2D2D32",
+"v  c #2F2F30",
+"b  c #2C2C35",
+"n  c #2D2D34",
+"m  c #2C2C37",
+"M  c #2D2D37",
+"N  c #2B2B38",
+"B  c #2A2A3D",
+"V  c #2E2E3C",
+"C  c #2E2E3F",
+"Z  c #31312A",
+"A  c #37372F",
+"S  c #3C3C28",
+"D  c gray19",
+"F  c #303031",
+"G  c #313131",
+"H  c #303033",
+"J  c #313132",
+"K  c #313133",
+"L  c #323232",
+"P  c gray20",
+"I  c #313134",
+"U  c #323234",
+"Y  c #333334",
+"T  c #333335",
+"R  c #343433",
+"E  c #353532",
+"W  c #373731",
+"Q  c #343434",
+"!  c #343435",
+"~  c #353535",
+"^  c #343436",
+"/  c gray21",
+"(  c #373737",
+")  c #333338",
+"_  c #33333B",
+"`  c #373738",
+"'  c #36363B",
+"]  c #37373B",
+"[  c #35353C",
+"{  c #383834",
+"}  c gray22",
+"|  c #393939",
+" . c #38383B",
+".. c #3A3A3A",
+"X. c gray23",
+"o. c #3C3C3C",
+"O. c gray24",
+"+. c #3E3E3E",
+"@. c #3F3F3F",
+"#. c #2D2D46",
+"$. c #313143",
+"%. c #373740",
+"&. c #323248",
+"*. c #30304C",
+"=. c #3C3C40",
+"-. c #3A3A48",
+";. c #3D3D48",
+":. c #393953",
+">. c #3C3C51",
+",. c #545400",
+"<. c #575700",
+"1. c #5E5E00",
+"2. c #44442D",
+"3. c #414133",
+"4. c #474731",
+"5. c #41413C",
+"6. c #43433D",
+"7. c #44443D",
+"8. c #494931",
+"9. c #494932",
+"0. c #55552A",
+"q. c #56562B",
+"w. c #5A5A2A",
+"e. c #616115",
+"r. c #727209",
+"t. c #70700F",
+"y. c #707019",
+"u. c #73731E",
+"i. c #7C7C13",
+"p. c #79791C",
+"a. c #7E7E1B",
+"s. c #626232",
+"d. c #717130",
+"f. c #7C7C33",
+"g. c gray25",
+"h. c #414141",
+"j. c gray26",
+"k. c #434343",
+"l. c #444444",
+"z. c gray27",
+"x. c #464646",
+"c. c #464647",
+"v. c gray28",
+"b. c #43434D",
+"n. c #47474C",
+"m. c #47474D",
+"M. c #484848",
+"N. c #494949",
+"B. c gray29",
+"V. c #4B4B4B",
+"C. c #4C4C4C",
+"Z. c gray30",
+"A. c #4E4E4E",
+"S. c #4E4E4F",
+"D. c gray31",
+"F. c #4A4A51",
+"G. c #4E4E54",
+"H. c #505050",
+"J. c #515151",
+"K. c gray32",
+"L. c #535353",
+"P. c gray33",
+"I. c #555555",
+"U. c gray34",
+"Y. c #545458",
+"T. c #585858",
+"R. c gray35",
+"E. c #5A5A5A",
+"W. c #5B5B5B",
+"Q. c gray36",
+"!. c gray37",
+"~. c #737340",
+"^. c #606060",
+"/. c #626262",
+"(. c gray39",
+"). c #646464",
+"_. c #656565",
+"`. c gray40",
+"'. c #676767",
+"]. c DimGray",
+"[. c #6A6A6A",
+"{. c gray42",
+"}. c #6C6C6C",
+"|. c #6F6F6F",
+" X c gray44",
+".X c #717171",
+"XX c #727272",
+"oX c #7B7B7F",
+"OX c #7C7C7C",
+"+X c #828204",
+"@X c #848409",
+"#X c #86860F",
+"$X c #89890C",
+"%X c #848416",
+"&X c #8B8B1C",
+"*X c #9D9D00",
+"=X c #9D9D0E",
+"-X c #939311",
+";X c #929215",
+":X c #92921B",
+">X c #999916",
+",X c #9D9D16",
+"<X c #99991A",
+"1X c #81812D",
+"2X c #83832D",
+"3X c #8B8B26",
+"4X c #858531",
+"5X c #9E9E2B",
+"6X c #A1A107",
+"7X c #AEAE09",
+"8X c #ACAC0E",
+"9X c #A1A113",
+"0X c #A2A213",
+"qX c #A4A412",
+"wX c #A4A417",
+"eX c #A5A51D",
+"rX c #B5B501",
+"tX c #B5B50D",
+"yX c #B9B901",
+"uX c #BBBB0C",
+"iX c #BFBF0A",
+"pX c #BEBE0E",
+"aX c #B3B31A",
+"sX c #BBBB12",
+"dX c #B8B81B",
+"fX c #BABA1B",
+"gX c #BBBB1A",
+"hX c #BBBB1C",
+"jX c #A5A524",
+"kX c #ADAD2B",
+"lX c #BDBD24",
+"zX c #929252",
+"xX c #C4C403",
+"cX c #C4C404",
+"vX c #C5C507",
+"bX c #C1C109",
+"nX c #C3C30C",
+"mX c #C4C409",
+"MX c #CFCF0C",
+"NX c #C1C11B",
+"BX c #C3C319",
+"VX c #C7C71E",
+"CX c #CFCF16",
+"ZX c #CECE1A",
+"AX c #CCCC1E",
+"SX c #D3D300",
+"DX c #C6C622",
+"FX c #CACA23",
+"GX c #CECE34",
+"HX c #D1D122",
+"JX c #E2E208",
+"KX c #F3F315",
+"LX c #EAEA22",
+"PX c #DCDC74",
+"IX c None",
+/* pixels */
+"IXIXIXIXIXIXIXIXIXIXIXIXIX              IXIXIXIXIXIXIXIXIXIXIXIX",
+"IXIXIXIXIXIXIXIXIX  o X . v.B.OXB. at .B.(               IXIXIXIXIX",
+"IXIXIXIXIX  > > > @.'.B.v./. at .X.'. at .|.E.C.v./.S.B.E.XX          ",
+"IX        v.v.v.v.v. at .@. at .S.@.H.].S.U.XXE.].E. at .@. at .H.'.v.B.G   ",
+"  ( 9 ` ( v. at .@.5.v.Y.B.v.U. at .@.o. at .@.{.Y.X. at .H.H.@. at .H.H.5 9   ",
+"  G B.M.G G G G 9 ( /. at .@.E.v.B.l.v.v. at .5.@. at .S.@.v.]./.5 > 5   ",
+"  G k.X.G X.B.( ( G.G 9 @.v.6 G Z O.O. at .@. at .E.B.S.l.( B.; > >   ",
+"  @. at .0 ( F.t -._ ` ( G ( XXo.( o.C.O.I I ( X.X.U. at .; > > 5 >   ",
+"IX  S.O.1 # 9X%X& # Z M m.oXS.0 ( G X. at .( G ( @.Z < > 5 < 5   IX",
+"IX  b.s.,.p.s $.$X9X>X1.<.5.5.0 0 I G G G ( G v. at .9 9 9 > 6   IX",
+"IX  C pXrX* s Y.G.t #.d.0X*X+Xe.f.t I ( ( G 9 @.` 5 > > : (   IX",
+"IX  m.C PXFX8Xq M.I O.%.t k iX$X;Xd.4.k G ( G v.!.I G E.5 G   IX",
+"IXIX  6 7.tXvXw.0 I X.G G M kX6X%XeXlX8.M ( 9 X.M.( ; 6 G     IX",
+"IXIX  H.k E A E M ( ( X. at .I $XGXr.wXDXjX3.I @.B.H.> 5 U.5   IXIX",
+"IXIX  G G G H.X.( I ( G U. at .w dXt.dXVXHX2XN H.G ( 1 ( : 5   IXIX",
+"IXIX  5 G G B.X.Z @.9 ( @.G i &Xi.aXNXAXLXO E I 9 5 0 : 5.  IXIX",
+"IXIXIX  G X.I G I /.G ( G k u.=X,XNXCXZXbXi ( I 9 1 9 v.o   IXIX",
+"IXIXIX  @. at .E ( G 5.G ( N 1X7X-X at XiXyXSXa.k I ( 9 < @.X.1   IXIX",
+"IXIXIX  X.B.G G ( G N S % hXdXbXnXMX$XE k ( G G 5 > 1 5   IXIXIX",
+"IXIXIX  X.( G @.9 0 O JXKX<X:XE *.&.k E.G ( G B.; 6 5 9   IXIXIX",
+"IXIXIXIX  v.X.B.'. at .O sX9.N k 0 @.( G ( E ( 9 @.: < `   IXIXIXIX",
+"IXIXIXIX  @.9 > /._ >.i %.G I ( S.v.( I ( G ( X.M.X.9   IXIXIXIX",
+"IXIXIXIX  9 @.C.I q.jXy.t ;. at .E.G G E 0 6 G G ( X.(   IXIXIXIXIX",
+"IXIXIXIX    5 0 X.t zXmXcX0.k G @.G ( @.D.H.G E 0 <   IXIXIXIXIX",
+"IXIXIXIXIXIX    @.I :.3X4XnXw ( @.G G 9 @.v.G 9 (   IXIXIXIXIXIX",
+"IXIXIXIXIXIXIXIX    o.k B 2.k B.].S.( ( G G G > 5   IXIXIXIXIXIX",
+"IXIXIXIXIXIXIXIXIXIX    @.X.v.9 l.C.B. at .G @.X. at .  IXIXIXIXIXIXIX",
+"IXIXIXIXIXIXIXIXIXIXIXIX    o.X.9 X.X.G G U.( 9   IXIXIXIXIXIXIX",
+"IXIXIXIXIXIXIXIXIXIXIXIXIXIX    B. at .G ( ( v. at .  IXIXIXIXIXIXIXIX",
+"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX    X.G @.H.v.  IXIXIXIXIXIXIXIX",
+"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX    U.G   IXIXIXIXIXIXIXIXIX",
+"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX    ; IXIXIXIXIXIXIXIXIX"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kbounce-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kbounce-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kbounce-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,40 @@
+/* XPM */
+static char *kbounce16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 18 1",
+"  c black",
+". c #FE0204",
+"X c #F91210",
+"o c #F32627",
+"O c #F4302F",
+"+ c #DF5959",
+"@ c #F04A4A",
+"# c #FE6264",
+"$ c #F87878",
+"% c #FE8684",
+"& c #FE9898",
+"* c #FEAAAC",
+"= c #F9BBB9",
+"- c #F9DFE1",
+"; c #E1E1E1",
+": c #F9F4F4",
+"> c #FEFEFC",
+", c None",
+/* pixels */
+",,,,,;:>>:=,,,,,",
+",,,,>>>>:*..o,,,",
+",,,;>>>>%....o,,",
+",,>>>>>=X.....+,",
+",;>>>>-O.......,",
+",>>>>:#........+",
+",>>>>&.........@",
+";>>>:O.........O",
+",:>>&..........O",
+",>>- at ..........@",
+",:>=...........,",
+",,>$..........o,",
+",,;@.........X,,",
+",,,$........X,,,",
+",,,,+X....o,,,,,",
+",,,,,,,,,,,,,,,,"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kbounce.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kbounce.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kbounce.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,141 @@
+/* XPM */
+static char *kbounce[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 103 2",
+"   c black",
+".  c red",
+"X  c #FF0101",
+"o  c #FF0202",
+"O  c #FF0303",
+"+  c #FF0404",
+"@  c #FF0505",
+"#  c #FE0606",
+"$  c #FF0606",
+"%  c #FF0707",
+"&  c #FB0B0B",
+"*  c #FA0E0E",
+"=  c #FC0808",
+"-  c #FC0909",
+";  c #FE0909",
+":  c #FF0808",
+">  c #FD0E0E",
+",  c #FF0D0D",
+"<  c #F91111",
+"1  c #FB1414",
+"2  c #EF2B2B",
+"3  c #ED2D2D",
+"4  c #E63F3F",
+"5  c #EB3333",
+"6  c #EC3232",
+"7  c #EA3939",
+"8  c #E93D3D",
+"9  c #E93F3F",
+"0  c #F12A2A",
+"q  c #FF2A2A",
+"w  c #FD3737",
+"e  c #FF3535",
+"r  c #FB3838",
+"t  c #FF3838",
+"y  c #DF4F4F",
+"u  c #DF5151",
+"i  c #DE5252",
+"p  c #DE5454",
+"a  c #DC5959",
+"s  c #DC5A5A",
+"d  c #DC5D5D",
+"f  c #E54141",
+"g  c #E44444",
+"h  c #E54545",
+"j  c #E34A4A",
+"k  c #E25454",
+"l  c #FF4A4A",
+"z  c #FF5454",
+"x  c #FF5757",
+"c  c #FF5A5A",
+"v  c #FF6262",
+"b  c #FF6666",
+"n  c #FF6B6B",
+"m  c #FF6E6E",
+"M  c #FF7171",
+"N  c #FF7777",
+"B  c #FF8282",
+"V  c #FF8989",
+"C  c #FF8A8A",
+"Z  c #FF9292",
+"A  c #FFA1A1",
+"S  c #FFA8A8",
+"D  c #FFBABA",
+"F  c #FFBEBE",
+"G  c gainsboro",
+"H  c #FFC3C3",
+"J  c #FFC5C5",
+"K  c #FFC7C7",
+"L  c #FFCBCB",
+"P  c gray89",
+"I  c #E4E4E4",
+"U  c gray90",
+"Y  c #EAE5E5",
+"T  c #EAEAEA",
+"R  c gray92",
+"E  c gray93",
+"W  c #EEEEEE",
+"Q  c #F1EEEE",
+"!  c #FFE0E0",
+"~  c #FFE2E2",
+"^  c #FFE4E4",
+"/  c #FFECEC",
+"(  c #FFEDED",
+")  c #FFEEEE",
+"_  c gray95",
+"`  c #F3F3F3",
+"'  c gray96",
+"]  c gray97",
+"[  c #FBF7F7",
+"{  c #FFF2F2",
+"}  c #FFF6F6",
+"|  c #FFF7F7",
+" . c #F8F8F8",
+".. c #F9F9F9",
+"X. c gray98",
+"o. c #FDFBFB",
+"O. c snow",
+"+. c #FFFBFB",
+"@. c gray99",
+"#. c #FFFDFD",
+"$. c #FEFEFE",
+"%. c gray100",
+"&. c None",
+/* pixels */
+"&.&.&.&.&.&.&.&.&.&.&.&.I X.%.X.` _ W T I &.&.&.&.&.&.&.&.&.&.&.",
+"&.&.&.&.&.&.&.&.&.&.W %.%.%.%.%.%.%.%.} A c r i &.&.&.&.&.&.&.&.",
+"&.&.&.&.&.&.&.&.` %.%.%.%.%.%.%.%.%.{ B . . . . < &.&.&.&.&.&.&.",
+"&.&.&.&.&.&.&.%.%.%.%.%.%.%.%.%.%.( M . @ . . . . @ d &.&.&.&.&.",
+"&.&.&.&.&.&.%.%.%.%.%.%.%.%.%.%.^ v @ @ . . . . . . . &.&.&.&.&.",
+"&.&.&.&.&.X.%.%.%.%.%.%.%.%.%.( l @ @ . @ . @ . . . . > &.&.&.&.",
+"&.&.&.&.X.%.%.%.%.%.%.%.%.%.+.C ; ; @ @ @ . . . . . . . 0 &.&.&.",
+"&.&.&.` %.%.%.%.%.%.%.%.%.%.K ; ; @ ; @ @ . . . . . . . . d &.&.",
+"&.&.&.%.%.%.%.%.%.%.%.%.%.! e @ ; @ @ @ @ . . . . . . . . ; &.&.",
+"&.&.I %.%.%.%.%.%.%.%.%.+.m @ @ @ @ @ @ . @ . . . . . . . . 3 &.",
+"&.&.X.%.%.%.%.%.%.%.%.%.S @ @ @ @ @ . . @ . . . . . . . . . ; &.",
+"&.&.%.%.%.%.%.%.%.%.%.L . @ . @ @ . @ @ . . . . . . . . . . . &.",
+"&.P %.%.%.%.%.%.%.%.+.z . . @ . . @ . . . . . . . . . . . . . &.",
+"&.X.%.%.%.%.%.%.%.%.K . . . . . . . @ . . . . . . . . . . . . &.",
+"&.%.%.%.%.%.%.%.%.+.b . . . . . . . . . . . . . . . . . . . . &.",
+"&.X.%.%.%.%.%.%.%.K . . . . . . . . . . . . . . . . . . . . . p ",
+"&.` %.%.%.%.%.%.%.n . . . . . . . . . . . . . . . . . . . . . f ",
+"&.T %.%.%.%.%.%.F . . . . . . . . . . . . . . . . . . . . . . h ",
+"&.I %.%.%.%.%.( N . . . . . . . . . . . . . . . . . . . . . . &.",
+"&.G %.%.%.%.%.L q . . . . . . . . . . . . . . . . . . . . . * &.",
+"&.&.%.%.%.%.%.C . . . . . . . . . . . . . . . . . . . . . . f &.",
+"&.&.Y %.%.%.%.x . . . . . . . . . . . . . . . . . . . . . . &.&.",
+"&.&.&.+.%.%.~ e . . . . . . . . . . . . . . . . . . . . . & &.&.",
+"&.&.&.&.%.%.D . . . . . . . . . . . . . . . . . . . . . . &.&.&.",
+"&.&.&.&.Q %.Z . . . . . . . . . . . . . . . . . . . . . i &.&.&.",
+"&.&.&.&.&.+.N . . . . . . . . . . . . . . . . . . . . f &.&.&.&.",
+"&.&.&.&.&.&.D > . . . . . . . . . @ . . . . . . . . 5 &.&.&.&.&.",
+"&.&.&.&.&.&.&.e . . . . . @ @ @ @ @ @ . . . . . . 6 &.&.&.&.&.&.",
+"&.&.&.&.&.&.&.&.2 . . . . . @ @ @ @ @ . . . ; f &.&.&.&.&.&.&.&.",
+"&.&.&.&.&.&.&.&.&.&.3 @ @ @ @ @ ; ; @ @ 1 k &.&.&.&.&.&.&.&.&.&.",
+"&.&.&.&.&.&.&.&.&.&.&.&.&.d i j h 8 7 &.&.&.&.&.&.&.&.&.&.&.&.&.",
+"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kenolaba-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kenolaba-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kenolaba-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+/* XPM */
+static char *kenolaba16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 10 1",
+"  c black",
+". c #C00000",
+"X c red",
+"o c #C05800",
+"O c #FFA858",
+"+ c #FFDCA8",
+"@ c #C0C0C0",
+"# c #FFC0C0",
+"$ c gray100",
+"% c None",
+/* pixels */
+"%%%%        %%%%",
+"%%% @@@@@@@@ %%%",
+"%%% @. at .@.@$ %%%",
+"%% @@X#X#X#@$ %%",
+"%% @@@@@@@@@$ %%",
+"% @@@@@@. at .@@$ %",
+"% @@@o@@X#X#@$ %",
+" @@@@O+@@@@@@@$ ",
+" @@@@@@@@@@.@@$ ",
+"% @@o@@@o@@X#$ %",
+"% @@O+@@O+@@@$ %",
+"%% @@@@@@@@@$ %%",
+"%% @@o at o@o@@$ %%",
+"%%% @O+O+O+$ %%%",
+"%%% $$$$$$$$ %%%",
+"%%%%        %%%%"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kenolaba.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kenolaba.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kenolaba.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,279 @@
+/* XPM */
+static char *kenolaba[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 241 2",
+"   c black",
+".  c #020204",
+"X  c #22221C",
+"o  c #3A3A34",
+"O  c #6A6A5C",
+"+  c #737374",
+"@  c #827A58",
+"#  c #817E5C",
+"$  c #967E74",
+"%  c #A27A5C",
+"&  c #BA6244",
+"*  c #BA6E58",
+"=  c #BA725C",
+"-  c #AE7A6C",
+";  c #B27664",
+":  c #BE7E64",
+">  c #DA3E20",
+",  c #E22204",
+"<  c #E73615",
+"1  c #E63E1C",
+"2  c #EA3A1C",
+"3  c #CE462C",
+"4  c #CE522C",
+"5  c #DE4624",
+"6  c #DA4A2C",
+"7  c #DE5234",
+"8  c #DA563C",
+"9  c #DF771C",
+"0  c #CE623C",
+"q  c #DE7E28",
+"w  c #E6421C",
+"e  c #EC4628",
+"r  c #EE4A2C",
+"t  c #EE5634",
+"y  c #F24E34",
+"u  c #E67618",
+"i  c #EE7A14",
+"p  c #EE7E14",
+"a  c #EA7A19",
+"s  c #CC5E44",
+"d  c #DA5E4C",
+"f  c #C6664C",
+"g  c #C07E44",
+"h  c #DE6E54",
+"j  c #EE6A4C",
+"k  c #E2725C",
+"l  c #F6664C",
+"z  c #BE863C",
+"x  c #9E925C",
+"c  c #818260",
+"v  c #808664",
+"b  c #868460",
+"n  c #828A64",
+"m  c #868E6C",
+"M  c #8A8B67",
+"N  c #8E8E60",
+"B  c #8E8E6E",
+"V  c #878674",
+"C  c #82827C",
+"Z  c #86867E",
+"A  c #898A7C",
+"S  c #8E8D7F",
+"D  c #8E9264",
+"F  c #829A74",
+"G  c #8C967C",
+"H  c #8E9A7C",
+"J  c #968264",
+"K  c #928A6C",
+"L  c #9A8E6C",
+"P  c #968A7C",
+"I  c #939266",
+"U  c #939667",
+"Y  c #929A64",
+"T  c #949676",
+"R  c #929278",
+"E  c #949A78",
+"W  c #9A9A79",
+"Q  c #9E9E78",
+"!  c #9EA26C",
+"~  c #AE8A4C",
+"^  c #A8865C",
+"/  c #B68458",
+"(  c #BE8254",
+")  c #BA8A54",
+"_  c #BE9254",
+"`  c #B08E6C",
+"'  c #B68A7C",
+"]  c #BA967C",
+"[  c #A3A27E",
+"{  c #A5A67C",
+"}  c #A2AA7C",
+"|  c #ABAE7F",
+" . c #ACAA7C",
+".. c #B4B47C",
+"X. c #BCB67C",
+"o. c #CE823C",
+"O. c #DA8634",
+"+. c #EB8B34",
+"@. c #F08220",
+"#. c #C48244",
+"$. c #CE9654",
+"%. c #D28644",
+"&. c #DE8E48",
+"*. c #DE9551",
+"=. c #D09C64",
+"-. c #CEAE7C",
+";. c #D6AA6C",
+":. c #E68E40",
+">. c #EE9E54",
+",. c #F2984C",
+"<. c #F28A74",
+"1. c #F28E7C",
+"2. c #E6A25C",
+"3. c #EAAA6C",
+"4. c #F2AE74",
+"5. c #F2B57F",
+"6. c #808A88",
+"7. c #898A88",
+"8. c #888E8A",
+"9. c #8E8E90",
+"0. c #8E9684",
+"q. c #8D9289",
+"w. c #8E9498",
+"e. c #889A9C",
+"r. c #988E88",
+"t. c #939288",
+"y. c #959688",
+"u. c #959A86",
+"i. c #969E8C",
+"p. c #9B968C",
+"a. c #9A9A8C",
+"s. c #9C9E8D",
+"d. c #929294",
+"f. c #959695",
+"g. c #959A98",
+"h. c #949E9C",
+"j. c #9A9A9C",
+"k. c #9D9E9D",
+"l. c #9DA584",
+"z. c #98A290",
+"x. c #9EA394",
+"c. c #96A2A0",
+"v. c #9EA4A1",
+"b. c #A89E8C",
+"n. c #B09684",
+"m. c #B69E8C",
+"M. c #A3A28C",
+"N. c #A4A69C",
+"B. c #ADAE9E",
+"V. c #AAB68C",
+"C. c #BABA88",
+"Z. c #BDBE8F",
+"A. c #B2B29C",
+"S. c #BAB29C",
+"D. c #A2A2A4",
+"F. c #AAAAA3",
+"G. c #A2B2A4",
+"H. c #AEB2A4",
+"J. c #B9B6A7",
+"K. c #B6B6B8",
+"L. c #B2BEB4",
+"P. c #BDBEB0",
+"I. c #BCC288",
+"U. c #BCC49C",
+"Y. c #CA9E8C",
+"T. c #C2A68C",
+"R. c #CEAA94",
+"E. c #C2B284",
+"W. c #DAAEA4",
+"Q. c #D6BEBC",
+"!. c #F29281",
+"~. c #F29D8F",
+"^. c #F4A698",
+"/. c #F6AA94",
+"(. c #FEA694",
+"). c #F2BE8C",
+"_. c #F6BE94",
+"`. c #EEB6AC",
+"'. c #EABEAC",
+"]. c #F8AEA0",
+"[. c #F2BAAC",
+"{. c #FAB6AC",
+"}. c #FABAAC",
+"|. c #C5C28F",
+" X c #C6C690",
+".X c #CECE9C",
+"XX c #D0D29C",
+"oX c #C5C6B0",
+"OX c #C2C2B8",
+"+X c #C6CCB4",
+"@X c #CCCCB3",
+"#X c #D5C2A4",
+"$X c #DEC6A4",
+"%X c #D2D6A0",
+"&X c #DADAA8",
+"*X c #D3D4BC",
+"=X c #E0C28C",
+"-X c #F7C294",
+";X c #F7CA9C",
+":X c #FBC6BC",
+">X c #FAD2A4",
+",X c #F6DABC",
+"<X c #FADEBC",
+"1X c #FCDABC",
+"2X c #E2E2B4",
+"3X c #EAE6BC",
+"4X c #EAEBBF",
+"5X c #FAE2BC",
+"6X c #C1C2C4",
+"7X c #C6C6CC",
+"8X c #CBCBCC",
+"9X c #CAD6C4",
+"0X c #D2CACC",
+"qX c #DEDEC5",
+"wX c #D2D2D4",
+"eX c #D6D6D0",
+"rX c #D9DAD8",
+"tX c #DEDEDD",
+"yX c #F6CEC4",
+"uX c #F6D6D0",
+"iX c #FEDEDC",
+"pX c #E7E6C9",
+"aX c #E8EACE",
+"sX c #E2E2DF",
+"dX c #EAEADF",
+"fX c #F6EED4",
+"gX c #FEECD0",
+"hX c #F2F2C4",
+"jX c #F6F6D8",
+"kX c #FAF2D9",
+"lX c #FAFADC",
+"zX c #FEFEDE",
+"xX c #EEEEE9",
+"cX c #FAE6E4",
+"vX c #F2F2EE",
+"bX c #FEF4EB",
+"nX c #FEFAED",
+"mX c #F6F6F1",
+"MX c #FEFEF5",
+"NX c #F9FAF9",
+"BX c None",
+/* pixels */
+"BXBXBXBXBXBXBX. . . . . . . . . . . . . . . . . . BXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBX. tXtXtXrXrXrXrXrXrXrXrXrXrXrXeXOX. BXBXBXBXBXBXBX",
+"BXBXBXBXBXBX. OXzXjX2XqXsX2X2XsX2X2XsX2X2X*XOXa.F.X BXBXBXBXBXBX",
+"BXBXBXBXBXBX. dXjX9XG.N.N.N.D.v.v.N.N.N.F.[ i.q.s.. BXBXBXBXBXBX",
+"BXBXBXBXBX. 6X1X/.(.r ' g.t.b.'.k - g.f.P W.~.& d.B.. BXBXBXBXBX",
+"BXBXBXBXBX. dX:XiXbXj 8 e.8.'.bX{.> 7.6.Y.mXbX2 ; g.. BXBXBXBXBX",
+"BXBXBXBX. 6XMX~.^.^.1 8 e.Z <.:Xt 1 9.6.* :X<.< - H F.. BXBXBXBX",
+"BXBXBXBX. aXzXyXw , < `.L.x.= < 1 : s.y.J > 2 s r.q.a.. BXBXBXBX",
+"BXBXBXBX. zXNXNX0XQ.uXvXP.B.v.b.b.s.z.E H c @ v G q.g.. BXBXBXBX",
+"BXBXBX. 6XzXmXdX8XdXNXmXdXtXF.k.u.m.[.h ^ m @ R.].s t.F.. BXBXBX",
+"BXBXBX. dXlXvXwX8XNXvXMXMXmXP.f.p.uXbX!.6 F ] bXbXy * i.. BXBXBX",
+"BXBX. OXzXdXwXK.eXvXvXvXvXmX8Xd.$ !.].e 5 F * {.1.2 * w.F.. BXBX",
+"BXBX. dXlXsX7XK.tXsXvXsXtXNXdXB.T & < 5 % H K 3 < 4 S 0.y.. BXBX",
+"BX. OXzXvXsX7X8XeXtXrXP.6XxX6Xx.i.H b # n B U m # v q.q.f.B.. BX",
+"BX. MXlX at XN.f.F.#X;X*.f.D.J.M.Q Q W N c # M R I # T.}.d r.v.. BX",
+". C hXpXB.9.Z m.jXnX,.: 8.k.[ M.[ Q T b c M I T n.cXbXl f h.+ . ",
+". o aX*XJ.9.Z ^ -X5.i ( 6.a.M.M.Q { C.Q I I Q ..: ~.1.< f c.+ . ",
+"BX. F. at XU.a.6.V g i q K C t.s.[ Q Z.4X|.| Z..X2XI.0 < 7 r.D.. BX",
+"BX. O *XoXF.Z A A i.u.8.V A p.s.| 3XfXX.XXlXlXhXC.I.&Xk.g.+ . BX",
+"BXBX. P. at XS.#X>X%.t.s.R Z A I T I.gX<X*.=XzXzX2X..XX at X8.d.. BXBX",
+"BXBX. B.*X$XnXnX at .) u.t.B V V M [ gXlX3.+.zXzX X X4Xk.9.+ . BXBX",
+"BXBXBX. aX;._.3.i / 0.u.y.T N I x 4.).9 +.zX2X..XX.XZ k.. BXBXBX",
+"BXBXBX. OX at X&.u o.A B p.p.W U W ! =.a +.,XhX|.C.4XP.9.+ . BXBXBX",
+"BXBXBXBX. *XoXx.A A V E W Q {  .[ V.U.aXMX3XX.&XpXd.j.. BXBXBXBX",
+"BXBXBXBX. A.+XA.#X1X&.L U Q E.,X3._ } %XkX5X;X*.J.9.9.. BXBXBXBX",
+"BXBXBXBX. V *X#XfXbX,.#.c D ,XnX;Xu N Y =XbXkXi ` f.O . BXBXBXBX",
+"BXBXBXBXBX. *X-.5.4.i z m M 2.-X at .q D U $.-X>.a ` k.. BXBXBXBXBX",
+"BXBXBXBXBX. N.+X$.u O.N I U ~ 9 9 ~ U U { :.p ( f.k.. BXBXBXBXBX",
+"BXBXBXBXBXBX. *XH.u.! { { { l.l.} } { { | Z.+Xw.D.. BXBXBXBXBXBX",
+"BXBXBXBXBXBX. y.a.S f.y.t.y.y.f.y.f.y.f.f.w.9.d.+ . BXBXBXBXBXBX",
+"BXBXBXBXBXBXBX. k.a.j.j.j.j.j.j.g.j.j.j.a.j.g.k.. BXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBX. . . . . . . . . . . . . . . . . . BXBXBXBXBXBXBX"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kfouleggs-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kfouleggs-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kfouleggs-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,93 @@
+/* XPM */
+static char *kfouleggs-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 71 1",
+"  c black",
+". c #0B0E12",
+"X c #202020",
+"o c #2A2E31",
+"O c #373737",
+"+ c #333538",
+"@ c #1A264E",
+"# c #16275F",
+"$ c #122678",
+"% c #2D4271",
+"& c #585A5A",
+"* c #5D5F5F",
+"= c #46556B",
+"- c #677172",
+"; c #63757E",
+": c #6A7070",
+"> c #6C7171",
+", c #6C7272",
+"< c #6E7272",
+"1 c #767B7B",
+"2 c #797D7D",
+"3 c #314A87",
+"4 c #3C588D",
+"5 c #406281",
+"6 c #4678B5",
+"7 c #7C4C99",
+"8 c #4A70C1",
+"9 c #557BC3",
+"0 c #557FC4",
+"q c #748E8F",
+"w c #5685C3",
+"e c #5F8DC4",
+"r c #6092C4",
+"t c #67ABC8",
+"y c #9346B3",
+"u c #846197",
+"i c #A156AE",
+"p c #A87AAF",
+"a c #BE66D6",
+"s c #BE73D6",
+"d c #BF7BD6",
+"f c #828888",
+"g c #898F8F",
+"h c #81A8A8",
+"j c #8AA3A6",
+"k c #9BA0A0",
+"l c #B192B9",
+"z c #A6ABAB",
+"x c #AEA4B3",
+"c c #AFB5B5",
+"v c #B2B8B8",
+"b c #B7BEBE",
+"n c #BABFBF",
+"m c #85BCE7",
+"M c #BDB9C2",
+"N c #93C2C2",
+"B c #8BC4E7",
+"V c #94CDEA",
+"C c #95D9E8",
+"Z c #9BE1E9",
+"A c #9FE6E9",
+"S c #C0B5C4",
+"D c #CBBAD0",
+"F c #F3BBFA",
+"G c #C1C8C8",
+"H c #C6CCCC",
+"J c #C9CFCF",
+"K c #CBD1D1",
+"L c #F2C7FA",
+"P c #F4D1FB",
+"I c None",
+/* pixels */
+"IIIIIIIIIIIIIIII",
+"IIIIIIIIIIIIIIII",
+"IIIIIIIIIIIIIIII",
+"IIIIIIIIIIIIIIII",
+"III &<<<::*XIIII",
+"III1HJGbMDx< III",
+"IIIgKncSPLFp III",
+"IIIfvzkldsai III",
+"III2jNh-uy7+ III",
+"IIIqAZCtVBm5 III",
+"III;rew60984 III",
+"IIIO=3%o@$#.IIII",
+"IIIIIIIIIIIIIIII",
+"IIIIIIIIIIIIIIII",
+"IIIIIIIIIIIIIIII",
+"IIIIIIIIIIIIIIII"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kfouleggs.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kfouleggs.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kfouleggs.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,285 @@
+/* XPM */
+static char *kfouleggs[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 247 2",
+"   c black",
+".  c #020303",
+"X  c gray1",
+"o  c #070709",
+"O  c #090909",
+"+  c #0E0E0E",
+"@  c #0F161A",
+"#  c gray7",
+"$  c #121515",
+"%  c #141717",
+"&  c #181818",
+"*  c #191919",
+"=  c gray10",
+"-  c #1A1D1D",
+";  c #1B1E1E",
+":  c #1D1D1D",
+">  c #141C23",
+",  c #151E28",
+"<  c #1F2528",
+"1  c #1B2532",
+"2  c #202222",
+"3  c #222525",
+"4  c #252525",
+"5  c #262828",
+"6  c #272929",
+"7  c #252A2C",
+"8  c #262B2D",
+"9  c #272B2C",
+"0  c #2B2D2D",
+"q  c #2B2E2E",
+"w  c #323535",
+"e  c #313C47",
+"r  c #253B66",
+"t  c #3A5678",
+"y  c #3D5A75",
+"u  c #46394E",
+"i  c #4A404F",
+"p  c #4D4F4F",
+"a  c #4B5050",
+"s  c #5A5E5E",
+"d  c #4F6665",
+"f  c #5A7376",
+"g  c #616565",
+"h  c #646569",
+"j  c #626F7A",
+"k  c #6E7172",
+"l  c #707575",
+"z  c #717777",
+"x  c #757A7A",
+"c  c #767B7B",
+"v  c #777D7D",
+"b  c #324F95",
+"n  c #3B5E97",
+"m  c #2D50A4",
+"M  c #3050A9",
+"N  c #3250A8",
+"B  c #346297",
+"V  c #3D63AA",
+"C  c #4166AD",
+"Z  c #486CAD",
+"A  c #4D73BB",
+"S  c #4A7EBE",
+"D  c #5174A7",
+"F  c #476EC1",
+"G  c #4871C1",
+"H  c #4973C1",
+"J  c #4B76C1",
+"K  c #4C78C1",
+"L  c #4C7BC3",
+"P  c #5F97A2",
+"I  c #648796",
+"U  c #7C8080",
+"Y  c #7D8282",
+"T  c #7E8485",
+"R  c #738793",
+"E  c #7D949B",
+"W  c #699CBE",
+"Q  c #5282C2",
+"!  c #5385C2",
+"~  c #5488C2",
+"^  c #558AC2",
+"/  c #578DC2",
+"(  c #5187D4",
+")  c #548CD4",
+"_  c #5B90C0",
+"`  c #549EDE",
+"'  c #6699D8",
+"]  c #61A6D7",
+"[  c #60A5DA",
+"{  c #66ACD7",
+"}  c #74AFC3",
+"|  c #76A5DA",
+" . c #7AAADB",
+".. c #78ADDA",
+"X. c #7EAEDB",
+"o. c #78B5D9",
+"O. c #7DD9DE",
+"+. c #74CAE3",
+"@. c #7CCAE8",
+"#. c #A13DBE",
+"$. c #A83EC1",
+"%. c #8C5894",
+"&. c #9B40AA",
+"*. c #8B6192",
+"=. c #9F67A8",
+"-. c #A442BF",
+";. c #AC4EC2",
+":. c #BE62D6",
+">. c #BE66D6",
+",. c #BE6BD6",
+"<. c #BE6FD6",
+"1. c #BF74D6",
+"2. c #C15BD3",
+"3. c #C077D7",
+"4. c #808686",
+"5. c #87878C",
+"6. c #838888",
+"7. c #888C8C",
+"8. c #898F8F",
+"9. c #859096",
+"0. c #899192",
+"q. c #8A9090",
+"w. c #8B9191",
+"e. c #8C9191",
+"r. c #8C9292",
+"t. c #8D9292",
+"y. c #8D9393",
+"u. c #929797",
+"i. c #949999",
+"p. c #98979D",
+"a. c #989B9B",
+"s. c #989C9C",
+"d. c #989E9E",
+"f. c #9A9F9F",
+"g. c #8CA9AF",
+"h. c #80B9BB",
+"j. c #9BA0A0",
+"k. c #9CA2A2",
+"l. c #9FA5A5",
+"z. c #B59FBC",
+"x. c #A0A0A4",
+"c. c #A0A7A7",
+"v. c #A1A6A6",
+"b. c #A2A7A7",
+"n. c #A4A9A9",
+"m. c #A5ABAB",
+"M. c #A6ABAB",
+"N. c #A6ACAC",
+"B. c #A6ADAD",
+"V. c #A7ADAD",
+"C. c #A9AFAF",
+"Z. c #AAAFAF",
+"A. c #ABB0B0",
+"S. c #ACB2B2",
+"D. c #ADB3B3",
+"F. c #AEB3B3",
+"G. c #AFB4B4",
+"H. c #AFB5B5",
+"J. c #B8ABBD",
+"K. c #B0B6B6",
+"L. c #B1B8B8",
+"P. c #B2B8B8",
+"I. c #B2B9B9",
+"U. c #B3B9B9",
+"Y. c #B4BABA",
+"T. c #B7BEBE",
+"R. c #B8BFBF",
+"E. c #BABFBF",
+"W. c #82BAC9",
+"Q. c #83BDDC",
+"!. c #82BAE6",
+"~. c #BE89C8",
+"^. c #84C9C9",
+"/. c #80C3DB",
+"(. c #86C0DC",
+"). c #89C3DC",
+"_. c #8CCAD0",
+"`. c #8ECDD5",
+"'. c #88C9DA",
+"]. c #94D1D5",
+"[. c #89C1E7",
+"{. c #8BC4E7",
+"}. c #8DC7E8",
+"|. c #88CAE9",
+" X c #89CEE9",
+".X c #8FCAE8",
+"XX c #8CD3EA",
+"oX c #92CFE9",
+"OX c #90D8EA",
+"+X c #94D8E8",
+"@X c #97DCE9",
+"#X c #96E7E4",
+"$X c #9AE0E9",
+"%X c #9AE0EA",
+"&X c #9BE3E9",
+"*X c #9DE6E9",
+"=X c #98EDEB",
+"-X c #99EFEB",
+";X c #9FEAE9",
+":X c #9AF1EB",
+">X c #9CF6EB",
+",X c #B9C0C0",
+"<X c #BBC2C2",
+"1X c #BCC1C1",
+"2X c #BEC4C4",
+"3X c #BFC6C6",
+"4X c #A1E1ED",
+"5X c #A0EDE7",
+"6X c #ADECEB",
+"7X c #A6F9ED",
+"8X c #ADF9EE",
+"9X c #D597DA",
+"0X c #DC80EC",
+"qX c #DC89EC",
+"wX c #DD9BEC",
+"eX c #CBB3CE",
+"rX c #DDA8EC",
+"tX c #DDACEC",
+"yX c #DDB0EC",
+"uX c #DDB2EC",
+"iX c #F39CFA",
+"pX c #E2B0EE",
+"aX c #E0BDE4",
+"sX c #F2BBFA",
+"dX c #C2C9C9",
+"fX c #C4C8C8",
+"gX c #C5CBCB",
+"hX c #C7CCCC",
+"jX c #C7CECE",
+"kX c #CFD4D4",
+"lX c #D4D9D9",
+"zX c #E0C0E2",
+"xX c #EFC5F1",
+"cX c #EDCAF0",
+"vX c #F2C1FA",
+"bX c #F2C7FA",
+"nX c #F2CBFA",
+"mX c #F3CFF8",
+"MX c #FFCBFF",
+"NX c #F2D1FA",
+"BX c #F2D7FA",
+"VX c #FFD1FF",
+"CX c #FFD8FF",
+"ZX c #FEDAFE",
+"AX c #FFDDFF",
+"SX c #FFE0FF",
+"DX c None",
+/* pixels */
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDX  p 4.y.y.y.y.y.q.q.6.U x l s 0   DXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDX  x ,XjXjXgXfX,XR.U.D.B.l.f.i.y.U 5   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX$ I.lXkXdX2XR.K.K.V.J.aXcXxXaXz.5.g   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX: I.kXjXE.U.K.Z.b.eXZXSXAXZXVXMX9Xh   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX: K.gXE.K.Z.n.b.x.mXBXNXnXbXvXsXiX*.  DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX: D.U.D.M.b.k.a.p.pXyXyXtXrXwXqX0X%.  DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX: B.V.b.k.a.u.y.7.~.3.1.<.,.>.:.2.i   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX: l.q.y.q.9.T v l k =.;.-.#.$.&.u q   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX: d.E ].6X-X#X^.f p d h.`.'.W.I 8 3   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX; g.;X8X7X>X:X-XO.P $X4XOXXX X|._ <   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX* _.;X*X&X$X at X+X+.@.oX.X}.{.{.!.[ y   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX* } /.(.(.o.o.{ ] [ ..X. .| ' ) ( t   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDXO R W ! / / ! Q S B L K A A G G A >   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDX  w j D Z C C n e 8 r m M M M b 1 . DXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDX  4 5 8 2 > = % # + @ , o . . DXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDXDX"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kgoldrunner-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kgoldrunner-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kgoldrunner-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,96 @@
+/* XPM */
+static char *kgoldrunner-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 74 1",
+"  c #003800",
+". c #003A00",
+"X c #003C00",
+"o c #3A3028",
+"O c #313030",
+"+ c #004000",
+"@ c #004900",
+"# c #004D00",
+"$ c #005700",
+"% c #005900",
+"& c #005D00",
+"* c #154D00",
+"= c #006C00",
+"- c #006D00",
+"; c #006F00",
+": c #007300",
+"> c #007700",
+", c #007E00",
+"< c #007F00",
+"1 c #047C00",
+"2 c #653003",
+"3 c #717100",
+"4 c #737201",
+"5 c #008000",
+"6 c #008100",
+"7 c #008400",
+"8 c #008600",
+"9 c #008700",
+"0 c #008900",
+"q c #008D00",
+"w c #009000",
+"e c #009500",
+"r c #009800",
+"t c #00A300",
+"y c #00A600",
+"u c #00A700",
+"i c #00A800",
+"p c #00AF00",
+"a c #00B000",
+"s c #00B300",
+"d c #00BC00",
+"f c #00D700",
+"g c #789611",
+"h c #7C9E15",
+"j c #C05B00",
+"k c #DB7100",
+"l c #898000",
+"z c #A3A300",
+"x c #BEBD0A",
+"c c #B9AF39",
+"v c #90985F",
+"b c #CA8303",
+"n c #C6942D",
+"m c #C79631",
+"M c #D39A39",
+"N c #CAB500",
+"B c #CBBB0F",
+"V c #F6820C",
+"C c #FA9A39",
+"Z c #F2A74C",
+"A c #F8A653",
+"S c #FBA952",
+"D c #C0C000",
+"F c #D1C72F",
+"G c #D6CA3D",
+"H c #DBCA47",
+"J c #E2C349",
+"K c #E3CF5F",
+"L c #E9D26E",
+"P c #D6C386",
+"I c #FCC682",
+"U c #FDDBA3",
+"Y c #EEEAEE",
+"T c None",
+/* pixels */
+"TTTTTTTTTTTTTTTT",
+"TTTTTTTTTTTTTTTT",
+"TTTTTTTTTTTTTTTT",
+"TTTTTTT5,5TTTTTT",
+"TTT%% y,TTTTTTTT",
+"T9p;q955T&y;TTTT",
+"Tf5 de,9ar1*TTTT",
+"TTTT0,w,+vBDDz3T",
+"TTTs,#@y5hcKIJAm",
+"TT;5$TTi;gFLUGCM",
+"T:y>TTT.PHSxZnkT",
+"TTTTTTTT3bNVljTT",
+"TTTTTTTTTToO2TTT",
+"TTTTTTTTTTTTTTTT",
+"TTTTTTTTTTTTTTTT",
+"TTTTTTTTTTTTTTTT"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kgoldrunner.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kgoldrunner.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kgoldrunner.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,220 @@
+/* XPM */
+static char *kgoldrunner[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 182 2",
+"   c #002C00",
+".  c #002D00",
+"X  c #003800",
+"o  c #003900",
+"O  c #003A00",
+"+  c #003B00",
+"@  c #003C00",
+"#  c #272710",
+"$  c #3A3028",
+"%  c #313030",
+"&  c #004000",
+"*  c #004400",
+"=  c #004900",
+"-  c #004D00",
+";  c #004E00",
+":  c #005300",
+">  c #005700",
+",  c #005800",
+"<  c #005900",
+"1  c #005D00",
+"2  c #104605",
+"3  c #154D00",
+"4  c #006600",
+"5  c #006700",
+"6  c #006C00",
+"7  c #006D00",
+"8  c #006F00",
+"9  c #066C03",
+"0  c #007000",
+"q  c #007100",
+"w  c #007300",
+"e  c #007400",
+"r  c #007600",
+"t  c #007700",
+"y  c #007900",
+"u  c #007C00",
+"i  c #007D00",
+"p  c #007E00",
+"a  c #007F00",
+"s  c #047C00",
+"d  c #255F18",
+"f  c #316300",
+"g  c #553F00",
+"h  c #5C3000",
+"j  c #653003",
+"k  c #663003",
+"l  c #494900",
+"z  c #785F15",
+"x  c #696900",
+"c  c #6C6C00",
+"v  c #707000",
+"b  c #717100",
+"n  c #737201",
+"m  c #008000",
+"M  c #008100",
+"N  c #008200",
+"B  c #008400",
+"V  c #008600",
+"C  c #008700",
+"Z  c #048002",
+"A  c #008800",
+"S  c #008900",
+"D  c #008D00",
+"F  c #009000",
+"G  c #009100",
+"H  c #009300",
+"J  c #009500",
+"K  c #009700",
+"L  c #009800",
+"P  c #009900",
+"I  c #009A00",
+"U  c #1C8A00",
+"Y  c #00A300",
+"T  c #00A400",
+"R  c #00A500",
+"E  c #00A600",
+"W  c #00A700",
+"Q  c #00A800",
+"!  c #00AB00",
+"~  c #00AF00",
+"^  c #00B000",
+"/  c #00B100",
+"(  c #00B300",
+")  c #00B500",
+"_  c #00B700",
+"`  c #00B800",
+"'  c #00BC00",
+"]  c #00BD00",
+"[  c #00D100",
+"{  c #00D300",
+"}  c #00D600",
+"|  c #00D700",
+" . c #00DB00",
+".. c #00E800",
+"X. c #00F000",
+"o. c #00FE00",
+"O. c #789611",
+"+. c #7C9E15",
+"@. c #8E4600",
+"#. c #807F00",
+"$. c #8A643D",
+"%. c #877332",
+"&. c #AA6404",
+"*. c #B06600",
+"=. c #C05B00",
+"-. c #CE6403",
+";. c #C67F00",
+":. c #DB7100",
+">. c #D87F00",
+",. c #EE7D00",
+"<. c #808000",
+"1. c #82820C",
+"2. c #898000",
+"3. c #9D8000",
+"4. c #9D8935",
+"5. c #909638",
+"6. c #A68100",
+"7. c #A3A300",
+"8. c #BEBD09",
+"9. c #BEBD0A",
+"0. c #B9AF39",
+"q. c #90985F",
+"w. c #B49F72",
+"e. c #CA8303",
+"r. c #C6942D",
+"t. c #C79631",
+"y. c #D39A39",
+"u. c #C7A700",
+"i. c #C0BF00",
+"p. c #C1B808",
+"a. c #CAB500",
+"s. c #CFB60E",
+"d. c #C9BB0D",
+"f. c #CBBB0F",
+"g. c #CABC0E",
+"h. c #C3B112",
+"j. c #CFB916",
+"k. c #DBA605",
+"l. c #D6B71F",
+"z. c #CDB430",
+"x. c #D5BD27",
+"c. c #D9B029",
+"v. c #E99704",
+"b. c #F6820C",
+"n. c #F98400",
+"m. c #F88600",
+"M. c #FB890C",
+"N. c #FA9A39",
+"B. c #E3B231",
+"V. c #E9B039",
+"C. c #DD9B42",
+"Z. c #F2A74C",
+"A. c #F1AD44",
+"S. c #F5AB4A",
+"D. c #F7AA4D",
+"F. c #F8A653",
+"G. c #FCA552",
+"H. c #FDA657",
+"J. c #FBA952",
+"K. c #E0AC70",
+"L. c #F7B964",
+"P. c #C0C000",
+"I. c #C0C001",
+"U. c #C2C106",
+"Y. c #D1C72F",
+"T. c #D6CA3D",
+"R. c #DAC239",
+"E. c #FBF802",
+"W. c #DBCA47",
+"Q. c #E2C349",
+"!. c #E3CF5F",
+"~. c #E9D26E",
+"^. c #EFD57F",
+"/. c #A09F9D",
+"(. c #D6C386",
+"). c #F5CE81",
+"_. c #FCC682",
+"`. c #FFC585",
+"'. c #FAD18E",
+"]. c #FDDBA3",
+"[. c #EEEAEE",
+"{. c None",
+/* pixels */
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.C u m ; *   {.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.X.u m m m : {.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.C [ y m ; *   {.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.< < < O 4 T F u : {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.1 m m m 4 u I m m y {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.C Q ~ T 8 w D C u m m m ~ {.1 F T m 8 {.{.{.{.{.{.{.{.{.",
+"{.{.{.{.| _ m w X X ] K m u m C m / I u s U 3 {.{.{.{.{.{.{.{.{.",
+"{.{.{.{.[ / u 4 {.{...T m m C ] m u s 9 f E.i.m.6.l {.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.o.C u m F ` u & & q.~.f.J.P.P.P.7.<.b {.{.{.{.",
+"{.{.{.{.{.{.{.{.[ K m u m m C u t t 5.K.w.M.P.A.S.c.h.C.c c {.{.",
+"{.{.{.{.{.{.{.K / m m ; {.= C T m m +.z.0.k.!._.`.Q.j.F.t.t.{.{.",
+"{.{.{.{.{.{.6 | m m < {.{.{.Q Q u 8 O.x.Y.U.~.].).T.s.N.y.y.{.{.",
+"{.{.{.{.{.: I ~ m w {.{.{.{. .w t d 4.L.).g.P.'.R.9.u.,.x x {.{.",
+"{.{.{.{.w T T u t O {.{.{.{.8 O 2 (.W.l.J.D.p.D.G.r.3.:.{.{.{.{.",
+"{.{.{.{.| _ m t O {.{.{.{.{.{.{.H.f.B.V.i.9./.1.:.;.O.v {.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.b e.v.a.m.b.#.*.=. at .{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.g z %.-.$.&.h {.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.# $ k % k {.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.",
+"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kjumpingcube-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kjumpingcube-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kjumpingcube-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,27 @@
+/* XPM */
+static char *kjumpingcube16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 5 1",
+"  c black",
+". c #585858",
+"X c blue",
+"o c red",
+"O c None",
+/* pixels */
+"OOOOOOOOOOOOOOOO",
+"O             OO",
+"O  XX  oo ooo .O",
+"O XXX o o o o ..",
+"O XX  oo  ooo ..",
+"O             ..",
+"O  XX  o   XX ..",
+"O XXX ooo X X ..",
+"O XX   o  XX  ..",
+"O             ..",
+"O ooo  XX XXX ..",
+"O o o X X X X ..",
+"O ooo XX  XXX ..",
+"O             ..",
+"OO..............",
+"OOO............."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kjumpingcube.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kjumpingcube.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kjumpingcube.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,47 @@
+/* XPM */
+static char *kjumpingcube[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 9 1",
+"  c black",
+". c gray19",
+"X c navy",
+"o c #0000C0",
+"O c blue",
+"+ c #800000",
+"@ c #C00000",
+"# c red",
+"$ c None",
+/* pixels */
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$                            $$",
+"$$ OOOOOOOO ######## ######## .$",
+"$$ O  ooooX #  @@@@+ #@@@@@@+ ..",
+"$$ O  ooooX #  @@@@+ #@@@@@@+ ..",
+"$$ OooooooX #@@  @@+ #@@  @@+ ..",
+"$$ OooooooX #@@  @@+ #@@  @@+ ..",
+"$$ Ooooo  X #@@@@  + #@@@@@@+ ..",
+"$$ Ooooo  X #@@@@  + #@@@@@@+ ..",
+"$$ OXXXXXXX #+++++++ #+++++++ ..",
+"$$                            ..",
+"$$ OOOOOOOO ######## OOOOOOOO ..",
+"$$ O  ooooX #  @@  + O  ooooX ..",
+"$$ O  ooooX #  @@  + O  ooooX ..",
+"$$ OooooooX #@@@@@@+ Ooo  ooX ..",
+"$$ OooooooX #@@@@@@+ Ooo  ooX ..",
+"$$ Ooooo  X #  @@  + Ooooo  X ..",
+"$$ Ooooo  X #  @@  + Ooooo  X ..",
+"$$ OXXXXXXX #+++++++ OXXXXXXX ..",
+"$$                            ..",
+"$$ ######## OOOOOOOO OOOOOOOO ..",
+"$$ #@@@@@@+ O  ooooX OooooooX ..",
+"$$ #@@@@@@+ O  ooooX OooooooX ..",
+"$$ #@@  @@+ Ooo  ooX Ooo  ooX ..",
+"$$ #@@  @@+ Ooo  ooX Ooo  ooX ..",
+"$$ #@@@@@@+ Ooooo  X OooooooX ..",
+"$$ #@@@@@@+ Ooooo  X OooooooX ..",
+"$$ #+++++++ OXXXXXXX OXXXXXXX ..",
+"$$                            ..",
+"$$$.............................",
+"$$$$............................"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/klickety-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/klickety-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/klickety-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,186 @@
+/* XPM */
+static char *klickety-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 164 2",
+"   c black",
+".  c #1D257D",
+"X  c #1D257F",
+"o  c #2B316E",
+"O  c #397D1D",
+"+  c #397E1D",
+"@  c #397F1D",
+"#  c #3A7F1D",
+"$  c #326834",
+"%  c #367428",
+"&  c #397635",
+"*  c #2A4D5A",
+"=  c #7C1C1C",
+"-  c #7D1D1D",
+";  c #7F1D1D",
+":  c #7E1D7E",
+">  c #7F1D7F",
+",  c #5B531D",
+"<  c #56583E",
+"1  c #57611E",
+"2  c #587823",
+"3  c #78751B",
+"4  c #7F7D1D",
+"5  c #766063",
+"6  c #1D2581",
+"7  c #1D2680",
+"8  c #1E2686",
+"9  c #1E2688",
+"0  c #222C8F",
+"q  c #212A90",
+"w  c #212A94",
+"e  c #27329C",
+"r  c #27329E",
+"t  c #2833A5",
+"y  c #2E3BAB",
+"u  c #2E3CB7",
+"i  c #3C4DC7",
+"p  c #3F50CC",
+"a  c #3F51D4",
+"s  c #4053DC",
+"d  c #4459EB",
+"f  c #455AE9",
+"g  c #4B60E8",
+"h  c #4C61E8",
+"j  c #4C62EC",
+"k  c #4F66F0",
+"l  c #5166E7",
+"z  c #5268EB",
+"x  c #5067F0",
+"c  c #5168F0",
+"v  c #546BF0",
+"b  c #3A811D",
+"n  c #3B831D",
+"m  c #3B841D",
+"M  c #3C851E",
+"N  c #418522",
+"B  c #479323",
+"V  c #489524",
+"C  c #54A629",
+"Z  c #59AC2C",
+"A  c #5CAE2E",
+"S  c #5DB32D",
+"D  c #60B330",
+"F  c #61B430",
+"G  c #63B930",
+"H  c #64BE30",
+"J  c #66BE32",
+"K  c #6AC134",
+"L  c #6BC236",
+"P  c #6CC43A",
+"I  c #70C638",
+"U  c #76CF3B",
+"Y  c #78D33B",
+"T  c #7FD540",
+"R  c #801D1D",
+"E  c #821D1D",
+"W  c #841D1D",
+"Q  c #891D1D",
+"!  c #891F1E",
+"~  c #932121",
+"^  c #982323",
+"/  c #9E2727",
+"(  c #A82B2B",
+")  c #AD2D2D",
+"_  c #AE2D2D",
+"`  c #B52D2D",
+"'  c #B43131",
+"]  c #BC3131",
+"[  c #817E1D",
+"{  c #A75734",
+"}  c #95545E",
+"|  c #985A5B",
+" . c #95486B",
+".. c #D13939",
+"X. c #D23B3B",
+"o. c #E33E3E",
+"O. c #E33F3F",
+"+. c #D94640",
+"@. c #DD4242",
+"#. c #E14040",
+"$. c #E34545",
+"%. c #E44040",
+"&. c #E54545",
+"*. c #E64747",
+"=. c #801D80",
+"-. c #841D84",
+";. c #851E85",
+":. c #871D87",
+">. c #8B1F8B",
+",. c #8C1F8C",
+"<. c #983386",
+"1. c #A328A3",
+"2. c #A82BA8",
+"3. c #B02FB0",
+"4. c #B42DB3",
+"5. c #B430B4",
+"6. c #BD36BD",
+"7. c #C432C3",
+"8. c #D63BD5",
+"9. c #D73FD7",
+"0. c #D839D7",
+"q. c #DA3DD9",
+"w. c #DB3CDA",
+"e. c #E03EE0",
+"r. c #E23FE1",
+"t. c #E33FE2",
+"y. c #E340E3",
+"u. c #E440E3",
+"i. c #E441E3",
+"p. c #E543E4",
+"a. c #E544E4",
+"s. c #82801D",
+"d. c #83801D",
+"f. c #85821D",
+"g. c #87841D",
+"h. c #93933C",
+"j. c #A2A028",
+"k. c #AEAC2E",
+"l. c #B1AF30",
+"z. c #B5B331",
+"x. c #B8B630",
+"c. c #83E13E",
+"v. c #83E23E",
+"b. c #83E23F",
+"n. c #84E23F",
+"m. c #86DE43",
+"M. c #84E240",
+"N. c #86E340",
+"B. c #89E443",
+"V. c #8EE548",
+"C. c #C5C337",
+"Z. c #C7C433",
+"A. c #C6C435",
+"S. c #C7C537",
+"D. c #C8C533",
+"F. c #C9C73A",
+"G. c #CECC3A",
+"H. c #D2CF3A",
+"J. c #DBD83C",
+"K. c #E2DF3E",
+"L. c #E3DF3E",
+"P. c #E1DE40",
+"I. c #E5E241",
+"U. c None",
+/* pixels */
+"U.U.U.. . 6 U.U.U.U.U.U.U.U.U.U.",
+"U.U.U.6 i i y q 6 . U.U.U.U.U.U.",
+"U.U.U.8 g c z l p 0 . U.U.U.U.U.",
+"U.U.U.w d k c z a 6 + + U.U.U.U.",
+"U.U.< e a d j g t % D D M + U.U.",
+"f.z.l.h.o 9 t u * J N.V.Z + U.U.",
+"g.I.L.S.f.U.$ & P N.m.C + U.U.U.",
+"s.H.L.S.4 + B Y v.U V , ; ; U.U.",
+"4 C.L.F.4 n L B.b.A # E _ ` _ E ",
+"4 x.L.Z.4 U.n G v.v.J 1 X.o...; ",
+"4 k.P.A.4 U.U.+ S b.b.L { o.] = ",
+"U.j.J.G.[ U.U.U.+ I Y 2 +.#.' ; ",
+"=. .| } <.1.2.3.5.5 N ! #.*.( U.",
+"-.q.a.y.i.i.t.i.a.6.> ^ o.&.~ U.",
+"-.7.e.e.e.w.8.q.8.4.> / &. at .W U.",
+"=.-.,.,.:.> > > > > > E E W E U."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/klickety.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/klickety.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/klickety.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,205 @@
+/* XPM */
+static char *klickety[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 167 2",
+"   c black",
+".  c #1A206F",
+"X  c #1A2172",
+"o  c #1C247C",
+"O  c #262D72",
+"+  c #23366A",
+"@  c #397D1D",
+"#  c #3A7A35",
+"$  c #294D4C",
+"%  c #294C52",
+"&  c #7E1C1C",
+"*  c #7A271D",
+"=  c #7E1D7E",
+"-  c #5A501D",
+";  c #43771D",
+":  c #426D29",
+">  c #66411D",
+",  c #7F583E",
+"<  c #72701A",
+"1  c #78761B",
+"2  c #7E7C1C",
+"3  c #7F6431",
+"4  c #707137",
+"5  c #515442",
+"6  c #545749",
+"7  c #576440",
+"8  c #644456",
+"9  c #1D2583",
+"0  c #1D268B",
+"q  c #1F288A",
+"w  c #222C94",
+"e  c #232E9C",
+"r  c #252FA0",
+"t  c #2732A4",
+"y  c #2A36A4",
+"u  c #2935AB",
+"i  c #2B38AA",
+"p  c #2C39B9",
+"a  c #313FB2",
+"s  c #313FBA",
+"d  c #3444BC",
+"f  c #3646CC",
+"g  c #3848C4",
+"h  c #3B4CCF",
+"j  c #3B4DDB",
+"k  c #3D50D9",
+"l  c #3E51E2",
+"z  c #3F53EA",
+"x  c #4456DA",
+"c  c #4256E4",
+"v  c #4155E9",
+"b  c #455AE6",
+"n  c #455AEA",
+"m  c #485CE3",
+"M  c #495EE9",
+"N  c #4D62E6",
+"B  c #4C62ED",
+"V  c #5066EA",
+"C  c #546AEB",
+"Z  c #596FEB",
+"A  c #5067F0",
+"S  c #536AF0",
+"D  c #586FF2",
+"F  c #5970EF",
+"G  c #5A71F1",
+"H  c #6077F4",
+"J  c #3A821D",
+"K  c #3E8B1E",
+"L  c #44801F",
+"P  c #428D20",
+"I  c #449321",
+"U  c #489724",
+"Y  c #489C23",
+"T  c #50A327",
+"R  c #52A528",
+"E  c #53AA28",
+"W  c #5BB32C",
+"Q  c #5CBA2C",
+"!  c #60BC2F",
+"~  c #64BE31",
+"^  c #6BC635",
+"/  c #6DCA36",
+"(  c #70D036",
+")  c #76D43A",
+"_  c #7CD73F",
+"`  c #7CDD3B",
+"'  c #821D1D",
+"]  c #8B1E1E",
+"[  c #8E2020",
+"{  c #942020",
+"}  c #9C2323",
+"|  c #A32727",
+" . c #AC2A2A",
+".. c #B42E2E",
+"X. c #B92E2E",
+"o. c #807D1D",
+"O. c #847C20",
+"+. c #A45233",
+"@. c #B9523A",
+"#. c #C43434",
+"$. c #CC3838",
+"%. c #D63D3D",
+"&. c #DC3A3A",
+"*. c #E23E3E",
+"=. c #D04A3D",
+"-. c #DC4141",
+";. c #E34343",
+":. c #E64A4A",
+">. c #E84B4B",
+",. c #831D83",
+"<. c #8B1E8B",
+"1. c #8F208F",
+"2. c #962396",
+"3. c #9A209A",
+"4. c #A0259C",
+"5. c #A12997",
+"6. c #A22A99",
+"7. c #A224A1",
+"8. c #AC29AC",
+"9. c #B22DB2",
+"0. c #BC32BC",
+"q. c #C030BF",
+"w. c #CC35CC",
+"e. c #CB39CA",
+"r. c #D034CF",
+"t. c #D038CF",
+"y. c #D33CD3",
+"u. c #DE3DDD",
+"i. c #E23EE1",
+"p. c #E442E3",
+"a. c #E649E5",
+"s. c #E84BE6",
+"d. c #84821D",
+"f. c #88851D",
+"g. c #8D891E",
+"h. c #939120",
+"j. c #9A9823",
+"k. c #A09D24",
+"l. c #A5A226",
+"z. c #A6A428",
+"x. c #A8A626",
+"c. c #A8A72A",
+"v. c #AAA827",
+"b. c #ADAA29",
+"n. c #B2B02B",
+"m. c #BAB82F",
+"M. c #BBB931",
+"N. c #82E13E",
+"B. c #82DD40",
+"V. c #88DF46",
+"C. c #86E241",
+"Z. c #8AE345",
+"A. c #8EE548",
+"S. c #91E64A",
+"D. c #C4C131",
+"F. c #CBC835",
+"G. c #D1CE36",
+"H. c #D9D63C",
+"J. c #DCDA3D",
+"K. c #E2DE3E",
+"L. c #E3E03E",
+"P. c #DDDB42",
+"I. c #E1DE42",
+"U. c #E4E142",
+"Y. c #E7E649",
+"T. c #EAE845",
+"R. c None",
+/* pixels */
+"R.R.R.R.R.R.R.o R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.",
+"R.R.R.R.R.R.R.o o o 9 o R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.",
+"R.R.R.R.R.R.R.o t d u w 9 o o 9 R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.R.",
+"R.R.R.R.R.R.R.9 h G D M h d w q 9 o o o R.R.R.R.R.R.R.R.R.R.R.R.",
+"R.R.R.R.R.R.R.9 x S A A A F F m g y q o o R.R.R.R.R.R.R.R.R.R.R.",
+"R.R.R.R.R.R.9 q c A A A A V Z N N N i o R.R.R.R.R.R.R.R.R.R.R.R.",
+"R.R.R.R.R.R.o 0 v B A A A D V N N x 9 o R.R.R.R.R.R.R.R.R.R.R.R.",
+"R.R.R.R.R.R.o r n n B A A A F V c u o R.@ @ @ R.R.R.R.R.R.R.R.R.",
+"R.R.R.R.R.R.o s N v n B B A F V j o X @ J E I J @ R.R.R.R.R.R.R.",
+"R.R.R.R.o.5 o u g j l n M n m c p X @ J W A.A.~ K @ @ @ R.R.R.R.",
+"2 2 o.o.o.o.4 6 O o o w u f j k 9 $ J ! C.C.A.S.Z.Y @ @ R.R.R.R.",
+"2 g.J.I.J.I.Y.k.2 o o o . X q e + K / C.N.C.S.Z.R @ @ R.R.R.R.R.",
+"2 f.T.T.L.L.Y.l.d.R.R.R.R.o o % # ) N.N.C.S._ I @ @ R.R.R.R.R.R.",
+"R.f.H.L.K.K.L.x.o.R.R.R.R.@ J Y ` N.B.Z.S./ K J R.R.R.R.R.R.R.R.",
+"R.d.F.K.K.L.U.l.o.R.R.R.@ @ T ` N.N.B.Z.! J J R.R.R.R.R.R.R.R.R.",
+"R.2 M.I.K.K.Y.v.2 R.R.@ J W A.N.N.N.) T @ @ R.& & & & & R.R.R.R.",
+"R.2 b.P.K.K.Y.b.o.R.@ J ~ S.A.N.N.N.E J @ R.R.& [ } ] ' ' & & & ",
+"R.2 c.I.K.K.Y.v.2 R.@ J I ) A.N.N.C.Z.E @ @ R.&  .:.*.&.%.#.& & ",
+"R.o.j.H.K.K.K.v.2 R.R.R.@ J ^ C.N.N.N.B.! K K ' X.;.*.*.;.$.& R.",
+"R.2 h.H.K.K.L.b.2 R.R.R.R.@ @ W N.N.N.N.` ( K > #.;.*.*.*. .& R.",
+"R.2 g.P.I.K.J.b.2 R.R.R.R.R.@ @ E N.N.N.N.N.) L +.;.*.*.&.} & R.",
+"R.2 1 G.J.K.K.n.o.R.R.R.R.R.R.@ @ W N.N.N.N.A.~ ; =.*.*.;.{ & R.",
+"R.R.< D.H.K.T.M.o.R.R.R.R.R.R.R.@ J ^ S.A.S.~ ; @.:.*.*.;.' & R.",
+"R.R.1 m.H.H.P.M.o.R.R.R.R.R.R.R.R.@ K B.Z.R @ * ;.*.;.;.%.& R.R.",
+"R.= , O.g.h.g.O.3 = = = = = ,.,.<.,.8 P U @ - ' *.*.*.>.$.' R.R.",
+"R.,.7.6.6.2.6.4.7.8.8.9.0.q.e.y.y.y.y.4 : @ & [ -.*.;.>...* R.R.",
+"R.,.w.a.s.p.p.i.i.p.i.a.p.p.a.i.p.s.a.2.= R.& } *.*.;.>.} & R.R.",
+"R.,.e.p.i.i.i.i.i.i.i.i.i.i.i.i.p.p.a.1.= R.& | *.*.*.:.] & R.R.",
+"R.,.8.p.i.i.i.i.i.i.i.i.i.u.i.i.i.i.i.<.= R.&  .>.;.:.-.' & R.R.",
+"R.,.3.i.i.p.i.i.u.u.y.t.w.e.y.y.r.w.w.<.= R.&  .%.;.:.$.' R.R.R.",
+"R.,.,.,.<.<.<.<.<.,.,.= = = = = = = = = ,.R.& & ' ' ] ] & R.R.R.",
+"R.R.= = = = = ,.= = = R.R.R.R.R.R.R.R.R.R.R.R.R.& & & & & R.R.R."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/klines-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/klines-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/klines-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,109 @@
+/* XPM */
+static char *klines16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 87 1",
+"  c black",
+". c #30380B",
+"X c #006D00",
+"o c #0B6300",
+"O c #007900",
+"+ c #007E00",
+"@ c #3B493B",
+"# c #266F00",
+"$ c #356A07",
+"% c #3C7A00",
+"& c #406F00",
+"* c #566216",
+"= c #665511",
+"- c #616017",
+"; c #696018",
+": c #7E6308",
+"> c #646421",
+", c #667421",
+"< c #008A00",
+"1 c #078D07",
+"2 c #009200",
+"3 c #049000",
+"4 c #1E9100",
+"5 c #00A000",
+"6 c #00A800",
+"7 c #00AC00",
+"8 c #00AD00",
+"9 c #00AE00",
+"0 c #0DAF00",
+"q c #00B100",
+"w c #00B200",
+"e c #00B300",
+"r c #00B400",
+"t c #00B500",
+"y c #00B600",
+"u c #00BA00",
+"i c #00BB00",
+"p c #00BD00",
+"a c #00BF00",
+"s c #15AC07",
+"d c #17AB17",
+"f c #00C300",
+"g c #00C400",
+"h c #00C800",
+"j c #00CB00",
+"k c #00CC00",
+"l c #09C001",
+"z c #00D400",
+"x c #00D800",
+"c c #00DD00",
+"v c #00E000",
+"b c #00E100",
+"n c #00EE00",
+"m c #00EF00",
+"M c #00F000",
+"N c #00F200",
+"B c #00F700",
+"V c #00FA00",
+"C c #00FC00",
+"Z c #0DF20D",
+"A c #0FF40F",
+"S c #0CFA0C",
+"D c #31CF0E",
+"F c #3DE13D",
+"G c #3BED3B",
+"H c #39F639",
+"J c #7BA00C",
+"K c #44B944",
+"L c #58C413",
+"P c #77FC77",
+"I c #946805",
+"U c #987500",
+"Y c #A57600",
+"T c #BE7F00",
+"R c #88883B",
+"E c #969C2F",
+"W c #A29600",
+"Q c #A4A719",
+"! c #A0AB17",
+"~ c #D8AC1B",
+"^ c #DAAC1A",
+"/ c #E89B00",
+"( c #E9A80C",
+") c #EEC021",
+"_ c #FCDF37",
+"` c #FCFC54",
+"' c None",
+/* pixels */
+"''''''''''''''''",
+"'R''''''''''y'''",
+"'>`''''''''''y''",
+"=~_''''''''Fc'''",
+"T'(!p'''Pd at KCC''",
+"'').OL'vAg1+NVC'",
+"'''~;JQD<qzNC8NV",
+"''''''0l5VCCCq7N",
+"''''''CCkCCCCC2g",
+"''''''gzvCCCCfyN",
+"''''''Y-,sVup34'",
+"'''''''*I:U%8W/'",
+"''''''''E$&#Xo''",
+"'''''''''q67u'''",
+"''''''GSyy''ypZH",
+"''''''''''''''''"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/klines.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/klines.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/klines.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,292 @@
+/* XPM */
+static char *klines[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 254 2",
+"   c black",
+".  c #000B00",
+"X  c #0B0B04",
+"o  c #0C0C04",
+"O  c #001A00",
+"+  c #141306",
+"@  c #092B00",
+"#  c #013300",
+"$  c #003900",
+"%  c #0B3C00",
+"&  c #1C221C",
+"*  c #293500",
+"=  c #333311",
+"-  c #353511",
+";  c #373712",
+":  c #2F302F",
+">  c #014001",
+",  c #004600",
+"<  c #004800",
+"1  c #004E00",
+"2  c #005600",
+"3  c #0A5A00",
+"4  c #0A5F00",
+"5  c #185800",
+"6  c DarkGreen",
+"7  c #006700",
+"8  c #006B00",
+"9  c #007100",
+"0  c #007200",
+"q  c #007300",
+"w  c #007600",
+"e  c #007900",
+"r  c #007A00",
+"t  c #007D00",
+"y  c #007E00",
+"u  c #007F00",
+"i  c #057C00",
+"p  c #0F7B05",
+"a  c #235D00",
+"s  c #3F5F00",
+"d  c #2E432E",
+"f  c #237E04",
+"g  c #336E11",
+"h  c #453608",
+"j  c #454600",
+"k  c #444113",
+"l  c #474010",
+"z  c #4C4E18",
+"x  c #4E4E1C",
+"c  c #534200",
+"v  c #584B00",
+"b  c #515700",
+"n  c #545200",
+"m  c #545800",
+"M  c #476218",
+"N  c #6C4800",
+"B  c #6E4E00",
+"V  c #6E530A",
+"C  c #6F540A",
+"Z  c #685610",
+"A  c #704E00",
+"S  c #775600",
+"D  c #7A5600",
+"F  c #7B6E1C",
+"G  c #6D6D24",
+"H  c #737326",
+"J  c #757527",
+"K  c #7F7F2A",
+"L  c #4C4C4C",
+"P  c #727272",
+"I  c #008100",
+"U  c #008200",
+"Y  c #008300",
+"T  c #008400",
+"R  c #008500",
+"E  c #008700",
+"W  c #018700",
+"Q  c #008A00",
+"!  c #008E00",
+"~  c #009000",
+"^  c #019100",
+"/  c #009500",
+"(  c #009700",
+")  c #009800",
+"_  c #009A00",
+"`  c #1A8800",
+"'  c #129006",
+"]  c #00A300",
+"[  c #00A400",
+"{  c #00A500",
+"}  c #00A600",
+"|  c #00A700",
+" . c #00A800",
+".. c #00A900",
+"X. c #00AA00",
+"o. c #00AB00",
+"O. c #00AC00",
+"+. c #00AD00",
+"@. c #00AE00",
+"#. c #0BAE00",
+"$. c #00B000",
+"%. c #00B200",
+"&. c #00B300",
+"*. c #00B400",
+"=. c #00B600",
+"-. c #00B700",
+";. c #00B800",
+":. c #00B900",
+">. c #00BA00",
+",. c #00BB00",
+"<. c #00BC00",
+"1. c #00BD00",
+"2. c #00BE00",
+"3. c #15BD07",
+"4. c #339400",
+"5. c #3AA306",
+"6. c #33BD33",
+"7. c #00C100",
+"8. c #00C200",
+"9. c #00C300",
+"0. c #00C400",
+"q. c #00C600",
+"w. c #00C700",
+"e. c #00C800",
+"r. c #00C900",
+"t. c #00CB00",
+"y. c #00CC00",
+"u. c #00CD00",
+"i. c #00CF00",
+"p. c #00D000",
+"a. c #00D100",
+"s. c #00D200",
+"d. c #00D400",
+"f. c #00D700",
+"g. c #04D404",
+"h. c #00D800",
+"j. c #00D900",
+"k. c #00DA00",
+"l. c #00DB00",
+"z. c #00DC00",
+"x. c #00DE00",
+"c. c #00DF00",
+"v. c #16C707",
+"b. c #00E000",
+"n. c #00E200",
+"m. c #00E300",
+"M. c #00E400",
+"N. c #00E500",
+"B. c #00E600",
+"V. c #00EB00",
+"C. c #02E902",
+"Z. c #00ED00",
+"A. c #0EEF0E",
+"S. c #00F200",
+"D. c #00F400",
+"F. c #00F500",
+"G. c #00F600",
+"H. c #00F700",
+"J. c #00F800",
+"K. c #00F900",
+"L. c #00FA00",
+"P. c #00FB00",
+"I. c #00FC00",
+"U. c #02FC02",
+"Y. c #0BFC0B",
+"T. c #10F810",
+"R. c #13FC13",
+"E. c #18FC18",
+"W. c #34FC11",
+"Q. c #2BF72B",
+"!. c #29FC29",
+"~. c #2DFC2D",
+"^. c #31FC31",
+"/. c #35FC35",
+"(. c #37FC37",
+"). c #39FC39",
+"_. c #699300",
+"`. c #64A000",
+"'. c #6BA200",
+"]. c #74BC14",
+"[. c #479647",
+"{. c #41FC41",
+"}. c #5DFC5D",
+"|. c #5EFC5E",
+" X c #6CFC6C",
+".X c #845D00",
+"XX c #8E5F00",
+"oX c #906400",
+"OX c #986701",
+"+X c #9B6700",
+"@X c #9F7F00",
+"#X c #807C27",
+"$X c #AB7C0A",
+"%X c #BE7F00",
+"&X c #82802A",
+"*X c #84862C",
+"=X c #94912F",
+"-X c #9C9129",
+";X c #9A9A33",
+":X c #9EAF28",
+">X c #9EA335",
+",X c #A08D22",
+"<X c #A0A035",
+"1X c #B5A028",
+"2X c #B7B767",
+"3X c #8FD827",
+"4X c #BFD129",
+"5X c #B9E439",
+"6X c #BDF134",
+"7X c #C69511",
+"8X c #D08B00",
+"9X c #D89000",
+"0X c #D99100",
+"qX c #DB9200",
+"wX c #DC9200",
+"eX c #CEAA08",
+"rX c #C5B318",
+"tX c #DAB826",
+"yX c #DDB925",
+"uX c #E69900",
+"iX c #EA9C00",
+"pX c #EFB314",
+"aX c #F0A000",
+"sX c #F3A200",
+"dX c #F5A300",
+"fX c #FCA800",
+"gX c #FCA901",
+"hX c #FCAC04",
+"jX c #FCAD05",
+"kX c #FCB30B",
+"lX c #FCB60E",
+"zX c #FCB70F",
+"xX c #F4B411",
+"cX c #D5CC3E",
+"vX c #FCC119",
+"bX c #FCC61E",
+"nX c #FCCE26",
+"mX c #FCE038",
+"MX c #FCE139",
+"NX c #D1D146",
+"BX c #DFE74A",
+"VX c #EBEB4F",
+"CX c #FCF74F",
+"ZX c #FCFC54",
+"AX c #EFEF62",
+"SX c #94CC94",
+"DX c #8DEF8D",
+"FX c #B9CCB9",
+"GX c #AFFCAF",
+"HX c #C8CFC8",
+"JX c gray82",
+"KX c #C0FCC0",
+"LX c #DDFCDD",
+"PX c None",
+/* pixels */
+"PXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPX",
+"PXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPX",
+"PXPXPX2XAXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPX",
+"PXPX<Xx VXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXX.} PXPXPXPXPXPX",
+"PXPX= K ZXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXX.PXPXX.PXPXPXPXPX",
+"PXG X NXZXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXX.} PXPXPXPXPX",
+"PX- F MXCXZXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPX at .PXPXPXPXPXPXPX",
+"$Xh pXjXzXMXZXPXPXPXPXPXPXPXPXPXPXPXPXSXFXJXDXx.K.PXPXPXPXPXPXPX",
+"XX8XgXPX  jXnX5XX.e.PXPXPXPXPXPX^.!.6.d : L HX;.I.I.I.PXPXPXPXPX",
+"iXPXPXPXvX7XOX5.<.9.u.X.PXPXPXI.LX XK.;.$ P [.e.I.I.I.I.I.PXPXPX",
+"PXPXPXPXkXcX+ # _ <.3.v.PXPXPXI.).I.I.K.c.& $ X.S.I.I.I.I.I.PXPX",
+"PXPXPXPXPXbX,Xo O 0 ].4XPXPXPX;.Z.Z.} U c.2 Q Q c.I.K.K.I.I.PXPX",
+"PXPXPXPXPXPXxX1X; . ` eXyX6XW.0 e 8 U u T B.c.x.I.I.;.p.I.I.I.PX",
+"PXPXPXPXPXPXPXPXtX-X:X`.s rX3XK.x.6 <.K.I.I.I.I.I.I.T X.p.K.I.PX",
+"PXPXPXPXPXPXPXPXPXzXzXPX+.4.f S.Q ;.G.I.I.I.I.I.I.I.&.8 X.j.I.I.",
+"PXPXPXPXPXPXPXPXPXPXPXPXj.} / I., K.I.I.I.I.I.I.I.I.K.&.u &.p.K.",
+"PXPXPXPXPXPXPXPXPXPXPXPXI.I.I.I.! K.I.I.I.I.I.I.I.I.I.I.} w 9.x.",
+"PXPXPXPXPXPXPXPXPXPXPXPXI.I.I.I.c.e.I.I.I.I.I.I.I.I.I.K. at .U +.j.",
+"PXPXPXPXPXPXPXPXPXPXPXPXB.I.I.I.I.I.I.I.I.I.I.I.I.I.K.X./ +.j.K.",
+"PXPXPXPXPXPXPXPXPXPXPXPXPXX.p.T ^ K.I.I.I.I.I.I.I.I.B.T @.j.K.PX",
+"PXPXPXPXPXPXPXPXPXPXPXPXPXv @ ;X>Xg p I.I.I.c.Z.q.&.&. at .d.e.p.PX",
+"PXPXPXPXPXPXPXPXPXPXPXPXPXaXN J k &XM j.S.S.e } &.9.i 4 3 A oXPX",
+"PXPXPXPXPXPXPXPXPXPXPXPXPX* c J qXC l n m b j 0 u.u.'.qXqXsXPXPX",
+"PXPXPXPXPXPXPXPXPXPXPXPXPXPX< *X+XV Z dXgX%X at X#.! ! _.qXuXPXPXPX",
+"PXPXPXPXPXPXPXPXPXPXPXPXPXPXPXBX#X=Xz B .XD S a 2 2 % 5 PXPXPXPX",
+"PXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPX' U T T T T T T ^ PXPXPXPXPX",
+"PXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXX.} X.} X.} X.PXPXPXPXPXPXPX",
+"PXPXPXPXPXPXPXPXPXPXPXPXE.|./.PXPXG.q.PXPXPXPXPXX.c.PXPXI.{.|.Y.",
+"PXPXPXPXPXPXPXPXPXPXPXPXQ.GX~.I._ x.q.} PXPXPX9.X.u.d.+.K./.KXR.",
+"PXPXPXPXPXPXPXPXPXPXPXPXg.A.K.G.] ;.;.X.PXPXPXX.} <.+.u.j.K.T.C.",
+"PXPXPXPXPXPXPXPXPXPXPXPXPX;.9.9.} X.X.PXPXPXPXPXX.} X.&.&.9.9.PX",
+"PXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPX"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kmahjongg-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kmahjongg-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kmahjongg-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,31 @@
+/* XPM */
+static char *kmahjongg16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 9 1",
+"  c black",
+". c blue",
+"X c #008000",
+"o c red",
+"O c #C05800",
+"+ c magenta",
+"@ c #FFDCA8",
+"# c #FFFFC0",
+"$ c None",
+/* pixels */
+"$$$$    $$$    $",
+"$$$$ oo $$$ @X@ ",
+"$$$$ o@ $$$ @X@ ",
+"    #o@ $$$ @X@ ",
+" ..O#@@O    @@@ ",
+" . at O    @@@     ",
+" . at O@@@ @o@ $$$$",
+" @@O@@@ @o@ $$$$",
+" ## @@@ @@@ $$$$",
+" + at O@X@ OOO $$$$",
+" @+OOOO#@@O#  $$",
+" ++O    ++O@@@ $",
+" @@O $$ + at O@.@ $",
+"$    $$ @+O at .@ $",
+"$$$$$$$ OOO@@@ $",
+"$$$$$$$$       $"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kmahjongg.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kmahjongg.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kmahjongg.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,48 @@
+/* XPM */
+static char *kmahjongg[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 10 1",
+"  c black",
+". c blue",
+"X c #008000",
+"o c red",
+"O c #C05800",
+"+ c magenta",
+"@ c #FFDCA8",
+"# c #FFFFC0",
+"$ c gray100",
+"% c None",
+/* pixels */
+"%%%%%%%%       %%%%%%%%       %%",
+"%%%%%%%% ###### %%%%%%% ###### %",
+"%%%%%%%% #@@@@@O %%%%%% #@@@@@O ",
+"%%%%%%%% #@o at o@O %%%%%% #@XXX at O ",
+"%%%%%%%% #@@oo at O %%%%%% #@@@@@O ",
+"%%%%%%%% #@oo@@O %%%%%% #@XXX at O ",
+"       % #@@oo at O %%%%%% #@@@@@O ",
+" ######  #@oo@@O %%%%%% #@XXX at O ",
+" #@@@@@O #@@@o at O %%%%%% #@@X@@O ",
+" #@. at .@O #@@@@@O      % #@@@@@O ",
+" #@@.. at O  OOOOO ###### $ OOOOOO ",
+" #@..@@O        #@@@@@O %       ",
+" #@@.. at O######  #@o at o@O %%%%%%%%",
+" #@..@@O#@@@@@O #@@oo at O %%%%%%%%",
+" #@@.. at O#@XXX at O #@oo@@O %%%%%%%%",
+" #@@@@@O#@@@@@O #@@oo at O %%%%%%%%",
+"  OOOOOO#@XXX at O #@oo@@O %%%%%%%%",
+" ###### #@@@@@O #@@@o at O %%%%%%%%",
+" #@@@@@O#@XXX at O #@@@@@O %%%%%%%%",
+" #@++@@O#@@X@@O  OOOOOO %%%%%%%%",
+" #@+++ at O#@@@@@O######       %%%%",
+" #@@@+ at O OOOOOO#@@@@@O###### %%%",
+" #@+@@@O       #@++@@O#@@@@@O %%",
+" #@+++ at O %%%%% #@+++ at O#@. at .@O %%",
+" #@@++ at O %%%%% #@@@+ at O#@@.. at O %%",
+" #@@@@@O %%%%% #@+@@@O#@..@@O %%",
+"% OOOOOO %%%%% #@+++ at O#@@.. at O %%",
+"%%       %%%%% #@@++ at O#@..@@O %%",
+"%%%%%%%%%%%%%% #@@@@@O#@@.. at O %%",
+"%%%%%%%%%%%%%%% OOOOOO#@@@@@O %%",
+"%%%%%%%%%%%%%%%%       OOOOOO %%",
+"%%%%%%%%%%%%%%%%%%%%%%%       %%"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kmines-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kmines-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kmines-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+/* XPM */
+static char *kmines16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 7 1",
+"  c black",
+". c #585858",
+"X c red",
+"o c #808080",
+"O c #C0C0C0",
+"+ c gray100",
+"@ c None",
+/* pixels */
+"@@@@@@@@@@  @@@@",
+"@@@@@@@@@ X @@@@",
+"@@@@@@@@ XX @@@@",
+"@@@@@@@@@   @@@@",
+"@@@@@@@@@@@ @@@@",
+"@@@@@@@  @@ @@@@",
+"@@@@@  OO   @@@@",
+"@@@  ooOOoo   @@",
+"@  OO++oo++ O+  ",
+" OO++oo++oo++oo ",
+" OOOo++OO++.ooo ",
+" OOOo+O++oO.ooo ",
+"@  Oo+OOooO.o  @",
+"@@@  +OOooO  @@@",
+"@@@@@  Oo  @@@@@",
+"@@@@@@@  @@@@@@@"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kmines.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kmines.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kmines.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,109 @@
+/* XPM */
+static char *kmines[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 71 1",
+"  c black",
+". c #585858",
+"X c gray40",
+"o c #676767",
+"O c #686868",
+"+ c DimGray",
+"@ c #6A6A6A",
+"# c gray42",
+"$ c #6C6C6C",
+"% c #6D6D6D",
+"& c gray43",
+"* c #6F6F6F",
+"= c gray44",
+"- c #717171",
+"; c #727272",
+": c gray45",
+"> c #747474",
+", c gray46",
+"< c #767676",
+"1 c #777777",
+"2 c gray47",
+"3 c #797979",
+"4 c gray48",
+"5 c #7B7B7B",
+"6 c #7C7C7C",
+"7 c gray49",
+"8 c #7E7E7E",
+"9 c gray50",
+"0 c blue",
+"q c #00C0C0",
+"w c red",
+"e c #FFA858",
+"r c #808080",
+"t c gray64",
+"y c #A5A5A5",
+"u c gray65",
+"i c #A7A7A7",
+"p c gray66",
+"a c #A9A9A9",
+"s c #AAAAAA",
+"d c gray67",
+"f c gray68",
+"g c #AEAEAE",
+"h c #AFAFAF",
+"j c gray69",
+"k c #B1B1B1",
+"l c #B2B2B2",
+"z c gray70",
+"x c #B4B4B4",
+"c c #B6B6B6",
+"v c gray73",
+"b c #BCBCBC",
+"n c gray74",
+"m c gray",
+"M c gray75",
+"N c #AEAEE4",
+"B c #C0C0C0",
+"V c #C1C1C1",
+"C c #C3C3C3",
+"Z c gray77",
+"A c #C5C5C5",
+"S c #C6C6C6",
+"D c gray78",
+"F c #C8C8C8",
+"G c gray79",
+"H c #CACACA",
+"J c #CBCBCB",
+"K c gray80",
+"L c #C0C0FF",
+"P c gray100",
+"I c None",
+/* pixels */
+"IIIIIIIIIIIIIIIIIIIIII   IIIIIII",
+"IIIIIIIIIIIIIIIIIIII   N IIIIIII",
+"IIIIIIIIIIIIIIIIII  ee L IIIIIII",
+"IIIIIIIIIIIIIIII  eeww L IIIIIII",
+"IIIIIIIIIIIIIII eewwww L IIIIIII",
+"IIIIIIIIIIIIIIII  wwww L IIIIIII",
+"IIIIIIIIIIIIIIIIII  ww L IIIIIII",
+"IIIIIIIIIIIIIIIIIIII   L IIIIIII",
+"IIIIIIIIIIIIIIIIIIIIII L IIIIIII",
+"IIIIIIIIIIIIIIIIIIIIII L IIIIIII",
+"IIIIIIIIIIIIIIIIIIIIII L IIIIIII",
+"IIIIIIIIIIIIII   IIIII L IIIIIII",
+"IIIIIIIIIIII  rB0  III L IIIIIII",
+"IIIIIIIIII  rBB0B0r  I L IIIIIII",
+"IIIIIIII  rBB0BB00BBr  L   IIIII",
+"IIIIII  rPrrBB00BBB  r L Br  III",
+"IIII  rBBBPPrrBBB  rBB L Bttr  I",
+"II  rBBBBq0BPPrr rBBBB L ttBBBr ",
+"  rBBBBq0BB0BBPP PPBBB   BBBBPP ",
+" KPPBq0BB00BBBrr BBPPBBBBBBPPXX ",
+" KKGPPB00BBBrrPPrrBBBPPBBPPOOXX ",
+" KGGSCPPBBrrPPBBBB0rBBBPP$$OOOX ",
+" GGSSSBMrrPPBBBB0BB0rrB.$$$$OOO ",
+"  rSBBMMrPPPBB0BB00BBB-.$-$$$OO ",
+"II  rBMMrPxxPPB00BBMPP-.--$$$$  ",
+"IIII  7vrPxhhhPPBBPP1-1.--$$  II",
+"IIIIII  rPxhhhaaPP3111-.--  IIII",
+"IIIIIIII  rhhaaa7331111.  IIIIII",
+"IIIIIIIIII  raau773331  IIIIIIII",
+"IIIIIIIIIIII  ru7773  IIIIIIIIII",
+"IIIIIIIIIIIIII  77  IIIIIIIIIIII",
+"IIIIIIIIIIIIIIII  IIIIIIIIIIIIII"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kolf-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kolf-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kolf-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,48 @@
+/* XPM */
+static char *kolf16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 26 1",
+"  c black",
+". c #030000",
+"X c #070000",
+"o c #3F3F3F",
+"O c #8C0A0A",
+"+ c #9C0A0A",
+"@ c #A80C0C",
+"# c #AB0C0C",
+"$ c #B50D0D",
+"% c #B70C0C",
+"& c #BA0D0D",
+"* c #BB0D0D",
+"= c #BC0D0D",
+"- c #BF0E0E",
+"; c #B81414",
+": c #C50E0E",
+"> c #C70F0F",
+", c #C80F0F",
+"< c #CC1111",
+"1 c #CD1010",
+"2 c #CE1010",
+"3 c #CE2727",
+"4 c #D02727",
+"5 c #D66969",
+"6 c #EFEC13",
+"7 c None",
+/* pixels */
+"77777777777777  ",
+"7777777777777   ",
+"77o6677777777   ",
+"77o666677777   7",
+"77o666667777   7",
+"77o667777777  77",
+"77o77777777   77",
+"77o77777777  777",
+"77o7777777  7777",
+"77o777777   7777",
+"77o7;32$7   7777",
+"77oX55:@X  77777",
+"7 o442,:-   7777",
+"7 o2,::&@   7777",
+"7 o +-&O    7777",
+"77o  -&     7777"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kolf.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kolf.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kolf.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,178 @@
+/* XPM */
+static char *kolf[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 140 2",
+"   c #000000",
+".  c #010000",
+"X  c #020000",
+"o  c #020200",
+"O  c #030300",
+"+  c #050000",
+"@  c #040400",
+"#  c #060500",
+"$  c #060600",
+"%  c #070700",
+"&  c #090000",
+"*  c #0A0000",
+"=  c #0B0000",
+"-  c #0E0000",
+";  c #0D0C01",
+":  c #080808",
+">  c #080809",
+",  c #0A0808",
+"<  c #0F0808",
+"1  c #160101",
+"2  c #120909",
+"3  c #150909",
+"4  c #170909",
+"5  c #180101",
+"6  c #1F0202",
+"7  c #1F1E02",
+"8  c #1B1B1C",
+"9  c #210202",
+"0  c #2E0303",
+"q  c #3C0404",
+"w  c #3D0404",
+"e  c #2B2B03",
+"r  c #303003",
+"t  c #313003",
+"y  c #3A3904",
+"u  c #3A3A04",
+"i  c #29292A",
+"p  c #2A2A2A",
+"a  c #2A2A2B",
+"s  c #3E3E3E",
+"d  c #3C3C40",
+"f  c #400404",
+"g  c #490404",
+"h  c #4B0505",
+"j  c #5B0808",
+"k  c #640707",
+"l  c #670707",
+"z  c #6E0707",
+"x  c #6C0F0F",
+"c  c #7A0808",
+"v  c #7E0909",
+"b  c #7F0909",
+"n  c #464505",
+"m  c #494805",
+"M  c #5D5C07",
+"N  c #666408",
+"B  c #6D6C08",
+"V  c #676611",
+"C  c #727108",
+"Z  c #747209",
+"A  c #72712A",
+"S  c #870A0A",
+"D  c #880A0A",
+"F  c #890A0A",
+"G  c #8A0A0A",
+"H  c #8D0A0A",
+"J  c #9B0B0B",
+"K  c #9F0B0B",
+"L  c #A00B0B",
+"P  c #A30B0B",
+"I  c #AB0B0B",
+"U  c #AB0C0C",
+"Y  c #AC1010",
+"T  c #B10C0C",
+"R  c #B80D0D",
+"E  c #B90D0D",
+"W  c #BA0C0C",
+"Q  c #BA0D0D",
+"!  c #BB0D0D",
+"~  c #BD0D0D",
+"^  c #BD2727",
+"/  c #C00D0D",
+"(  c #C10E0E",
+")  c #C20D0D",
+"_  c #C20E0E",
+"`  c #C30E0E",
+"'  c #C50D0D",
+"]  c #C40E0E",
+"[  c #C50E0E",
+"{  c #C60E0E",
+"}  c #C80E0E",
+"|  c #C80F0F",
+" . c #C90F0F",
+".. c #CA0E0E",
+"X. c #CA0F0F",
+"o. c #CB0E0E",
+"O. c #CB0F0F",
+"+. c #CC0E0E",
+"@. c #CE0F0F",
+"#. c #CA1313",
+"$. c #CD1010",
+"%. c #CE1515",
+"&. c #CE1C1C",
+"*. c #D00F0F",
+"=. c #D21B1B",
+"-. c #D41B1B",
+";. c #CF2525",
+":. c #D24747",
+">. c #D24949",
+",. c #D14D4D",
+"<. c #D56464",
+"1. c #86840D",
+"2. c #89870A",
+"3. c #8A880B",
+"4. c #9C9A0B",
+"5. c #9B9A1A",
+"6. c #9E9C19",
+"7. c #9F9D1B",
+"8. c #A3A10C",
+"9. c #B3B10E",
+"0. c #B6B40E",
+"q. c #B8B50E",
+"w. c #BCB90E",
+"e. c #C4C10F",
+"r. c #C8C60F",
+"t. c #CCC910",
+"y. c #CDCA10",
+"u. c #CECC10",
+"i. c #D5D210",
+"p. c #D5D310",
+"a. c #D8D510",
+"s. c #DBD810",
+"d. c #E0DD11",
+"f. c #E4E112",
+"g. c #EFEC12",
+"h. c #F0ED11",
+"j. c #F2EF13",
+"k. c #F4F113",
+"l. c #F5F213",
+"z. c None",
+/* pixels */
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.      ",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.      ",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.        ",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.        ",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.        z.",
+"z.z.z.z.z.8 V 4.3.# z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.        z.",
+"z.z.z.z.z.i 7.g.y.% n B   # #   z.z.z.z.z.z.z.z.z.z.        z.z.",
+"z.z.z.z.z.i 5.a.m e.u.f.t.y.r.e   z.z.z.z.z.z.z.z.z.        z.z.",
+"z.z.z.z.z.i 5.p.t 8.N s.l.l.k.0.; z.z.z.z.z.z.z.z.        z.z.z.",
+"z.z.z.z.z.i 5.s.u t 3.Z w.q.9.7 z.z.z.z.z.z.z.z.        z.z.z.z.",
+"z.z.z.z.z.i 7.g.p.  u M z.z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.",
+"z.z.z.z.z.i A 1.Z # z.z.z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.z.",
+"z.z.z.z.z.i s > z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.z.",
+"z.z.z.z.z.i s , z.z.z.z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.z.z.",
+"z.z.z.z.z.i s , z.z.z.z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.z.z.",
+"z.z.z.z.z.i s , z.z.z.z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.z.z.",
+"z.z.z.z.z.p s > z.z.z.z.z.z.z.z.z.z.z.z.z.          z.z.z.z.z.z.",
+"z.z.z.z.z.p s > z.z.z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.z.z.z.",
+"z.z.z.z.z.p s , z.z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.p s > z.z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.i s , z.z.z.z.z.z.z.z.z.z.z.        z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.i s , z.z.D D G D D S z.z.z.        z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.i s > + j -.-. at .o.o.} q           z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.  i s , 9 ^ <.>.%.) ) ) K &         z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.    p s < x ,.:.=.$.) ) ) T h             z.z.z.z.z.z.z.z.",
+"z.z.z.    p s 3 Y ;.%.$.} $.) ( ! v             z.z.z.z.z.z.z.z.",
+"z.z.z.    p s 4 ! $. at .o.} $.) ( E D             z.z.z.z.z.z.z.z.",
+"z.z.z.    p s 2 H o.o.} ) ) ) ( I k             z.z.z.z.z.z.z.z.",
+"z.z.z.    p s , w o.) ) ) ( ( E K 9             z.z.z.z.z.z.z.z.",
+"z.z.z.    p s , & z } ) ! E E U g               z.z.z.z.z.z.z.z.",
+"z.z.z.z.  p s >   - f c P K l 0 +             z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.p s >       - 5 1 -               z.z.z.z.z.z.z.z.z.z."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/konquest-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/konquest-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/konquest-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,120 @@
+/* XPM */
+static char *konquest-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 98 2",
+"   c black",
+".  c #000008",
+"X  c #000408",
+"o  c #000808",
+"O  c #000410",
+"+  c #000810",
+"@  c #000C10",
+"#  c #080C10",
+"$  c #081408",
+"%  c #081010",
+"&  c #081018",
+"*  c #081418",
+"=  c #081818",
+"-  c #101418",
+";  c #101810",
+":  c #101C10",
+">  c #101818",
+",  c #181C10",
+"<  c #181C18",
+"1  c #101C20",
+"2  c #181C20",
+"3  c #182020",
+"4  c #182029",
+"5  c #182429",
+"6  c #202018",
+"7  c #202020",
+"8  c #202420",
+"9  c #202029",
+"0  c #202429",
+"q  c #202829",
+"w  c #292829",
+"e  c #202C31",
+"r  c #293031",
+"t  c #293039",
+"y  c #313031",
+"u  c #313431",
+"i  c #313439",
+"p  c #313831",
+"a  c #393831",
+"s  c #393839",
+"d  c #393C41",
+"f  c #394041",
+"g  c #413C39",
+"h  c #414039",
+"j  c #414041",
+"k  c #414441",
+"l  c #41444A",
+"z  c #41484A",
+"x  c #4A4441",
+"c  c #4A4841",
+"v  c #4A4C4A",
+"b  c #4A4C52",
+"n  c #4A505A",
+"m  c #524841",
+"M  c #524C4A",
+"N  c #52504A",
+"B  c #5A504A",
+"V  c #5A554A",
+"C  c #525052",
+"Z  c #525552",
+"A  c #5A5952",
+"S  c #62594A",
+"D  c #625D52",
+"F  c #62615A",
+"G  c #6A6152",
+"H  c #6A655A",
+"J  c #73655A",
+"K  c #73695A",
+"L  c #736D5A",
+"P  c #7B6952",
+"I  c #736D62",
+"U  c #7B6D62",
+"Y  c #7B756A",
+"T  c #7B7573",
+"R  c #83796A",
+"E  c #837D6A",
+"W  c #8B7962",
+"Q  c #8B8173",
+"!  c #8B8573",
+"~  c #948573",
+"^  c #94897B",
+"/  c #9C8573",
+"(  c #9C8D7B",
+")  c #838183",
+"_  c #948D83",
+"`  c #9C8D83",
+"'  c #A49583",
+"]  c #AC9583",
+"[  c #AC9D8B",
+"{  c #B49D83",
+"}  c #C5B6A4",
+"|  c #C5B6AC",
+" . c #CDBAA4",
+".. c #CDBAAC",
+"X. c #D5C6B4",
+"o. c #DEC6B4",
+"O. c #EEDED5",
+"+. c #F6E2D5",
+/* pixels */
+"                                ",
+"                                ",
+"  O & & * - % % @               ",
+"  * 1 5 q 0 7 3 > * #           ",
+"o 4 d l x c x x a q > #         ",
+"@ e b c I U P L B k i 3 $       ",
+"+ t Z D Y ' ` ^ E H V h 8 ;     ",
+"o 5 z V R ~ ..X.| ! I C u :     ",
+"  * r ) Y W { +.O.} _ D j 6 ;   ",
+"  + > d T R /  .o.} ( I c p :   ",
+"    # > v F J ~ ] [ R K x f , . ",
+"    X % q k N S G Q Y A C g > o ",
+"      o & 5 u h M m Z C n u #   ",
+"        O % 3 7 w s j y r r &   ",
+"          + # = < 8 9 > 2 0     ",
+"              X # # o + O +     "
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/konquest.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/konquest.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/konquest.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,245 @@
+/* XPM */
+static char *konquest[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 207 2",
+"   c black",
+".  c #000008",
+"X  c #000408",
+"o  c #000808",
+"O  c #080C08",
+"+  c #000410",
+"@  c #000810",
+"#  c #000C10",
+"$  c #080810",
+"%  c #080C10",
+"&  c #081010",
+"*  c #081018",
+"=  c #081418",
+"-  c #101410",
+";  c #101018",
+":  c #101418",
+">  c #101810",
+",  c #101C10",
+"<  c #101818",
+"1  c #101C18",
+"2  c #181810",
+"3  c #181C10",
+"4  c #181C18",
+"5  c #101420",
+"6  c #101820",
+"7  c #101C20",
+"8  c #101C29",
+"9  c #181C20",
+"0  c #182018",
+"q  c #182418",
+"w  c #182020",
+"e  c #182029",
+"r  c #182429",
+"t  c #201C20",
+"y  c #202018",
+"u  c #202020",
+"i  c #202420",
+"p  c #202029",
+"a  c #202429",
+"s  c #202820",
+"d  c #202829",
+"f  c #292420",
+"g  c #292820",
+"h  c #292829",
+"j  c #292C29",
+"k  c #202431",
+"l  c #202831",
+"z  c #202C31",
+"x  c #292831",
+"c  c #292C31",
+"v  c #292C39",
+"b  c #293031",
+"n  c #293039",
+"m  c #313031",
+"M  c #313431",
+"N  c #313039",
+"B  c #313439",
+"V  c #393031",
+"C  c #393431",
+"Z  c #393439",
+"A  c #393839",
+"S  c #393C39",
+"D  c #313441",
+"F  c #313841",
+"G  c #393C41",
+"H  c #394039",
+"J  c #394041",
+"K  c #39404A",
+"L  c #413831",
+"P  c #413C39",
+"I  c #414039",
+"U  c #4A4439",
+"Y  c #524439",
+"T  c #414041",
+"R  c #414441",
+"E  c #41444A",
+"W  c #4A4441",
+"Q  c #4A4841",
+"!  c #4A484A",
+"~  c #4A4C4A",
+"^  c #414852",
+"/  c #4A4852",
+"(  c #4A4C52",
+")  c #4A5052",
+"_  c #524441",
+"`  c #524841",
+"'  c #524C41",
+"]  c #52484A",
+"[  c #524C4A",
+"{  c #5A4C4A",
+"}  c #524C52",
+"|  c #52504A",
+" . c #5A504A",
+".. c #5A554A",
+"X. c #525052",
+"o. c #525552",
+"O. c #52505A",
+"+. c #52555A",
+"@. c #5A5552",
+"#. c #5A555A",
+"$. c #5A5952",
+"%. c #5A595A",
+"&. c #5A5D5A",
+"*. c #5A5D62",
+"=. c #625041",
+"-. c #62554A",
+";. c #625952",
+":. c #625D52",
+">. c #625D5A",
+",. c #6A5D52",
+"<. c #626152",
+"1. c #62615A",
+"2. c #6A6152",
+"3. c #6A6552",
+"4. c #6A615A",
+"5. c #6A655A",
+"6. c #73655A",
+"7. c #73695A",
+"8. c #736D5A",
+"9. c #7B6952",
+"0. c #7B6D5A",
+"q. c #626162",
+"w. c #626562",
+"e. c #6A6962",
+"r. c #6A6D62",
+"t. c #736962",
+"y. c #736D62",
+"u. c #736D6A",
+"i. c #7B6D62",
+"p. c #737162",
+"a. c #73716A",
+"s. c #73756A",
+"d. c #7B7162",
+"f. c #7B7562",
+"g. c #7B756A",
+"h. c #7B796A",
+"j. c #737573",
+"k. c #7B7573",
+"l. c #836D5A",
+"z. c #83755A",
+"x. c #8B715A",
+"c. c #837162",
+"v. c #837562",
+"b. c #83756A",
+"n. c #83796A",
+"m. c #837D6A",
+"M. c #8B7962",
+"N. c #8B796A",
+"B. c #8B7D6A",
+"V. c #837D73",
+"C. c #8B7D73",
+"Z. c #947962",
+"A. c #947D62",
+"S. c #83817B",
+"D. c #8B8173",
+"F. c #8B8573",
+"G. c #8B817B",
+"H. c #8B857B",
+"J. c #94856A",
+"K. c #948173",
+"L. c #948573",
+"P. c #948973",
+"I. c #94897B",
+"U. c #9C8573",
+"Y. c #9C8973",
+"T. c #9C8D7B",
+"R. c #9C917B",
+"E. c #A4917B",
+"W. c #AC957B",
+"Q. c #8B898B",
+"!. c #8B8D8B",
+"~. c #948D83",
+"^. c #949183",
+"/. c #9C9183",
+"(. c #9C958B",
+"). c #9C9994",
+"_. c #A49583",
+"`. c #A4998B",
+"'. c #A49D8B",
+"]. c #AC9583",
+"[. c #AC9983",
+"{. c #AC9D8B",
+"}. c #B49D83",
+"|. c #B4A594",
+" X c #BDAA94",
+".X c #BDAE9C",
+"XX c #BDB6A4",
+"oX c #C5AA8B",
+"OX c #CDBA9C",
+"+X c #C5B2A4",
+"@X c #C5B6A4",
+"#X c #C5BAAC",
+"$X c #CDB6AC",
+"%X c #CDBAA4",
+"&X c #CDBAAC",
+"*X c #CDBEAC",
+"=X c #D5BEA4",
+"-X c #DEC6B4",
+";X c #DECAB4",
+":X c #DECEBD",
+">X c #E6D2BD",
+",X c #E6D6C5",
+"<X c #E6DACD",
+"1X c #EEDAC5",
+"2X c #EEE2D5",
+"3X c #F6E6DE",
+"4X c #F6EEE6",
+/* pixels */
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"    + @ * * * : = = : : & & & & % #                             ",
+"    # 5 5 6 6 w r w w w 9 < 1 7 < : ; =                         ",
+"  o * 8 e r z c b b c c h g d d w 1 : : * %                     ",
+"X @ 5 k n G T T T P I ! I P P A m j i 9 < & % %                 ",
+"X # 7 l K / ! ) [ ` ' ..{ ' | [ W S m c w < * %                 ",
+"X * r v E X.[ W u.y.5.,.=.,.7.r.$.` T H B c 9 : & O             ",
+"@ = l B ! +.I | e.g.n.B.M.v.p.8.;.{ ` W I A j y , -             ",
+"+ * n D ( &.;.:.2.b./._./.F.D.m.n.8.<. at .[ U P A s > &           ",
+"X # k F ( %.4.2.y.I.{.P././._.R.P.B.d.p.e.$.! H b i 4 >         ",
+"X # 9 b G &.`  .d.L.J.J.#X&X&X&X+X'.F.f.t.y.#.( M s 0 >         ",
+"+ @ 6 l M X.1.:.0.D.K.Y. at X%X;X:X:X$X/.D.0.t. at .} T m q 3 -       ",
+"  @ & e x A Q.k.7.C.B.x.W.OX1X3X2X<X&X|.^.b.:.$.! C i 4 -       ",
+"    @ 6 l B j.!.h.d.z.Z.A.oX>X4X3X,X*X.X`.(.5. at .[ P g 0 2 <     ",
+"    + % < i G q.s.).F.N.U.W.=X,X,X-X%X.XT.).S.:.] W S g 4 -     ",
+"      @ = < t A %.a.V.i.l.U.}. X%X%X%XXXL.P.n.;.Q ~ R M q >     ",
+"      o % ; : 0 ( q.1.:.,.c.P.[.].W..X|.9.B.h.5.` P R M y > .   ",
+"        @ * : 4 A E q.w.4.2.7.D._._.E.Y.v.H.p.-.` T E T i > X   ",
+"        X @ * < c M T &.| Y :.2.2.3.L.~.H.G.:.%. at .W S ! i - o   ",
+"            # * 9 a m ! %.[ ` :.;.6.b.V.y.;. .*.*.O.C T w & @   ",
+"            @ @ ; 7 a i A T P ` %.$._ ..X.X.! %.*.+.G j : $ @   ",
+"              X @ * e d h j P P ! L W ! >.[ ! X.^ ( J h * %     ",
+"                + @ ; < p a i f h V T T o.T A G N G G a *       ",
+"                  + @ ; < u u u u a Z Z S m h d a c B d *       ",
+"                    + # & : < 1 9 u d m c a i 9 e d A l %       ",
+"                        o % = : < 9 4 9 9 9 6 * : 9 9 :         ",
+"                            X @ % % & % o % # @ + @ + #         ",
+"                                                                "
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kpat-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kpat-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kpat-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+/* XPM */
+static char *kpat16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 7 1",
+"  c black",
+". c blue",
+"X c red",
+"o c #C0C0C0",
+"O c #C0FFC0",
+"+ c gray100",
+"@ c None",
+/* pixels */
+"@   @@   @@@   @",
+" +++  +++ @ +++ ",
+" +X+  + + @ +X+ ",
+" +++  +++ @ +++ ",
+" +++  +++ @ +++ ",
+" ooo +    @ ooo ",
+" +++ +   @@ +++ ",
+"      O.O @     ",
+" +++  .O. @ +++ ",
+" +++  O.O @ +++ ",
+" ooo  .O. @@   @",
+" +++ @   @@@@@@@",
+"     @@@@@@@@@@@",
+" +++ @@@@@@@@@@@",
+" +++ @@@@@@@@@@@",
+"@   @@@@@@@@@@@@"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kpat.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kpat.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kpat.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,45 @@
+/* XPM */
+static char *kpat[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 7 1",
+"  c black",
+". c blue",
+"X c red",
+"o c #C0C0C0",
+"O c #C0FFC0",
+"+ c gray100",
+"@ c None",
+/* pixels */
+"@       @@@@       @@@@       @@",
+" +++++++ @@ +++++++ @@ +++++++ @",
+" +X+++X+  @ + +++ +  @ +X+++X+  ",
+" +++++++  @ +++++++  @ +++++++  ",
+" +++++++  @ +++++++  @ +++++++  ",
+" +++X+++  @ +++ +++  @ +++X+++  ",
+" +++++++  @ +++++++  @ +++++++  ",
+" +++++++  @ +++++++  @ +++++++  ",
+" +X+++X+  @ + +++ +  @ +X+++X+  ",
+" +++++++  @ +++++++  @ +++++++  ",
+"          @@         @          ",
+" ooooooo  @@@       @@ ooooooo  ",
+" +++++++  @@@@@@@@@@@@ +++++++  ",
+" +X+++X+  @@       @@@ + +++ +  ",
+" +++++++  @ O.O.O.O @@ +++++++  ",
+"          @ .O.O.O.  @          ",
+" ooooooo  @ O.O.O.O  @ +++++++  ",
+" +++++++  @ .O.O.O.  @ +++++++  ",
+" + +++ +  @ O.O.O.O  @ +X+++X+  ",
+" +++++++  @ .O.O.O.  @ +++++++  ",
+"          @ O.O.O.O  @@         ",
+" ooooooo  @ .O.O.O.  @@@       @",
+" +++++++  @ O.O.O.O  @@@@@@@@@@@",
+" +X+++X+  @@         @@@@@@@@@@@",
+" +++++++  @@@       @@@@@@@@@@@@",
+"          @@@@@@@@@@@@@@@@@@@@@@",
+" ooooooo  @@@@@@@@@@@@@@@@@@@@@@",
+" +++++++  @@@@@@@@@@@@@@@@@@@@@@",
+" + +++ +  @@@@@@@@@@@@@@@@@@@@@@",
+" +++++++  @@@@@@@@@@@@@@@@@@@@@@",
+"@         @@@@@@@@@@@@@@@@@@@@@@",
+"@@       @@@@@@@@@@@@@@@@@@@@@@@"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kpoker-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kpoker-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kpoker-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,35 @@
+/* XPM */
+static char *kpoker16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 13 1",
+"  c black",
+". c red",
+"X c #808000",
+"o c #C0C000",
+"O c yellow",
+"+ c #808080",
+"@ c #A0A0A4",
+"# c #FFDCA8",
+"$ c #C0C0C0",
+"% c #FFC0C0",
+"& c #FFFFC0",
+"* c gray100",
+"= c None",
+/* pixels */
+"====    ========",
+"==  $$$@   =====",
+"= ## $@@&&X ====",
+" X&&X $@XX  ====",
+" OXXo @@  * ====",
+" XooX   *%.* ===",
+" OXX  ****%** ==",
+" o  ********%* =",
+"  *%***%.**%.* =",
+" +*.%********+* ",
+" *+**%*****++** ",
+"= *+*.%**++**  =",
+"== *+**++**  ===",
+"=== *++**  =====",
+"==== **  =======",
+"=====  ========="
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kpoker.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kpoker.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kpoker.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,269 @@
+/* XPM */
+static char *kpoker[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 231 2",
+"   c black",
+".  c #020204",
+"X  c #060604",
+"o  c #0B0A0C",
+"O  c #0E0E0C",
+"+  c #120E0C",
+"@  c gray7",
+"#  c #161214",
+"$  c #161614",
+"%  c #1A1614",
+"&  c gray10",
+"*  c #1B1E1F",
+"=  c #1E2220",
+"-  c #241E20",
+";  c #2A1A34",
+":  c #2A360C",
+">  c #2E3E04",
+",  c #322A1C",
+"<  c #222224",
+"1  c #2A2A2C",
+"2  c #2E2E2C",
+"3  c #323234",
+"4  c gray21",
+"5  c #3A3A3C",
+"6  c #2A3244",
+"7  c #265624",
+"8  c #3E4244",
+"9  c #3E465C",
+"0  c #367E7C",
+"q  c #4A0E2C",
+"w  c #422A0C",
+"e  c #5E2214",
+"r  c #4E362C",
+"t  c #4E3E2C",
+"y  c #6A1E1C",
+"u  c #6E3A0C",
+"i  c #763614",
+"p  c #7A2634",
+"a  c #5E5234",
+"s  c #526A3C",
+"d  c #7A5A2C",
+"f  c #6E6224",
+"g  c #6A6A34",
+"h  c #4E4E4C",
+"j  c #4E5254",
+"k  c #4C5650",
+"l  c #5A4A44",
+"z  c #524E54",
+"x  c #525254",
+"c  c #5A5A5C",
+"v  c #4A5A7C",
+"b  c #4E6E6C",
+"n  c #5E6664",
+"m  c #5E6A7C",
+"M  c #6E5A48",
+"N  c #76724A",
+"B  c #666E6C",
+"V  c #686A60",
+"C  c #6A6A6C",
+"Z  c #6E7264",
+"A  c #766E6C",
+"S  c #767664",
+"D  c #727A6C",
+"F  c #72727C",
+"G  c #7E7674",
+"H  c #3E228C",
+"J  c #6A6E8C",
+"K  c #6666AC",
+"L  c #7272D4",
+"P  c #668204",
+"I  c #7A8224",
+"U  c #7E8654",
+"Y  c #7A965C",
+"T  c #528E8C",
+"R  c #6E8284",
+"E  c #7E9E9C",
+"W  c #76AE84",
+"Q  c #66AAB4",
+"!  c #7682C4",
+"~  c #822E24",
+"^  c #8E323C",
+"/  c #B63A0C",
+"(  c #8A4624",
+")  c #866E24",
+"_  c #9E662C",
+"`  c #AE5A04",
+"'  c #A66A2C",
+"]  c #A27A3C",
+"[  c #BA7A3C",
+"{  c #965E4C",
+"}  c #964A6C",
+"|  c #AE5244",
+" . c #BE5E54",
+".. c #A66E6C",
+"X. c #BA6E7C",
+"o. c #C6022C",
+"O. c #F62A34",
+"+. c #FA3634",
+"@. c #FE0244",
+"#. c #FE167C",
+"$. c #D67264",
+"%. c #D67E7C",
+"&. c #F64A4C",
+"*. c #EE6AC4",
+"=. c #9A8E14",
+"-. c #869634",
+";. c #9A9A24",
+":. c #AEAA0C",
+">. c #8E8654",
+",. c #828264",
+"<. c #828E64",
+"1. c #8EB67C",
+"2. c #BA864C",
+"3. c #BE8A50",
+"4. c #AA9A64",
+"5. c #B2AE54",
+"6. c #BEAA5C",
+"7. c #AEB26C",
+"8. c #CA9244",
+"9. c #CE9E44",
+"0. c #D29E5C",
+"q. c #D69E5C",
+"w. c #CC9A60",
+"e. c #CC9E64",
+"r. c #C6A264",
+"t. c #EEB64C",
+"y. c #E6B654",
+"u. c #E6B264",
+"i. c #EABA64",
+"p. c #EABA74",
+"a. c #F2BA64",
+"s. c #F2BE6C",
+"d. c #EEC674",
+"f. c #F2C274",
+"g. c #F2C674",
+"h. c #868684",
+"j. c #86969C",
+"k. c #8E9690",
+"l. c #928E8C",
+"z. c #9A868C",
+"x. c #929294",
+"c. c #969694",
+"v. c #8AAEAC",
+"b. c #8ABEBC",
+"n. c #9EA2A4",
+"m. c #9EBABC",
+"M. c #AA9284",
+"N. c #AEAE8C",
+"B. c #A6A29C",
+"V. c #A6B6B4",
+"C. c #B6A6AC",
+"Z. c #B1B2B4",
+"A. c #B2B6B4",
+"S. c #B7B6B7",
+"D. c #BABABC",
+"F. c #BEBEBC",
+"G. c #8AB2CC",
+"H. c #B6B6E4",
+"J. c #92E284",
+"K. c #AECE8C",
+"L. c #8ACED4",
+"P. c #96DADC",
+"I. c #BED2DC",
+"U. c #C68684",
+"Y. c #C29A8C",
+"T. c #C2AEB4",
+"R. c #CABEBC",
+"E. c #FE8E8C",
+"W. c #E2AAA4",
+"Q. c #E2B2AC",
+"!. c #EAB6B4",
+"~. c #FEAAAC",
+"^. c #FAB2B4",
+"/. c #FEB6B4",
+"(. c #D2D69C",
+"). c #CEC6B4",
+"_. c #DED6BC",
+"`. c #C2E68C",
+"'. c #EAC280",
+"]. c #EAD294",
+"[. c #EADA93",
+"{. c #F8CE88",
+"}. c #FCD284",
+"|. c #FED689",
+" X c #FEDA8C",
+".X c #FEDE92",
+"XX c #E6CEAC",
+"oX c #FEC2BC",
+"OX c #FEE294",
+"+X c #FEE697",
+"@X c #FEEA98",
+"#X c #FAF28C",
+"$X c #FEE2A4",
+"%X c #FEE6A4",
+"&X c #FEEAA4",
+"*X c #FEEEA3",
+"=X c #FEEAAC",
+"-X c #FEEEB3",
+";X c #FAEEBC",
+":X c #FEF2A1",
+">X c #FEFAAA",
+",X c #FEFEAC",
+"<X c #FEF6BC",
+"1X c #C1C2C4",
+"2X c #C2C6C4",
+"3X c #C6C2C4",
+"4X c #C7C6C5",
+"5X c #CACACC",
+"6X c #CFCECE",
+"7X c #C6CEDC",
+"8X c #D2D2D4",
+"9X c #D6D2D4",
+"0X c #D6D6D4",
+"qX c #D2DAD4",
+"wX c #D6DADC",
+"eX c #DAD6D4",
+"rX c #DBDADC",
+"tX c #DEDEDC",
+"yX c #EAD6D4",
+"uX c #F6DAD8",
+"iX c #FAD6D4",
+"pX c #E2E2E4",
+"aX c #E8EAF0",
+"sX c #EAFEFC",
+"dX c #FAF6E4",
+"fX c #F2F2F0",
+"gX c #F6F2F4",
+"hX c #F6F6F4",
+"jX c #F2FEFC",
+"kX c #FEFEFC",
+"lX c None",
+/* pixels */
+"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX",
+"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX",
+"lXlXlXlXlXlXlXlXlXlXlXlXlX. . . lXlXlXlXlXlXlX. . . lXlXlXlXlXlX",
+"lXlXlXlXlXlXlXlXlXlXlX. . . . . . . lXlXlX. . OXOXOX. . lXlXlXlX",
+"lXlXlXlXlXlXlXlXlXlX. . . . . . . . . lX. :X.X}.}. X&X at X. lXlXlX",
+"lXlXlXlXlXlXlXlXlXlX. . . . . . . . . . >X.X}..XOXOX.X%XOX. lXlX",
+"lXlXlXlXlXlXlXlXlXlX. < o . . . X @ 3 N <X X.X at X X X|..X+X. lXlX",
+"lXlXlXlX. . . lXlXlX. 1 2 3 4 5 4 4 < N <XOXOXOX XOX=X<X] . lXlX",
+"lXlX. . OXOXOX. . lX. & 8 & $ & # + - N ,X%X-X-X%X;X].3._ . lXlX",
+"lX. @X:XOX.XOX at X[.. . = x & & $ o + - N ,X*X%Xg.a.w.3.w.' . lXlX",
+". [.+X X|..XOXOX+X at X. * h @ $ % X + - N ,X*X$Xt.s.9.0.t.. lXlXlX",
+". [.OX XOX.X X X|.-Xx * j $ $ % o @ & 2 4.#X<XoX~.iXd . lXlXlXlX",
+". [.&X.X+X.X.XOX:XOXt * h @ $ $ . X # B n.kX/.O.E.uX. lXlXlXlXlX",
+". [.*X=XOX%X.X;X'.3.r * z $ O O < D 9XkX*.U.,.G.k.eXkX. lXlXlXlX",
+". [.:X-X X{.d.e.2.q.M @ 1 & C x.kXkXkXm.E T +.#.T.C.jXkX. lXlXlX",
+". [.:X-X{.s.p.r.e.[ M 8 l.4XkXkXkXb.l y V.S./.( 9 e `.kXkX. lXlX",
+". [.:X-X}.f.u.8.2.r.aXkXkXkXrX!.> ` Q 7 i W z rXV.6 I K.kXkX. lX",
+". 6.>X-X}.i.'.XXgXkXkXkXv.N.U P Z B Y -.x.S * S.4 m { j c.hXkX. ",
+"lX. 6._.[.y.dXkXkXwXZ } ! R.< : J ~ ..: ^ (.).5.1X1.H | R kXtX. ",
+"lXlX. . . w pXkXkXF ;.<.s h.V 7.; X., >.0 ) I a n G Q.jXhX8X8X. ",
+"lXlXlXlXlX. 0X6XkXkXL :.f S.B.aXz.q =.p / u b 6XhXkXfX4XF.gXhX. ",
+"lXlXlXlXlX. fX0X5XkXhXv n A M.Y.H.K  .g J.sXhXkXrX4XD.gXhX6X0X. ",
+"lXlXlXlXlX. 8XfXrX5XkXkXk $. at .o.P.j.pX2XkXkX1X3XgXhXhXD.0XrXZ.. ",
+"lXlXlXlXlXlX. 5XhXeX6XkXZ.c I.L.&.^.kXkX1XS.hXhX0XZ.8X5XA.x.. . ",
+"lXlXlXlXlXlXlX. 4XhX0X7X/.W.%.oXkXkX1X4XgXhX4X5X4XZ.l.. . . lXlX",
+"lXlXlXlXlXlXlXlX. 8XhXqXR.iXyX1XS.tXhXhXZ.tXA.l.. . . lXlXlXlXlX",
+"lXlXlXlXlXlXlXlXlX. F.hX0X6XD.hXhX0XD.Z.x.. . . lXlXlXlXlXlXlXlX",
+"lXlXlXlXlXlXlXlXlXlX. rXhXhX8X1XZ.x.. . . lXlXlXlXlXlXlXlXlXlXlX",
+"lXlXlXlXlXlXlXlXlXlXlX. 8XZ.l.. . . lXlXlXlXlXlXlXlXlXlXlXlXlXlX",
+"lXlXlXlXlXlXlXlXlXlXlXlX. . . lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX",
+"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX",
+"lXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlXlX"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kreversi-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kreversi-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kreversi-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+/* XPM */
+static char *kreversi16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 10 1",
+"  c #C0C0C0",
+". c #800000",
+"X c navy",
+"o c #C00000",
+"O c #0000C0",
+"+ c red",
+"@ c blue",
+"# c #FFC0C0",
+"$ c #C0C0FF",
+"% c black",
+/* pixels */
+"%%%%%%%%%%%%%%%%",
+"%     +#.  +#. %",
+"%     #+o  #+o %",
+"%     .o.  .o. %",
+"%              %",
+"%              %",
+"%+#.  +#.  @$X %",
+"%#+o  #+o  $@O %",
+"%.o.  .o.  XOX %",
+"%              %",
+"%              %",
+"%@$X  @$X      %",
+"%$@O  $@O      %",
+"%XOX  XOX      %",
+"%              %",
+"%%%%%%%%%%%%%%%%"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kreversi.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kreversi.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kreversi.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,276 @@
+/* XPM */
+static char *kreversi[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 238 2",
+"   c black",
+".  c #020204",
+"X  c #060614",
+"o  c #02021C",
+"O  c #120604",
+"+  c #160204",
+"@  c #1E0204",
+"#  c #1A0E0C",
+"$  c #020229",
+"%  c #020239",
+"&  c #220404",
+"*  c #2E0204",
+"=  c #261214",
+"-  c #2E1A14",
+";  c #320204",
+":  c #360604",
+">  c #3A0204",
+",  c #3E0A0C",
+"<  c #302E28",
+"1  c #3E2B24",
+"2  c #3A3634",
+"3  c #3C3A37",
+"4  c #02024C",
+"5  c #020659",
+"6  c #0E0E58",
+"7  c #121254",
+"8  c #020264",
+"9  c #030667",
+"0  c #020A6F",
+"q  c #490204",
+"w  c #560204",
+"e  c #5A0604",
+"r  c #4E322C",
+"t  c #423E38",
+"y  c #522624",
+"u  c #5E2A24",
+"i  c #620604",
+"p  c #730604",
+"a  c #7A0204",
+"s  c #7B0A04",
+"d  c #6E221C",
+"f  c #43423F",
+"g  c #4E4234",
+"h  c #464644",
+"j  c #4E4E44",
+"k  c #4C4A48",
+"l  c #54524E",
+"z  c #5A5E4C",
+"x  c #5E5A4C",
+"c  c #5E5E74",
+"v  c #625244",
+"b  c #6A5A4C",
+"n  c #625E54",
+"m  c #6E5E54",
+"M  c #72524C",
+"N  c #7A5A4C",
+"B  c #656255",
+"V  c #666657",
+"C  c #6B6254",
+"Z  c #6A665D",
+"A  c #6B6A5C",
+"S  c #6D6E5F",
+"D  c #72665C",
+"F  c #7C6A5C",
+"G  c #6E6A6C",
+"H  c #6E6E74",
+"J  c #726E64",
+"K  c #727265",
+"L  c #767664",
+"P  c #7A7667",
+"I  c #7C7A6D",
+"U  c #7E7E6C",
+"Y  c #020A8F",
+"T  c #0A0E8F",
+"R  c #020A9D",
+"E  c #1E1E84",
+"W  c #0206AC",
+"Q  c #020EA4",
+"!  c #020AB3",
+"~  c #2A2A84",
+"^  c #0202C4",
+"/  c #0206C7",
+"(  c #0206DC",
+")  c #020AD4",
+"_  c #0A0EDC",
+"`  c #1216CC",
+"'  c #0202EF",
+"]  c #161AF4",
+"[  c #181EF4",
+"{  c #2E32DC",
+"}  c #2E2EEC",
+"|  c #222AF4",
+" . c #3236E4",
+".. c #363AF4",
+"X. c #3B42CF",
+"o. c #6A6EBC",
+"O. c #7676BC",
+"+. c #464ED4",
+"@. c #626EFC",
+"#. c #7682FC",
+"$. c #860604",
+"%. c #830A04",
+"&. c #861E1C",
+"*. c #960604",
+"=. c #920A0C",
+"-. c #9D0A09",
+";. c #9C0E0C",
+":. c #A50604",
+">. c #AA0204",
+",. c #AA0A0C",
+"<. c #A80E0C",
+"1. c #AE1A14",
+"2. c #BE0604",
+"3. c #BA0A0C",
+"4. c #B90E0C",
+"5. c #A6322C",
+"6. c #96463C",
+"7. c #9E4A44",
+"8. c #925A4C",
+"9. c #827E6C",
+"0. c #8E7E6C",
+"q. c #927E6C",
+"w. c #9A7264",
+"e. c #CC0604",
+"r. c #C80E0C",
+"t. c #CE0A0C",
+"y. c #D60A0C",
+"u. c #D50E0C",
+"i. c #DE0204",
+"p. c #DD0604",
+"a. c #DE0E0C",
+"s. c #C22E24",
+"d. c #D22624",
+"f. c #DE2E2C",
+"g. c #DA362C",
+"h. c #DE3E34",
+"j. c #E20604",
+"k. c #E60204",
+"l. c #E20E0C",
+"z. c #ED0604",
+"x. c #F20204",
+"c. c #F40604",
+"v. c #FA0404",
+"b. c #FD1A19",
+"n. c #E6261C",
+"m. c #F22A2C",
+"M. c #FE3234",
+"N. c #DE463C",
+"B. c #E2423C",
+"V. c #DA4A44",
+"C. c #D6564C",
+"Z. c #D66654",
+"A. c #C67E6C",
+"S. c #DE7664",
+"D. c #F24A44",
+"F. c #FA5A5C",
+"G. c #FE5E5C",
+"H. c #FA6A6C",
+"J. c #848272",
+"K. c #868674",
+"L. c #8A867C",
+"P. c #8D8A78",
+"I. c #968674",
+"U. c #90867C",
+"Y. c #968A74",
+"T. c #928E7C",
+"R. c #96927D",
+"E. c #CA927C",
+"W. c #969684",
+"Q. c #9B9684",
+"!. c #9C9284",
+"~. c #9E9A84",
+"^. c #9692A4",
+"/. c #A19E87",
+"(. c #A6A28C",
+"). c #AAA69C",
+"_. c #AEAA94",
+"`. c #B0AE94",
+"'. c #B6B298",
+"]. c #BAB69C",
+"[. c #BEBA9C",
+"{. c #B6AEA4",
+"}. c #B6B6B4",
+"|. c #BABAB9",
+" X c #969AEC",
+".X c #A6AEFC",
+"XX c #A6B2FC",
+"oX c #B2BAFC",
+"OX c #BAC2FC",
+"+X c #DE9A84",
+"@X c #DEA29C",
+"#X c #C6AAA4",
+"$X c #C2BEA1",
+"%X c #CABAB4",
+"&X c #DCBABC",
+"*X c #FE9694",
+"=X c #FA9A9C",
+"-X c #FE9E9C",
+";X c #E6BABC",
+":X c #EAB6B4",
+">X c #EEBABC",
+",X c #C6C2A4",
+"<X c #C8C6AC",
+"1X c #CECAAB",
+"2X c #CACAB4",
+"3X c #C6D6BC",
+"4X c #CED4BC",
+"5X c #D6C2BC",
+"6X c #D2CEB7",
+"7X c #DECAB4",
+"8X c #D5D2B5",
+"9X c #D2D6BC",
+"0X c #D2DABC",
+"qX c #DAD6B7",
+"wX c #DEDABC",
+"eX c #E2DEBC",
+"rX c #E6E2B4",
+"tX c #DEC6C4",
+"yX c #DADBC2",
+"uX c #FEC6C4",
+"iX c #FED1D1",
+"pX c #FED6D4",
+"aX c #E5E2C5",
+"sX c #EAE2C4",
+"dX c #EDE6C5",
+"fX c #EEEACB",
+"gX c #E9EAD4",
+"hX c #EAEEDC",
+"jX c #F2EACC",
+"kX c #F4EECD",
+"lX c #F6F6D4",
+"zX c #FAF2D4",
+"xX c #FBF6D4",
+"cX c #E3EAFC",
+"vX c #EEF6FC",
+"bX c #F2FAFC",
+"nX c #FEF5F4",
+"mX c None",
+/* pixels */
+"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX",
+"mX. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+"mX. xXxXxXxXxXxXxXxX].J.jXjXjX at XS.A.#XjXjX9.jXjXjX at XS.A.#XjXjX. ",
+"mX. xXxXxXxXzXzXkXkX].A rX7XV.H.M.k.>.8.aXI rX7XV.H.M.k.>.8.aX. ",
+"mX. xXxXxXxXzXzXkXkX].Z rXC.=XnXiXx.t.p L.J.aXC.=XzXiXx.t.p J.. ",
+"mX. xXxXzXzXkXjXjXdX].A >Xz.-XnXuXp.4.p r I >Xj.=XnXuXp.4.p r . ",
+"mX. xXzXzXkXkXjXjXfX].A :Xk.b.G.m.t.<.i - A :Xk.b.G.m.e.,.i - . ",
+"mX. xXjXjXjXjXdXdXdX].A &X2.l.a.t.-.$.> 1 I &X2.l.a.t.,.%.; 1 . ",
+"mX. xXfXdXdXdXdXaXsX].A eX6.:.4.-.s q + C J.eX6.>.4.-.p q + m . ",
+"mX. xXdXfXdXdXsXsXaX].V sX<Xu e w * + 1 8XI sX<Xu w w ; + 1 6X. ",
+"mX. ].].].].].].].].].Z eXyX9XC 3 t F qXaXL eXyX9XC 3 3 F qXeX. ",
+"mX. U B B B A V B B Z l L.x Z L S S S B V k K B B A A V A V x . ",
+"mX. lXlXlX:XS.;XkXlXzXK dXdXdX:XS.>XdXdXdXK 2X<X<X}.O.}.<X2X<X. ",
+"mX. yX1XZ.g.d.5.w.4XqXz gX3XE.h.f.s.7./.eXJ eX).} ..] / T H [.. ",
+"mX. 5XB.=X-Xb.y.%.N qXV hXE.D.uXH.x.3.d `.U 6X{ #.vX.X^ W 6 L.. ",
+"mX. +XH.nXnXF.u.-., !.G 7Xn.uXnXnXz.r.a v I |.' OXvXcX/ R 8 k . ",
+"mX. N.M.pXiXn.t.*.: D S >Xz.H.nX*Xi.4.p 1 A }.' |  XX.W Y 4 2 . ",
+"mX. g.v.v.k.t.;.p & b A ;Xi.v.c.k.3.;.q - A }.^ ) / / Y 9 $ f . ",
+"mX. A.e.a.3.,.%.q O q.J tX1.u.u.4.-.p * g P ,XE R R Y 5 % X S . ",
+"mX. %X&.*.=.p q + 1 6XB gXw.$.;.$.i * # I.I 8XI 6 5 % o . f _.. ",
+"mX. yX[.M : @ = x 2X8XB gX0X0.y * @ < I.wXL <X[.(.B h l L.].`.. ",
+"mX. U B B V V V B B V l J.x Z L S A J Z V j K B n A A V S Z z . ",
+"mX. 8X8X8X}.O.}.8X8X8XK <X1X<X}.O.}.<X1X1XK [.].].[.].].].].].. ",
+"mX. qX{.{ ..] / T c 1XA rX).}  .] ^ T H [.A ]./././././.~.Q.Q.. ",
+"mX. <XX. at .vXoX_ W 5 K.K 6X{ #.bXXX^ W 6 P.L [./.~.~.~.~.Q.!.!.. ",
+"mX. O.' .XbXcX` Q 9 f S |.' OXvXcX/ Q 8 k K }.~./.~.~.Q.Q.W.R.. ",
+"mX. o.' [  X+.W Y 5 < V }.' }  XX.^ Y 5 3 A [.~.~.Q.Q.!.R.R.R.. ",
+"mX. ^.^ ) ( ! Y 0 $ 2 B |.^ ( / ! Y 0 o f J ].Q.~.W.Q.W.R.R.R.. ",
+"mX. $X~ W Y Y 9 % . G A <XE R R Y 4 % X J K [.R.Q.R.R.R.T.T.T.. ",
+"mX. <XL.7 4 % $ . 3 '.V 8XI 6 4 % o . h `.Z ].Q.R.R.R.R.T.P.Y.. ",
+"mX. ].,X`.Z h j P.$X$XP 2X[.(.V k l U.].'.L ].Q.W.R.R.R.R.T.P.. ",
+"mX. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksame-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksame-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksame-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,34 @@
+/* XPM */
+static char *ksame16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 12 1",
+"  c #585858",
+". c #800000",
+"X c navy",
+"o c #808000",
+"O c #C00000",
+"+ c #0000C0",
+"@ c #C0C000",
+"# c red",
+"$ c #FFC0C0",
+"% c #C0C0FF",
+"& c #FFFFC0",
+"* c black",
+/* pixels */
+"****************",
+"*        +  ## *",
+"*       ++%.O$#*",
+"*       +++.OO#*",
+"*        X  .. *",
+"*#$#    @&@ $$ *",
+"*OO$    @@&.OO#*",
+"*.O.    o at o OO *",
+"* #  ++  #  ++ *",
+"*OO$X+%+OO$X+%+*",
+"*OOOX+++OOOX+++*",
+"* .  XX  .  XX *",
+"*+%+ %% @&@ && *",
+"*++%X+++@@&o@@@*",
+"*X+X ++ o at o @@ *",
+"****************"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksame.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksame.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksame.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,294 @@
+/* XPM */
+static char *ksame[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 256 2",
+"   c #020302",
+".  c #01060A",
+"X  c #0D0D0D",
+"o  c #090905",
+"O  c #1D2D3D",
+"+  c #08243D",
+"@  c #3D1123",
+"#  c #3D3218",
+"$  c #21303F",
+"%  c #16184C",
+"&  c #0E1C64",
+"*  c #17254E",
+"=  c #0D2B52",
+"-  c #0A316C",
+";  c #172565",
+":  c #1C326B",
+">  c #1C3574",
+",  c #0E2E79",
+"<  c #282C4A",
+"1  c #232F4D",
+"2  c #3A4B3C",
+"3  c #3D5548",
+"4  c #264473",
+"5  c #3F507D",
+"6  c #3D5966",
+"7  c #4D1A18",
+"8  c #53190F",
+"9  c #541A1A",
+"0  c #560F1B",
+"q  c #4D1A27",
+"w  c #5E1E2D",
+"e  c #4F2016",
+"r  c #48310A",
+"t  c #4A2924",
+"y  c #4D3531",
+"u  c #502A30",
+"i  c #4D2B2B",
+"p  c #681918",
+"a  c #71190F",
+"s  c #781A18",
+"d  c #7B1826",
+"f  c #6A1223",
+"g  c #6E201A",
+"h  c #78211D",
+"j  c #673D10",
+"k  c #6F3A3F",
+"l  c #7F2320",
+"z  c #762B32",
+"x  c #723839",
+"c  c #723F43",
+"v  c #4E4F0E",
+"b  c #494C1B",
+"n  c #53560D",
+"m  c #595011",
+"M  c #4C4B3F",
+"N  c #484B27",
+"B  c #7F5B15",
+"V  c #725F35",
+"C  c #73630C",
+"Z  c #736F1B",
+"A  c #71710F",
+"S  c #797619",
+"D  c #6A660F",
+"F  c #6E6530",
+"G  c #71662B",
+"H  c #4A4C52",
+"J  c #544643",
+"K  c #554B4A",
+"L  c #5F4F50",
+"P  c #555548",
+"I  c #555555",
+"U  c #555959",
+"Y  c #5A5555",
+"T  c #595955",
+"R  c #595959",
+"E  c #555759",
+"W  c #4D5051",
+"Q  c #4B5566",
+"!  c #4A547A",
+"~  c #545865",
+"^  c #515E75",
+"/  c #5F6057",
+"(  c #59606E",
+")  c #5C6374",
+"_  c #644947",
+"`  c #6A5856",
+"'  c #794B47",
+"]  c #78524C",
+"[  c #765957",
+"{  c #656447",
+"}  c #646556",
+"|  c #767050",
+" . c #0F319D",
+".. c #182D83",
+"X. c #193C8B",
+"o. c #1C3B99",
+"O. c #293F93",
+"+. c #1E439C",
+"@. c #1A45A5",
+"#. c #20418D",
+"$. c #244595",
+"%. c #3D579D",
+"&. c #2349A3",
+"*. c #214FB2",
+"=. c #2452B9",
+"-. c #3B5AA4",
+";. c #2851A7",
+":. c #3861B3",
+">. c #1D56DA",
+",. c #1955E5",
+"<. c #2253C2",
+"1. c #2558D8",
+"2. c #3453CB",
+"3. c #2854E9",
+"4. c #2C5AF6",
+"5. c #3769DA",
+"6. c #3E6BCC",
+"7. c #376BE7",
+"8. c #3565F7",
+"9. c #405391",
+"0. c #576588",
+"q. c #5C70D7",
+"w. c #4073E6",
+"e. c #5877FA",
+"r. c #4B75F4",
+"t. c #6475CC",
+"y. c #6B7DD0",
+"u. c #6F86BC",
+"i. c #4F81F8",
+"p. c #5C8AF7",
+"a. c #7F95D0",
+"s. c #778BC3",
+"d. c #6A93F5",
+"f. c #7195EF",
+"g. c #7BA0F5",
+"h. c #861915",
+"j. c #911B16",
+"k. c #92170F",
+"l. c #8B1F25",
+"z. c #8F211D",
+"x. c #9B241F",
+"c. c #8D2320",
+"v. c #8F2D34",
+"b. c #9A2623",
+"n. c #A2221D",
+"m. c #A32623",
+"M. c #AD2623",
+"N. c #AB302D",
+"B. c #B82825",
+"V. c #B83D3B",
+"C. c #AE3736",
+"Z. c #90433E",
+"A. c #847F1C",
+"S. c #827B21",
+"D. c #8B5756",
+"F. c #8B4942",
+"G. c #80625F",
+"H. c #8A6561",
+"J. c #BB7673",
+"K. c #DC221E",
+"L. c #C52723",
+"P. c #DB2620",
+"I. c #D22722",
+"U. c #DB352E",
+"Y. c #D83D38",
+"T. c #C53A34",
+"R. c #E6231D",
+"E. c #E5382A",
+"W. c #E53935",
+"Q. c #FD3E2D",
+"!. c #ED3028",
+"~. c #C7452C",
+"^. c #E5433C",
+"/. c #ED5537",
+"(. c #F7423C",
+"). c #E64123",
+"_. c #DB4942",
+"`. c #CF7551",
+"'. c #C76553",
+"]. c #C46B63",
+"[. c #DB7E6D",
+"{. c #D17E7B",
+"}. c #C07A77",
+"|. c #F64A45",
+" X c #F7514D",
+".X c #F85A56",
+"XX c #EC5B4D",
+"oX c #F8655A",
+"OX c #F8706C",
+"+X c #938F0F",
+"@X c #948E16",
+"#X c #958D15",
+"$X c #9B9623",
+"%X c #8F8D31",
+"&X c #A49B22",
+"*X c #AD9F3D",
+"=X c #ACA323",
+"-X c #B4AB27",
+";X c #BDB327",
+":X c #B6A83C",
+">X c #8F9142",
+",X c #828347",
+"<X c #B5BC53",
+"1X c #B1AF69",
+"2X c #CABE1F",
+"3X c #C3B924",
+"4X c #CB807B",
+"5X c #E2806E",
+"6X c #F6827D",
+"7X c #CEC11F",
+"8X c #DBCE1F",
+"9X c #DCD11F",
+"0X c #CFD133",
+"qX c #D8CE20",
+"wX c #D3CC2F",
+"eX c #E4D71C",
+"rX c #E0D520",
+"tX c #E2D634",
+"yX c #EBE01B",
+"uX c #E9EA2A",
+"iX c #EEEC3D",
+"pX c #C8D05E",
+"aX c #C8C47A",
+"sX c #EADC47",
+"dX c #ECDE74",
+"fX c #FAEE50",
+"gX c #FBF057",
+"hX c #EAE94B",
+"jX c #F8F178",
+"kX c #88AAFB",
+"lX c #ABBEF7",
+"zX c #B2C4F9",
+"xX c #BDD1FC",
+"cX c #A4C0FC",
+"vX c #D98683",
+"bX c #F88885",
+"nX c #FC9895",
+"mX c #F7948E",
+"MX c #FBABA6",
+"NX c #FBB3AC",
+"BX c #FDBAB7",
+"VX c #FAF385",
+"CX c #F5F39C",
+"ZX c #FAF6AA",
+"AX c #FBF8B4",
+"SX c #C7D7FC",
+"DX c #DBE3FC",
+"FX c #FEC6C4",
+"GX c #FED0CE",
+"HX c #FED9D7",
+"JX c #FEE2DF",
+"KX c #FCFBC8",
+"LX c #FDFCD9",
+"PX c #E7EBFC",
+"IX c #FEE8E6",
+"UX c #FDFEE8",
+/* pixels */
+"  X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X   ",
+"X I I I I I I Y I I I E Y I I I I I I Y I W I I U W I I I I I X ",
+"X I R R R R R R R R R R R R R R Y R 0.0.0.^ U U ` G.D.D.[ U I X ",
+"X I R R R R R R R R R R R R R E ) kXkXi.7.:.5 [ vXmX.XW.V.v.L X ",
+"X E R R R R R R R R R R R R R E q.zXDXg.,.=.o.].NXIXnXR.L.n._ X ",
+"X R R R R R R R R R R R R R R ~ w.cXDXg.1.;..._.nXHXbXP.M.h.M X ",
+"X R R R R R R R R R R R R R T ~ 4.8.8.1.=.$.; U.Q.|.W.L.b.a J X ",
+"X I R R R R R R R R R R R R T ~ 2.>.1.=.+.: % C.P.P.L.m.s 8 J X ",
+"X I R E E ~ U E E R R R R R R R ! ;. at .X.- * < ] N.m.j.s 7 i W X ",
+"X I E [ D.] [ ` E I R R R R R E U Q 6 3 2 M T ~ c l.d f w K I X ",
+"X Y H.vXbX|.Y.C._ E R R R R T T | VXVXfXtX:XF | J.mX.XW.V.Z.I X ",
+"X ` 5XFXHX.XP.B.b.Y R R E T E / 1XZXLXjXeX;X at X`.NXHXmXR.B.x._ X ",
+"X ] oXFXHXoXI.m.z.I U U R R T } hXZXUXjX8X=X+X/.MXIXmXK.B.h._ X ",
+"X ' Q.|.|.U.B.c.g I U T R R T } uXiXhX0X;X$XD U.Q. X^.L.b.a J X ",
+"X ] ).K.I.B.b.g e I T T R R R } 0XeX9X3X&XZ v ~.R.P.L.m.h 8 J X ",
+"X Y F.B.m.j.p 7 y I U T R R R R ,X-X=X at XZ b N F.N.M.x.h 9 t K X ",
+"X Y Y z d 0 0 u T R ~ ( ~ ^ ~ R T V C j r i P T k h.f 0 q K I X ",
+"X R G.{.OX|.Y.C.` ) s.g.i.5.-.~ [ J.bX X^.V.' ` J.bX.XW.V.' I X ",
+"X ` [.BXGX.XP.B.v.t.zXSXd.>.*.$.].BXGXOXR.B.n.'.MXHXbXR.L.m._ X ",
+"X ] oXGXIX.XI.m.l.r.xXPXd.>.;...XXBXIXbXR.n.k./.MXIXnXP.M.k.J X ",
+"X ' Q..X.XU.B.c.w 4.r.p.5.<.+.; W. XoX^.L.b.a E.|.oX_.L.m.a J X ",
+"X ] E.R.K.B.m.g q 3.,.1.<.+.: % Y.R.R.L.m.l 8 T.R.R.I.M.l 8 J X ",
+"X ` Z.L.M.x.g 7 y 9.=.*.+.: * < Z.B.B.x.h 7 t F.B.B.n.s 9 t K X ",
+"X Y Y z f q @ u Y R 4 - = = 1 I Y x s p 7 t K Y k l.p 7 t K E X ",
+"X I ) s.f.7.w.%.Q ( u.f.w.5.-.~ } 1XdXsX0X*X} / 1XdXhXwX<X] I X ",
+"X Q y.zXSXr.1.;.o.t.lXSXp.1.*.$.<XZXKXjXrX;X$X<XCXKXVXrX3X$X{ X ",
+"X ! e.SXPXp.<.&. .r.SXPXf.1.&.X.hXKXUXVXrX=X+XuXZXUXCX9X;X+XP X ",
+"X ! 8.d.d.5.<.#...4.p.f.7.<.$.: uXgXjXsX3X$XA uXgXjXsX7X&XS M X ",
+"o ! 3.,.>.<.&.: & 3.,.,.<.;.> % 0XyXeX3X=XS n 0XeXeX2X=XA.n P X ",
+"X Q -.=.*.+.> * < %.=.=. at .> * < >X3X;X&XS m b >X;X2X&XA.m b W X ",
+"X I Q 4 - = + * H Q 4 - = = O H { G C m r # M T G C m r # M W X ",
+"  X X . . .   o X X . .     o X X o o   o o X X o o o o   X X   "
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kshisen-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kshisen-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kshisen-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,34 @@
+/* XPM */
+static char *kshisen16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 12 1",
+"  c #C0C0C0",
+". c gray100",
+"X c #008000",
+"o c #800080",
+"O c #808000",
+"+ c #00C000",
+"@ c red",
+"# c magenta",
+"$ c #FFFFC0",
+"% c #C05800",
+"& c #FFDCA8",
+"* c black",
+/* pixels */
+"****************",
+"*XXX%@@%&&&%XXX*",
+"*XXX%&&%&+&%XXX*",
+"*XXX%@&%&&&%XXX*",
+"*XXX%&&%&&&%XXX*",
+"*$$$X$$$$$$X$$$*",
+"*&#&%++%. .%&%$*",
+"*&#&%&&%. .%O&$*",
+"*&o&%++%. .%%O$*",
+"*&&&%&&%...%&&$*",
+"*XXXX$$$$$$X$$$*",
+"*XXX%&%%&#&%@@$*",
+"*XXX%O&%&#&%&&$*",
+"*XXX%%O%&o&%@&$*",
+"*XXX%&&%&&&%&&$*",
+"****************"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kshisen.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kshisen.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kshisen.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,294 @@
+/* XPM */
+static char *kshisen[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 256 2",
+"   c #000100",
+".  c #000E00",
+"X  c #001100",
+"o  c #027D00",
+"O  c #0A7C00",
+"+  c #157700",
+"@  c #157B00",
+"#  c #2C721D",
+"$  c #3B7C00",
+"%  c #327421",
+"&  c #457E12",
+"*  c #5D6300",
+"=  c #5C6900",
+"-  c #51720C",
+";  c #4B7C33",
+":  c #427B2C",
+">  c #755D00",
+",  c #616C00",
+"<  c #716101",
+"1  c #77711A",
+"2  c #008200",
+"3  c #008C00",
+"4  c #0D8700",
+"5  c #009400",
+"6  c #009B00",
+"7  c #0D9904",
+"8  c #178603",
+"9  c #198B11",
+"0  c #1C9200",
+"q  c #149800",
+"w  c #00A400",
+"e  c #00A900",
+"r  c #13A10C",
+"t  c #1BA112",
+"y  c #258D19",
+"u  c #29931C",
+"i  c #25991A",
+"p  c #318100",
+"a  c #399016",
+"s  c #3B8727",
+"d  c #23AA1A",
+"f  c #468616",
+"g  c #469526",
+"h  c #499838",
+"j  c #509526",
+"k  c #5F943F",
+"l  c #538933",
+"z  c #62A43F",
+"x  c #579344",
+"c  c #5DA948",
+"v  c #6B8E47",
+"b  c #64944C",
+"n  c #6FB151",
+"m  c #71A34A",
+"M  c #7BA956",
+"N  c #68A647",
+"B  c #BE1A13",
+"V  c #BB0B0B",
+"C  c #8E5F0F",
+"Z  c #9E4F06",
+"A  c #965003",
+"S  c #9B6218",
+"D  c #8B7321",
+"F  c #9C7F34",
+"G  c #9A6A24",
+"H  c #A44E09",
+"J  c #A6520E",
+"K  c #A95D1A",
+"L  c #A75916",
+"P  c #A34C17",
+"I  c #AD621C",
+"U  c #A5621D",
+"Y  c #B2611D",
+"T  c #AD6424",
+"R  c #B46B2B",
+"E  c #B6732D",
+"W  c #B9752E",
+"Q  c #B47332",
+"!  c #BC7B36",
+"~  c #B87738",
+"^  c #917D46",
+"/  c #B67F49",
+"(  c #C00D08",
+")  c #C0130E",
+"_  c #C62119",
+"`  c #C62D23",
+"'  c #CD3D30",
+"]  c #CC392B",
+"[  c #C04E01",
+"{  c #C05205",
+"}  c #CF523E",
+"|  c #D34737",
+" . c #C54635",
+".. c #C27A0D",
+"X. c #C1670B",
+"o. c #D2773A",
+"O. c #CE5F48",
+"+. c #CA5D47",
+"@. c #D26F56",
+"#. c #9B2E88",
+"$. c #A1398A",
+"%. c #A34293",
+"&. c #AB548E",
+"*. c #AF5490",
+"=. c #B35B90",
+"-. c #B05690",
+";. c #A9468C",
+":. c #BD6A93",
+">. c #BC7592",
+",. c #AD62A7",
+"<. c #B66AB5",
+"1. c #C57695",
+"2. c #8A862F",
+"3. c #8D8F3B",
+"4. c #96812D",
+"5. c #BC8139",
+"6. c #859948",
+"7. c #829756",
+"8. c #979B59",
+"9. c #9E9E62",
+"0. c #89A858",
+"q. c #89B35A",
+"w. c #99B35F",
+"e. c #95AA65",
+"r. c #92B260",
+"t. c #B49D53",
+"y. c #BE8F6D",
+"u. c #B19573",
+"i. c #A4A66D",
+"p. c #AEB572",
+"a. c #BEB67B",
+"s. c #B1AE6F",
+"d. c #88C268",
+"f. c #A3C26F",
+"g. c #A6C777",
+"h. c #B9C379",
+"j. c #C49010",
+"k. c #D28F3A",
+"l. c #CBB01F",
+"z. c #D0B12F",
+"x. c #ECAF2E",
+"c. c #C58D51",
+"v. c #CC9D59",
+"b. c #C99856",
+"n. c #DE8A5C",
+"m. c #DB8548",
+"M. c #C5986B",
+"N. c #C29671",
+"B. c #DA8768",
+"V. c #D99972",
+"C. c #CDA05A",
+"Z. c #CDA16C",
+"A. c #C7AD7B",
+"S. c #CCA57E",
+"D. c #C7B67C",
+"F. c #D0A26D",
+"G. c #D7A678",
+"H. c #DAB977",
+"J. c #E68667",
+"K. c #E89774",
+"L. c #E4AE63",
+"P. c #E8A27B",
+"I. c #E2BE7E",
+"U. c #E7B769",
+"Y. c #D2C637",
+"T. c #D7D23F",
+"R. c #F5D528",
+"E. c #DECB50",
+"W. c #DFD256",
+"Q. c #DBD046",
+"!. c #DBC27B",
+"~. c #DDDA66",
+"^. c #E3C85E",
+"/. c #E0D35E",
+"(. c #E4C965",
+"). c #EAC271",
+"_. c #E3D765",
+"`. c #ECDD79",
+"'. c #E7E36F",
+"]. c #EBE578",
+"[. c #F9E77D",
+"{. c #AD9F99",
+"}. c #B9A788",
+"|. c #BABA8F",
+" X c #B3C281",
+".X c #B5DF89",
+"XX c #BCC1A0",
+"oX c #B6E58A",
+"OX c #CA8697",
+"+X c #CF9C91",
+"@X c #D18C99",
+"#X c #D6999B",
+"$X c #D49AAB",
+"%X c #CDAD94",
+"&X c #C8BD87",
+"*X c #C5BA9E",
+"=X c #DBAA82",
+"-X c #DEBB8B",
+";X c #DAB986",
+":X c #D9BB96",
+">X c #D8A39C",
+",X c #CABFAB",
+"<X c #DAAEB1",
+"1X c #DCBDB4",
+"2X c #DAA2A3",
+"3X c #E3B786",
+"4X c #E7BB99",
+"5X c #F3B98E",
+"6X c #EAAA83",
+"7X c #E7B6A1",
+"8X c #C9C684",
+"9X c #D4C88A",
+"0X c #DECB95",
+"qX c #D8D698",
+"wX c #CCCEB3",
+"eX c #D7CFA7",
+"rX c #D7E39E",
+"tX c #DAEBA3",
+"yX c #E3C382",
+"uX c #E4C88B",
+"iX c #E8CA96",
+"pX c #E9D29C",
+"aX c #F1D684",
+"sX c #F6D992",
+"dX c #F6D699",
+"fX c #EFCB8C",
+"gX c #ECC7A1",
+"hX c #E5C8B4",
+"jX c #ECD4A1",
+"kX c #F2CAA4",
+"lX c #F7D9A7",
+"zX c #ECD4B5",
+"xX c #EEEC8E",
+"cX c #ECF088",
+"vX c #FBE29F",
+"bX c #F7F496",
+"nX c #E6E7A7",
+"mX c #E8E2B3",
+"MX c #F5E3AE",
+"NX c #F5EAB3",
+"BX c #F5E6B4",
+"VX c #FBF4AC",
+"CX c #FBF5B5",
+"ZX c #FEF2B9",
+"AX c #FFF9BF",
+"SX c #F6F1BA",
+"DX c #E6F1AB",
+"FX c #EDDED0",
+"GX c #F1D2CC",
+"HX c #EBD3E1",
+"JX c #F0E5DB",
+"KX c #FFFBC1",
+"LX c #E9E5D8",
+"PX c #F5EAE5",
+"IX c #F1F0E9",
+"UX c #FFFBF2",
+/* pixels */
+"  X X X X X X X X X X X X X X X X X X X . . . . X X . . . X .   ",
+"X 6 6 w w 6 w w 6 w r d d d t t w t d d d d 7 5 5 5 5 5 5 3 3 . ",
+"X 6 w e w e w w w 7 r.BXMXpXbXa.a 9XnXSXDXqXm 6 6 6 5 6 5 6 3 . ",
+"X w e w e w e w e , I.SXO.( R.).I rXh lXr.x q.6 6 6 6 5 5 5 3 . ",
+". w w e w w e w e = ).5X at .) J.;XI nXv 0X7.7.q.6 5 6 5 5 5 5 3 . ",
+"X w w w e w w e e = yXJ. .V | =XI CXlXq.l lX0.6 6 6 5 5 5 5 3 . ",
+"X w w e w w e w e = I.ZX6X_ gX3XI DXi.h.m a.q.6 5 6 5 5 5 3 3 . ",
+"X 6 e w e e w e e = I.ZXJ.` K.-XI rXs pX0.l q.5 5 5 5 5 5 5 3 . ",
+"X 6 e w e w e w e = yXK.+.J.] =XY rXs lXe.l q.5 5 5 5 5 3 3 3 . ",
+"X w w e w e w e e , M.B.=XjX at .=XK &Xe.jX&Xi.0.5 5 5 5 5 5 3 3 . ",
+"X 6 w e e w w w w , K Q Q E Q j H T Q R Q F t 5 5 5 3 3 5 5 2 . ",
+"X w w d f.oXoXoXf.j 3.I.uX).9X0.f }.hXhXhX|.x g g.oX.X.Xe.9 2 . ",
+"X w q 4.mX*XeXlXjXF !.d.qXqXn D.D IXHX<.UXPXu.t.'.].vXQ.!.u 2 X ",
+"X w 0 W ZXkXkX4X7X~ 3Xh a.qX# A.I PX$X&.hXPXN.v.n.m.T.{ V.i 2 . ",
+"X 6 0 W zX;.$.$.>.! H.jX!.s |.-XP $.1X{.$X,.M.v./.^.aXl.H.u 2 X ",
+"X w 0 W ZXkX:.=.gXQ H.NX8Xg 9X-XK 2XFX,XGX<XN.v.VXdXlXsXuXu 2 . ",
+". w 0 W ZX at X*.-.>.! ).x p.h.# A.T LXXX|.wXJXN.v._.(.aXl.).u 2 X ",
+"X w 0 W hX1.kXOXOX~ -Xc 8X8Xs &XK  Xh N N eXN.C.n.m.T.H V.u 2 . ",
+"X w 0 E NXlX at X=.4XQ H.b &XpXl A.T LXg.M wXJXy.b.~.(.sXY.H.u 2 . ",
+"X 6 0 J M.G.F.G.s.G ~ M.F.M.Z.8.P u.%X%X%X}.^ T M.Z.Z.F.9.9 o . ",
+"X w q < < > < > p $ S ~ ! ! 5.f < R ! ! ! 2.& C Q 5.5.o.j 4 2 . ",
+"X 6 w w w w w 6 6 8 p.xXVXCXcX&Xf eXmXmXSXMX6.6.NXdX6XaX3Xy 2 . ",
+"X 6 w w w 6 6 6 w * ).k.U.E...H.Y CX:X0XgXkXc.v.KXB.V x.aXu 2 . ",
+"X 6 w 6 6 w 6 6 6 = 3Xk.L.Q.X.G.Y NX at X1.OX>.c.v.5XO.) +.=Xu 2 . ",
+". 6 w 6 w 6 6 6 6 * ).cXsXdX_.3XI NX at X=.#.#Xc.v.5X+._ | 6Xu 2 . ",
+"X 6 6 6 6 6 6 6 6 * 3X'.sXsX/.9XI CXkX=.&.OXc.b.KXpX' P.jXu o . ",
+"X 6 6 w 6 6 6 5 6 * ). at .L.Y.{ G.I BX:.#X#X&.c.v.KXJ.` @.3Xu 2 . ",
+". 6 6 6 6 6 6 6 6 = 3Xz.).(.j.H.I NX7X7X&.>Xc.C.K.+.K.| V.u 2 . ",
+"X 5 6 6 6 6 5 6 6 * c.!.uXuX!.S.K &XiX4X+X:X/ ~ =X=XiXG.+Xy 2 . ",
+"X 6 6 6 5 6 5 5 6 = P I K K U a A L K K Y 1 - H L T K I f 3 o . ",
+". 5 5 5 5 5 5 3 3 4 @ 8 8 @ @ 2 @ @ @ @ + O O + + + + + o o o . ",
+"  . . . . . X X . X . . . . . . . . . . . . . . . . . . . . .   "
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksirtet-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksirtet-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksirtet-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,34 @@
+/* XPM */
+static char *ksirtet16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 12 1",
+"  c black",
+". c #400000",
+"X c navy",
+"o c blue",
+"O c #008000",
+"+ c #00C000",
+"@ c red",
+"# c #C05800",
+"$ c #FFA858",
+"% c #FFDCA8",
+"& c #C0C0FF",
+"* c None",
+/* pixels */
+"*****  *********",
+"**** ++ ********",
+"*** +OO+ * *****",
+"** +OO+O+ $ ****",
+"* +OO$@OO$@@.***",
+" +OO%@@@$@@. ***",
+"  O%$%@@@@$o ***",
+"* %$$$%@@$ooo **",
+" %$$$%$%$@@ooo *",
+" #$$$$$&o@@ooX *",
+" ##$$#XoooooXX *",
+"* ####XXoooXX **",
+"** ##  XXoXX ***",
+"***  ** XXX ****",
+"******** X *****",
+"********* ******"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksirtet.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksirtet.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksirtet.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,61 @@
+/* XPM */
+static char *ksirtet[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 23 1",
+"  c black",
+". c #191919",
+"X c gray20",
+"o c #00007f",
+"O c #007f00",
+"+ c #007f7f",
+"@ c #7f0000",
+"# c #7f007f",
+"$ c #7f7f00",
+"% c #4c4c4c",
+"& c #666667",
+"* c gray50",
+"= c blue",
+"- c green",
+"; c cyan",
+": c red",
+"> c yellow",
+", c gray60",
+"< c #b2b2b2",
+"1 c gray80",
+"2 c gray90",
+"3 c white",
+"4 c None",
+/* pixels */
+"44444444444. 4444444444444444444",
+"4444444444 ,$ 444444444444444444",
+"444444444 >,,*.44444444444444444",
+"44444444.-,-->-.4444444 44444444",
+"4444444 +O$>>,.+ 44444.: 4444444",
+"444444 ,>OO1,.O>$ 444 *:: 444444",
+"44444.,>>,$.-$,-<,.4 :::*:.44444",
+"4444.*>,<>, O,>,>--.@,:,::@ 4444",
+"444.$O$1>>.@:.$>>-%$:@:*,:..4444",
+"44.,1,O,<O:,,:.,,X:::@#:@. 44444",
+"4.$11>>O.:,::<:$O*:,,:@X@ 444444",
+" >2>><,.%@<<,,:@%:<:,::X.4444444",
+" .>1<-.,1$@1,:@,:X:<,:X==.444444",
+"4.X-$.>12>%@,@:,,:@@@#*,<+ 44444",
+"44 .X>32221$:<<<<:*@.;1;;==.4444",
+"444 $&222>$$$@<::<:@#o<=,<o& 444",
+"44 >3$X12$$12$@,1*@,:@+<=+o,=.44",
+"4 <223$$$>2111$@@:<:,:#%o*;,;= 4",
+" <22232$$2221>1$@<<,:<:.%1=,;<*.",
+".$2222$,>%2223*&*@1:,,#o+o1;,=o ",
+".$$32$>23>%22$*;1=X1:#o11+o<,oo ",
+"4 $$><2322,X,=21;2+&#&;1;1=+=o.4",
+"44 %$222222$o12221;..+21<;,oo 44",
+"444 $$2221$X.+2221o*1o<;<,oo 444",
+"4444 $$22$$  o%12o,21,o<<=o.4444",
+"44444 $$$%.44 oo=;1;;2;+oo 44444",
+"444444.%$ 4444 o%12221<oo 444444",
+"4444444  444444.o+222;oo 4444444",
+"4444444444444444 oo<1oo 44444444",
+"44444444444444444 oooo.444444444",
+"444444444444444444 oX 4444444444",
+"4444444444444444444..44444444444"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksmiletris-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksmiletris-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksmiletris-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,27 @@
+/* XPM */
+static char *ksmiletris16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 5 1",
+"  c black",
+". c #868200",
+"X c yellow",
+"o c #C7C3C7",
+"O c None",
+/* pixels */
+"OOOOO      OOOOO",
+"OOO  XXXXXX  OOO",
+"OO XXXXXXXXXX OO",
+"O XXXXXXXXXXXX O",
+"O XXX  XX  XXX O",
+" XXXX  XX  XXXX ",
+" XXXX  XX  XXXX ",
+" XXXX  XX  XXXX ",
+" XXXXXXXXXXXXXX ",
+" XXX XXXXXX XXX ",
+" XXX XXXXXX XXX ",
+"O XXo XXXX .XX O",
+"O XXXo    .XXX O",
+"OO XXXXXXXXXX OO",
+"OOO  XXXXXX  OOO",
+"OOOOO      OOOOO"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksmiletris.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksmiletris.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksmiletris.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,198 @@
+/* XPM */
+static char *ksmiletris[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 160 2",
+"   c black",
+".  c #020204",
+"X  c #060204",
+"o  c #060604",
+"O  c #0A0A04",
+"+  c #16160C",
+"@  c #161614",
+"#  c #26261C",
+"$  c #2A2A14",
+"%  c #363614",
+"&  c #3E3E14",
+"*  c #3A3A24",
+"=  c #3E3E24",
+"-  c #464214",
+";  c #46421C",
+":  c #4A4A1C",
+">  c #464224",
+",  c #464624",
+"<  c #464634",
+"1  c #4E4E3C",
+"2  c #525224",
+"3  c #565624",
+"4  c #5A5624",
+"5  c #5E5E24",
+"6  c #5E5A2C",
+"7  c #625E24",
+"8  c #626224",
+"9  c #66662C",
+"0  c #6E6A34",
+"q  c #6E6E34",
+"w  c #7E7A24",
+"e  c #727234",
+"r  c #827E3C",
+"t  c #8A862C",
+"y  c #8A863C",
+"u  c #8E8A3C",
+"i  c #928E34",
+"p  c #9A922C",
+"a  c #969234",
+"s  c #9A963C",
+"d  c #A6A23C",
+"f  c #AAA234",
+"g  c #AAA634",
+"h  c #AAA63C",
+"j  c #AEAA34",
+"k  c #B2AA2C",
+"l  c #B2AE34",
+"z  c #B2AE3C",
+"x  c #B6B234",
+"c  c #BAB63C",
+"v  c #8E8A5C",
+"b  c #AAA64C",
+"n  c #AEA64C",
+"m  c #AEAA54",
+"M  c #B2AA4C",
+"N  c #B2AE4C",
+"B  c #B6AE4C",
+"V  c #B2AA54",
+"C  c #B2AE54",
+"Z  c #B6AE54",
+"A  c #B6B24C",
+"S  c #BAB244",
+"D  c #BAB24C",
+"F  c #BEB64C",
+"G  c #B6B254",
+"H  c #BAB254",
+"J  c #BAB654",
+"K  c #BEB654",
+"L  c #BEBA54",
+"P  c #C2BA4C",
+"I  c #C2BE4C",
+"U  c #C6BE4C",
+"Y  c #C2BA54",
+"T  c #C2BE54",
+"R  c #C6BE54",
+"E  c #D2CA34",
+"W  c #CAC24C",
+"Q  c #CAC64C",
+"!  c #CEC64C",
+"~  c #CECA4C",
+"^  c #C6C254",
+"/  c #CAC254",
+"(  c #CAC654",
+")  c #CEC654",
+"_  c #CECA54",
+"`  c #D2CA4C",
+"'  c #D2CE4C",
+"]  c #D6CE4C",
+"[  c #D2CA54",
+"{  c #D2CE54",
+"}  c #D6CE54",
+"|  c #D6D24C",
+" . c #DAD24C",
+".. c #D6D254",
+"X. c #DAD254",
+"o. c #DAD654",
+"O. c #DED654",
+"+. c #DEDA5C",
+"@. c #E2DA4C",
+"#. c #E2D654",
+"$. c #E2D65C",
+"%. c #E2DA54",
+"&. c #E2DE54",
+"*. c #E6DE54",
+"=. c #E2DA5C",
+"-. c #E6DE5C",
+";. c #E6E254",
+":. c #E6E25C",
+">. c #EAE254",
+",. c #EAE654",
+"<. c #EEE654",
+"1. c #EAE25C",
+"2. c #EAE65C",
+"3. c #EEE65C",
+"4. c #EEEA54",
+"5. c #F2EA54",
+"6. c #F6EE54",
+"7. c #F2EA5C",
+"8. c #F2EE5C",
+"9. c #F6EE5C",
+"0. c #FAF25C",
+"q. c #E6E264",
+"w. c #EAE664",
+"e. c #EEE664",
+"r. c #EAE66C",
+"t. c #EEE66C",
+"y. c #EEEA64",
+"u. c #EEEA6C",
+"i. c #F2EA64",
+"p. c #F6EE6C",
+"a. c #F2EA74",
+"s. c #F2EA7C",
+"d. c #F6EE7C",
+"f. c #FAF264",
+"g. c #FAF274",
+"h. c #FAF67C",
+"j. c #FEF67C",
+"k. c #9E9E8C",
+"l. c #AAAA8C",
+"z. c #FAF284",
+"x. c #FAF28C",
+"c. c #FEFA8C",
+"v. c #FEF694",
+"b. c #FEFA94",
+"n. c #FEFA9C",
+"m. c #FEFAA4",
+"M. c #FEFAAC",
+"N. c #FEFEAC",
+"B. c #FEFAB4",
+"V. c #FEFEB4",
+"C. c #FEFEBC",
+"Z. c #FEFEC4",
+"A. c #FEFECC",
+"S. c #FEFED4",
+"D. c #FEFEDC",
+"F. c #FEFEE4",
+"G. c #FAFAEC",
+"H. c #FEFEEC",
+"J. c #FEFEF4",
+"K. c None",
+/* pixels */
+"K.K.K.K.K.K.K.K.K.K.K.K.K.. . . . . . . K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.+ . . 3.4.2.2.:.1.+.. . @ K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.. . >.5.8.3.<.<.>.;.*.%.O.o.... . K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.. <.7.6.8.3.5.3.3.,.;.;.=.$.X.} ) ] o K.K.K.K.K.K.",
+"K.K.K.K.K.K.. 2.9.f.g.h.g.p.y.1.;.;.*.&.%.O.| { ! X.. K.K.K.K.K.",
+"K.K.K.K.K.. 9.6.h.b.N.N.n.z.a.w.;.*.&.%.O. .X.| _ ! U . K.K.K.K.",
+"K.K.K.K.. i.0.h.B.A.D.A.M.x.a.w.;.&.%.#.#.o. .] [ Q Q D . K.K.K.",
+"K.K.K.. >.0.h.B.F.J.H.k.v ;.u.1.&.*.*.r y  .} | ' [ / P J o K.K.",
+"K.K.K.. 7.f.n.D.J.G.l.1 < t -.:.%.O.u ; , i [ { ~ ~ Q P P . K.K.",
+"K.K.. >.8.j.Z.F.J.J.e > * 2 :.-.%.%.5 = * 3  .` [ ) / R P D . K.",
+"K.K.. 5.9.c.Z.S.D.A.e * # > :.*.O.#.5 % # , ..' ` ~ W R F G . K.",
+"K.K.. 9.9.b.V.C.Z.Z.q # . % O.&.$.O.6 # @ & ` ~ _ ) / P L B . K.",
+"K.. >.5.7.z.m.m.v.x.9 . . - O.O.O.O.4 . . : [ ~ ! W ^ P P B B . ",
+"K.. 3.<.7.a.d.d.s.t.w.- ; O.#.O.X.X.] % * ] ' ~ ( ) U T J Z V . ",
+"K.. 4.4.3.e.t.r.q.-.&.O.O.O.O. .o.} ] ] ] ' _ ~ W / U P J A M . ",
+"K.. >.<.,.3.:.1.1.:.=.+.O.O. .X.] | } } { _ ` ) ( W Y P J N m . ",
+"K.. 1.>.;.2.;.:.] @. at .O.o.O. .X.} ] ' ` ~ _ Q W F I L F H M m . ",
+"K.. ;.;.;.*.*. at .t E #.O. . .X.] ] { } _ [ Q ) P w c P J B M m . ",
+"K.O *.*.&.&.&. at .6 U O.O.| | ..} ` ` ' ! ) Q Q J 4 z F J B V N . ",
+"K.. &.*. at .%.%.O.. j  .] X.} ] ' { _ _ ( ~ / U p . k J B V M B . ",
+"K.K.. O.%.#.O. .k . j ' ] } [ ` ' ` ! ) ! U g . z K J A V V . K.",
+"K.K.. ..X. .O. .Q . 8 l { ' ' _ ) ) ( W U f 7 . F J B V M n . K.",
+"K.K.. | ..] ..] ` f . 7 ! [ ' ~ ~ ! ( W B 4 . h D G N m V d . K.",
+"K.K.K.. ! } ] } ] ` x . . l P I P L S M . . a D G B M m b . K.K.",
+"K.K.K.. ~ _ ~ _ ' _ ! c r . . . . . . . i k D B V V M b d . K.K.",
+"K.K.K.K.. P ) ! ( ! Q ! W d r 0 0 0 t s F H B Z N m m n o K.K.K.",
+"K.K.K.K.K.. _ U / W W U U U I I Y K F J A C N M m M m . K.K.K.K.",
+"K.K.K.K.K.K.. T F L I T P Y F F J J H A B N V M m C . K.K.K.K.K.",
+"K.K.K.K.K.K.K.. A C B J J J D D A N V C V M V n d o K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.. . N m B B Z V V V M m m V m . X K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.. . . M m M M M M d $ . . K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.. . . . . X . K.K.K.K.K.K.K.K.K.K.K.K."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksnake-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksnake-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksnake-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,28 @@
+/* XPM */
+static char *ksnake16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c #00C0C0",
+"X c cyan",
+"o c red",
+"O c gray100",
+"+ c None",
+/* pixels */
+"+++     ++++++++",
+"++ ..... +++++++",
+"++      . ++++++",
+"+ .O O O.. +++++",
+" ......... +++++",
+"  ...  .. +++++ ",
+"++o  X... ++++  ",
+"++o+ X.. ++++ . ",
+"++++ X.. +++ . +",
+"+++ X.. +++ . ++",
+"+++ X.. +++ . ++",
+"++ X.. ++++ .. +",
+"+ X...       .. ",
+"+ ....XXXXXXX.. ",
+"+ ............. ",
+"++             +"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksnake.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksnake.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksnake.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,206 @@
+/* XPM */
+static char *ksnake[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 168 2",
+"   c #000000",
+".  c #000807",
+"X  c #000B0B",
+"o  c #0B0404",
+"O  c #080B0B",
+"+  c #00100F",
+"@  c #021313",
+"#  c #021918",
+"$  c #0D1212",
+"%  c #0F1A1A",
+"&  c #150606",
+"*  c #1B0707",
+"=  c #111B1B",
+"-  c #191919",
+";  c #03211F",
+":  c #032524",
+">  c #042927",
+",  c #032B2A",
+"<  c #05322F",
+"1  c #043434",
+"2  c #063937",
+"3  c #043D3B",
+"4  c #093E3B",
+"5  c #1E3535",
+"6  c #290E0E",
+"7  c #251111",
+"8  c #300F0F",
+"9  c #2F2929",
+"0  c #163C49",
+"q  c #044443",
+"w  c #064845",
+"e  c #094744",
+"r  c #094D47",
+"t  c #084E4D",
+"y  c #06524E",
+"u  c #0A554E",
+"i  c #055453",
+"p  c #065D5C",
+"a  c #095552",
+"s  c #0A5957",
+"d  c #095D5A",
+"f  c #124746",
+"g  c #134A47",
+"h  c #184F4C",
+"j  c #07625E",
+"k  c #0B625C",
+"l  c #076665",
+"z  c #076D6D",
+"x  c #086464",
+"c  c #0A6964",
+"v  c #0B6E6A",
+"b  c #0A736D",
+"n  c #067E7D",
+"m  c #0A7672",
+"M  c #0B7A75",
+"N  c #0B7D79",
+"B  c #137A7A",
+"V  c #314040",
+"C  c #3B5353",
+"Z  c #347271",
+"A  c #444242",
+"S  c #4C4949",
+"D  c #445B5B",
+"F  c #5A5656",
+"G  c #5C5C5C",
+"H  c #4A6D6D",
+"J  c #5C7F7F",
+"K  c #666363",
+"L  c #6B6B6B",
+"P  c #7A7979",
+"I  c #0A867F",
+"U  c #098683",
+"Y  c #0B8A85",
+"T  c #0D8D8A",
+"R  c #0B9190",
+"E  c #0D9D9C",
+"W  c #128C84",
+"Q  c #12938C",
+"!  c #119F97",
+"~  c #119A99",
+"^  c #18A89E",
+"/  c #0DA9A7",
+"(  c #09AAAA",
+")  c #0FB1AB",
+"_  c #0DB4B3",
+"`  c #0DBEBA",
+"'  c #10A4A2",
+"]  c #10ABA5",
+"[  c #12AEAB",
+"{  c #18AEA3",
+"}  c #18A9A8",
+"|  c #12B3AE",
+" . c #13B7B1",
+".. c #12BAB5",
+"X. c #13BEBA",
+"o. c #1ABBB3",
+"O. c #2F8585",
+"+. c #209A99",
+"@. c #2D9F9F",
+"#. c #369C9C",
+"$. c #389A99",
+"%. c #24A9A7",
+"&. c #28A0A0",
+"*. c #28AFAE",
+"=. c #0FC0BC",
+"-. c #15C2BE",
+";. c #1BC2BD",
+":. c #05C2C3",
+">. c #07CBCB",
+",. c #0EC5C3",
+"<. c #0FC8C6",
+"1. c #0DCCCC",
+"2. c #0FD1CF",
+"3. c #06D0D0",
+"4. c #0CD2D2",
+"5. c #0CDDDC",
+"6. c #15C7C2",
+"7. c #14C9C6",
+"8. c #14CDCA",
+"9. c #1CC7C7",
+"0. c #19C9C5",
+"q. c #1BCDCB",
+"w. c #13D1CF",
+"e. c #1BD1CD",
+"r. c #15D4D3",
+"t. c #16DBDA",
+"y. c #1AD5D3",
+"u. c #1DD9D6",
+"i. c #1CDCDA",
+"p. c #17E1E0",
+"a. c #1EE6E4",
+"s. c #21CDCA",
+"d. c #21D2CC",
+"f. c #20D7D3",
+"g. c #20DFDD",
+"h. c #29DAD9",
+"j. c #3AD9D8",
+"k. c #24E0DE",
+"l. c #24E2E0",
+"z. c #4F9190",
+"x. c #44A4A3",
+"c. c #48A2A1",
+"v. c #56A1A1",
+"b. c #5CA3A3",
+"n. c #65ABAA",
+"m. c #67BCBC",
+"M. c #78A0A0",
+"N. c #71C2C2",
+"B. c #9B1B1B",
+"V. c #8F2A2A",
+"C. c #B63737",
+"Z. c #C63B3B",
+"A. c #DB5C5C",
+"S. c #E34343",
+"D. c #949392",
+"F. c #84A8A8",
+"G. c #8CABAB",
+"H. c #A2A1A1",
+"J. c #A1B0B0",
+"K. c #C5C2C2",
+"L. c #CBCBCB",
+"P. c #C3D0CF",
+"I. c #C6D4D4",
+"U. c #DFDEDE",
+"Y. c #E4E3E3",
+"T. c #E3EAEA",
+"R. c #FEFDFD",
+"E. c None",
+/* pixels */
+"E.E.E.E.E.E.                  E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.",
+"E.E.E.E.E.  O = @ . $ % # @     E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.",
+"E.E.E.E.E.  C N.&.1 J m. at .U @   E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.",
+"E.E.E.E.  o D v.B > H b.O.z V o   E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.",
+"E.E.E.E.  A D.A S S P K 9 F U.-   E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.",
+"E.E.E.E.  G L.L K.J.P.H.P Y.Y.5       E.E.E.E.E.E.E.E.E.E.E.E.E.",
+"E.E.E.  @ Z I.R.P.x.n.T.R.Y.G.+.i 1   E.E.E.E.E.E.E.E.E.E.E.E.E.",
+"E.E.  @ N ,.x.G.c.0._ n.F.M.%.t.4.( 3   E.E.E.E.E.E.E.E.E.E.E.E.",
+"E.  + N w.t.q.} 9.r.3.( E ' t.E r.1.T   E.E.E.E.E.E.E.E.E.E.E.E.",
+"  X z w._ ~ l.| / 8.:.3.4.:.R T u.r.Q   E.E.E.E.E.E.E.E.E.E.E.E.",
+"  # X.5.*.z.i.#.$.3.>.,.U i > } u.8.Y   E.E.E.E.E.E.E.E.      E.",
+"  . 1 x h.j.p.s.9.3.N p M m q [ r._ :   E.E.E.E.E.E.E.  u u X   ",
+"E.    X 1 2 1 1 , 0 v I / 6.X.e.1.'   E.E.E.E.E.E.E.  < W Q +   ",
+"E.E.  8 Z.V.*       c | 8.u.u.w.[ :   E.E.E.E.E.E.E.  c b > .   ",
+"E.  7 A.C.& o E.E.  m <.y.i.r.<.T .   E.E.E.E.E.E.  z ! ,     E.",
+"E.  6 S.B.  E.E.    N y.i.u.w.| #     E.E.E.E.    l u.t     E.E.",
+"E.  o o o   E.E.  a 6.i.i.i.<.Y .   E.E.E.E.    l e...,   E.E.E.",
+"E.          E.  . m r.g.k.r. .@     E.E.E.E.  t q.X.2   E.E.E.E.",
+"E.        E.E.  y ` u.l.i.<.Y X   E.E.E.E.  . v u.s   E.E.E.E.E.",
+"E.E.E.E.E.E.. @ m r.i.g.t...#   E.E.E.E.E.  u i.e.w   E.E.E.E.E.",
+"E.E.E.E.E.E.. d -.u.k.i.7.N X   E.E.E.E.E.  s a.u.c X   E.E.E.E.",
+"E.E.E.E.E.  X M y.g.k.u...:   E.E.E.E.E.E.  , [ a.8.j X   E.E.E.",
+"E.E.E.E.  @ b w.i.k.k.8.m X   E.E.E.E.E.E.E.  p i.i.X.<   E.E.E.",
+"E.E.E.  @ v 6.k.l.k.t.-.>   E.E.E.E.E.E.E.E.  , Q y.r.v X   E.E.",
+"E.E.E.  1 ..w.k.k.s. .k +                       u ;.t.-.>   E.E.",
+"E.E.  @ M 8.i.k.k.d.^ k a c v v v v v v v v v k W o.0.7.,   E.E.",
+"E.E.  : ) <.u.k.k.k.d.{ ;.f.i.u.f.g.u.u.f.g.u.y.f.0.8...:   E.E.",
+"E.E.  . y | 8.i.i.i.i.e.u.i.i.i.i.u.i.i.i.u.i.u.u.8...y X   E.E.",
+"E.E.E.  . : d ..-.-.-.-.-.-.X.-.X.-.-.-.X.-.-...Y q : X   E.E.E.",
+"E.E.E.E.    @ 2 2 2 2 4 h g e 2 g f 0 2 2 2 4 , @ .     E.E.E.E.",
+"E.E.E.E.E.E.    .       X . . o   .   .   .         E.E.E.E.E.E.",
+"E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E.E."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksokoban-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksokoban-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksokoban-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,28 @@
+/* XPM */
+static char *ksokoban16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c #400000",
+"X c #800000",
+"o c #C00000",
+"O c red",
+"+ c None",
+/* pixels */
+"+++++++ ++++++++",
+"++++++   +++++++",
+"+++++     ++++++",
+"+++++ O X ++++++",
+"++++ O o X +++++",
+"+++ O ooo X ++++",
+"++ OO ooo XX +++",
+"++ OO ooo XX +++",
+"+ OO ooooo XX ++",
+"  OO ooooo XX  +",
+"+             ++",
+"++  ..XXX..  +++",
+"++++ ..X.. +++++",
+"+++++  .  ++++++",
+"+++++++ ++++++++",
+"++++++++++++++++"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ksokoban.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ksokoban.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ksokoban.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,237 @@
+/* XPM */
+static char *ksokoban[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 199 2",
+"   c black",
+".  c #020204",
+"X  c #2A0604",
+"o  c #4A0E0C",
+"O  c #5A0204",
+"+  c #5A0A04",
+"@  c #5A0E0C",
+"#  c #5E120C",
+"$  c #66120C",
+"%  c #621E1C",
+"&  c #6A1614",
+"*  c #6E1A14",
+"=  c #761E14",
+"-  c #6A261C",
+";  c #72261C",
+":  c #76261C",
+">  c #7A261C",
+",  c #662624",
+"<  c #6E2624",
+"1  c #6A2A24",
+"2  c #6E2A24",
+"3  c #6E2E24",
+"4  c #6E2A2C",
+"5  c #6E2E2C",
+"6  c #6E322C",
+"7  c #6A3234",
+"8  c #6E3234",
+"9  c #6E3634",
+"0  c #6E3E3C",
+"q  c #762A24",
+"w  c #762E24",
+"e  c #722E2C",
+"r  c #72322C",
+"t  c #72362C",
+"y  c #76322C",
+"u  c #7A362C",
+"i  c #723234",
+"p  c #723634",
+"a  c #763634",
+"s  c #723A34",
+"d  c #763E3C",
+"f  c #7A3E3C",
+"g  c #76423C",
+"h  c #5E5654",
+"j  c #5E5A54",
+"k  c #5E6264",
+"l  c #5E6664",
+"z  c #6A4A44",
+"x  c #625A54",
+"c  c #625E5C",
+"v  c #764644",
+"b  c #764E4C",
+"n  c #8E221C",
+"m  c #822A24",
+"M  c #862E2C",
+"N  c #8A2E24",
+"B  c #82362C",
+"V  c #8E322C",
+"C  c #823634",
+"Z  c #823A34",
+"A  c #8A3634",
+"S  c #8A3A34",
+"D  c #8E3A34",
+"F  c #8E3E3C",
+"G  c #922E24",
+"H  c #92322C",
+"J  c #9E362C",
+"K  c #923A34",
+"L  c #BA1E1C",
+"P  c #A2362C",
+"I  c #AA3A2C",
+"U  c #A63E34",
+"Y  c #AA3E34",
+"T  c #AE3E34",
+"R  c #B22E24",
+"E  c #B2322C",
+"W  c #B2362C",
+"Q  c #B6362C",
+"!  c #B23A2C",
+"~  c #B63A2C",
+"^  c #BA322C",
+"/  c #BA362C",
+"(  c #BE322C",
+")  c #BE362C",
+"_  c #BE3A2C",
+"`  c #B23E34",
+"'  c #86423C",
+"]  c #8A423C",
+"[  c #8A463C",
+"{  c #92423C",
+"}  c #96463C",
+"|  c #9A423C",
+" . c #A2463C",
+".. c #A6463C",
+"X. c #AA4234",
+"o. c #AA423C",
+"O. c #AA463C",
+"+. c #B24234",
+"@. c #BE4634",
+"#. c #824644",
+"$. c #864A44",
+"%. c #864E4C",
+"&. c #8A4A44",
+"*. c #8E524C",
+"=. c #924644",
+"-. c #964644",
+";. c #924A44",
+":. c #964A44",
+">. c #964E4C",
+",. c #9A4A44",
+"<. c #9A4E44",
+"1. c #9E4A44",
+"2. c #9E4E44",
+"3. c #9E4E4C",
+"4. c #92564C",
+"5. c #965654",
+"6. c #9A5654",
+"7. c #9A5A54",
+"8. c #A24A44",
+"9. c #A24E44",
+"0. c #A24E4C",
+"q. c #AE4A44",
+"w. c #A6524C",
+"e. c #A65654",
+"r. c #A25A54",
+"t. c #A6665C",
+"y. c #BA625C",
+"u. c #A2726C",
+"i. c #CE1E14",
+"p. c #D22214",
+"a. c #DA2E1C",
+"s. c #C23224",
+"d. c #C63224",
+"f. c #C2322C",
+"g. c #C2362C",
+"h. c #C6362C",
+"j. c #CA3224",
+"k. c #CA3624",
+"l. c #CE3224",
+"z. c #C23E34",
+"x. c #CA3E34",
+"c. c #D23224",
+"v. c #D23624",
+"b. c #D63624",
+"n. c #DE3224",
+"m. c #DE3624",
+"M. c #F61A14",
+"N. c #EA2E1C",
+"B. c #FA2A14",
+"V. c #F2321C",
+"C. c #E23224",
+"Z. c #EA3224",
+"A. c #EE3224",
+"S. c #EE3624",
+"D. c #F63E2C",
+"F. c #FA3224",
+"G. c #FE3624",
+"H. c #FE422C",
+"J. c #FE4A34",
+"K. c #FE4E3C",
+"L. c #C66A5C",
+"P. c #FE6A64",
+"I. c #E28A7C",
+"U. c #A68A8C",
+"Y. c #B29E9C",
+"T. c #BEBABC",
+"R. c #C2928C",
+"E. c #D6AA9C",
+"W. c #EA9A94",
+"Q. c #F69E94",
+"!. c #FE9E94",
+"~. c #E6AA9C",
+"^. c #EAAEAC",
+"/. c #E6BEBC",
+"(. c #F2AAA4",
+"). c #F6AEA4",
+"_. c #FAB6AC",
+"`. c #FEB2AC",
+"'. c #FEB6B4",
+"]. c #FEBAB4",
+"[. c #FEBEB4",
+"{. c #FEBEBC",
+"}. c #FEC2BC",
+"|. c #FEC6BC",
+" X c #CEC2C4",
+".X c #E2DEDC",
+"XX c #EEDADC",
+"oX c #FECAC4",
+"OX c #FECEC4",
+"+X c #FECECC",
+"@X c #FED2CC",
+"#X c #FEDAD4",
+"$X c #EAE2DC",
+"%X c #FEE2DC",
+"&X c #FEE6E4",
+"*X c #FEEAE4",
+"=X c #FEF2F4",
+"-X c #FEFEFC",
+";X c None",
+/* pixels */
+";X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X. ;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X;X;X;X;X. L.. ;X;X;X;X;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X;X;X;X. ). XH . ;X;X;X;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X;X;X. y.#Xj t.: . ;X;X;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X;X;X. oXT.C t. .. ;X;X;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X;X. ~. at Xh w.3.u.> . ;X;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X. I.`.$Xv e.2.6.,.> . ;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X. ].oXY.Z 0.1.2.7.D . ;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X. (.].*XU.] 8.9.1.5.F < . ;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X. R.[.}.XXn O...9.8.>.r.V = . ;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X. _.'.#X.X% o.....9.1.6.K m . ;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X. OX|.|.-Xq.R +.X.X... .;.4.M : . ;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X. L.|.].|.-X9 @.` T X.X.X.} 6.D V > . ;X;X;X;X;X;X",
+";X;X;X;X;X;X;X. |.}.[.=X~.L z._ ` T Y T  .*.=.N G . ;X;X;X;X;X;X",
+";X;X;X;X;X;X. W.}.].}.-Xu._ h.g./ ~ T Y X.&.7.M N m . ;X;X;X;X;X",
+";X;X;X;X;X. E.}.{.].&X%Xx.l.c.j.) / ~ T T ;.4.{ m M > . ;X;X;X;X",
+";X;X;X;X;X. `.`.].+X*X/.i.Z.c.c.d.) ! W I  .$.5.V A G . ;X;X;X;X",
+";X;X;X;X. Q.].}.+XoX&X^.p.A.n.c.j.d.^ W W U [ [ :.B S N . ;X;X;X",
+";X;X;X. L.}.}.|.|.}.*XN.B.S.n.n.l.d.s.Q W I F A >.A A F s . ;X;X",
+";X;X;X. &X&X|.].[.}.%XM.G.F.Z.m.c.h.s.^ E I J A <.{ B :., . ;X;X",
+";X;X;X;X. 0 %X%X].+X!.B.G.F.V.C.v.l.f./ E E P C S 6.,.w . ;X;X;X",
+";X;X;X;X;X. O =.%X&XP.K.J.H.D.A.m.a.b.k.j.( s.| S -.4 . ;X;X;X;X",
+";X;X;X;X;X;X. + o x c l k k c j j z b %.&.' #.B B = . ;X;X;X;X;X",
+";X;X;X;X;X;X;X. $ $ ; ; < 7 6 i i 8 6 9 5 2 - * @ . ;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X. & w q 5 e p i r i i 8 2 e : # . ;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X. e a 3 2 8 9 i i i 3 2 y $ . ;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X. 4 t 5 r i i 8 t e d % . ;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X. s 5 5 8 i i 5 d - . ;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X;X. s y 6 p 8 f 1 . ;X;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X;X;XX u u p #.1 . ;X;X;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X;X;X;X. . g . . ;X;X;X;X;X;X;X;X;X;X;X;X;X",
+";X;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X. ;X;X;X;X;X;X;X;X;X;X;X;X;X;X;X"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kspaceduel-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kspaceduel-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kspaceduel-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,28 @@
+/* XPM */
+static char *kspaceduel16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c #0000BF",
+"X c #0000DF",
+"o c red",
+"O c #EF8016",
+"+ c None",
+/* pixels */
+"++++++++++++++++",
+"++++++++++++++++",
+"++++++++++++++++",
+"+++++++++++++o +",
+"++++++++++++++++",
+"++++++++++o ++++",
+"+   ++++++++++++",
+"+ .. ++  +++++++",
+"++ ..  O +++++++",
+"+++ . O ++++++++",
+"++++ O  ++++++++",
+"++  O XX +++++++",
+"+++  + XX ++++++",
+"++++ ++ X ++++++",
+"++++++++  ++++++",
+"++++++++++++++++"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kspaceduel.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kspaceduel.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kspaceduel.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,50 @@
+/* XPM */
+static char *kspaceduel[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 12 1",
+"  c black",
+". c #585858",
+"X c navy",
+"o c blue",
+"O c red",
+"+ c #C05800",
+"@ c #FF8000",
+"# c #FFA858",
+"$ c #808080",
+"% c #FFDCA8",
+"& c #C3C3C3",
+"* c None",
+/* pixels */
+"********************************",
+"********************************",
+"********************************",
+"****************************  **",
+"*************************** OO *",
+"*************************** OO *",
+"****************************  **",
+"********************************",
+"*******************  ***********",
+"****************** OO **********",
+"****************** OO **********",
+"** ****************  ***********",
+"* o ****************************",
+" ooo ***************************",
+" oooX **************************",
+"* oXoo *************************",
+"** oooX ****   *****************",
+"*** oXoo ** +@ *****************",
+"**** oooo  +@# *****************",
+"***** oo  +@#% *****************",
+"******   +@#% ******************",
+"******* +@#% *******************",
+"****** +@#%   ******************",
+"****  .@#%  oo *****************",
+"**** .$$%  oooo ****************",
+"***** $& ** ooXo ***************",
+"****** & *** Xooo **************",
+"*******  **** ooXo *************",
+"************** Xooo ************",
+"*************** ooo ************",
+"**************** o *************",
+"***************** **************"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ktron-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ktron-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ktron-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+/* XPM */
+static char *ktron16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 7 1",
+"  c black",
+". c #0000C0",
+"X c gray19",
+"o c blue",
+"O c #C00000",
+"+ c #585858",
+"@ c red",
+/* pixels */
+"                ",
+" XX ooooooooo X+",
+"    o........ X+",
+" oooo.     o. X+",
+" o.... XXX o. X+",
+" o.        o. X+",
+" o. @@@@@  o. X+",
+" o. @OOOO  o. X+",
+" o. @O @O      +",
+" o.    @O@@@@@ +",
+" o. XX @OOOOOO +",
+"            @O +",
+" XXX @@@@@@@@O +",
+" XXX OOOOOOOOO +",
+" XXX           +",
+" +++++++++++++++"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ktron.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ktron.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ktron.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,47 @@
+/* XPM */
+static char *ktron[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 9 1",
+"  c navy",
+". c black",
+"X c #0000C0",
+"o c gray19",
+"O c #800000",
+"+ c blue",
+"@ c #C00000",
+"# c #585858",
+"$ c red",
+/* pixels */
+"................................",
+"................................",
+"..oooooo.++++++++++++++++.oooo##",
+"..oooooo.+XXXXXXXXXXXXXX .oooo##",
+"..oooooo.+X           +X .oooo##",
+"..oooooo.+X ..........+X .oooo##",
+".........+X .oooooooo.+X .oooo##",
+"..++++++++X .oooooooo.+X .oooo##",
+"..+XXXXXXXX .oooooooo.+X .oooo##",
+"..+X        .oooooooo.+X .oooo##",
+"..+X .............ooo.+X .oooo##",
+"..+X .$$$$$$$$$$$.ooo.+X .oooo##",
+"..+X .$@@@@@@@@@O.ooo.+X .oooo##",
+"..+X .$@OOOOOO$@O.ooo.+X .oooo##",
+"..+X .$@O.....$@O.ooo.+X .oooo##",
+"..+X .$@O.ooo.$@O.ooo.+X .oooo##",
+"..+X .$@O.ooo.$@O.ooo.+X .oooo##",
+"..+X .$@O.ooo.$@O.ooo.....oooo##",
+"..+X .....ooo.$@O.............##",
+"..+X .ooooooo.$@$$$$$$$$$$$$O.##",
+"..+X .ooooooo.$@@@@@@@@@@@@@O.##",
+"..+X .ooooooo.OOOOOOOOOOOO$@O.##",
+"..+X .ooooooo.............$@O.##",
+"......ooooooooooooooooooo.$@O.##",
+"..ooooooooooooooooooooooo.$@O.##",
+"..ooooooooooooo...........$@O.##",
+"..ooooooooooooo.$$$$$$$$$$$@O.##",
+"..ooooooooooooo.@@@@@@@@@@@@O.##",
+"..ooooooooooooo.OOOOOOOOOOOOO.##",
+"..ooooooooooooo...............##",
+"################################",
+"################################"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ktuberling-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ktuberling-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ktuberling-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,162 @@
+/* XPM */
+static char *ktuberling16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 140 2",
+"   c #686051",
+".  c #776A4F",
+"X  c #7C6955",
+"o  c #7E6F51",
+"O  c #6F6E6B",
+"+  c #7D7565",
+"@  c #79797A",
+"#  c #7B7B7B",
+"$  c #38943D",
+"%  c #5EAC69",
+"&  c #6A924D",
+"*  c #778B60",
+"=  c #7A9C77",
+"-  c #67B271",
+";  c #76B27D",
+":  c #79819A",
+">  c #7784AB",
+",  c #7882A3",
+"<  c #7D89AC",
+"1  c #7D89B0",
+"2  c #856D5C",
+"3  c #8A754E",
+"4  c #837556",
+"5  c #81755C",
+"6  c #8B7851",
+"7  c #897856",
+"8  c #917B56",
+"9  c #947F55",
+"0  c #807560",
+"q  c #807D77",
+"w  c #B55548",
+"e  c #BA585A",
+"r  c #A36C4F",
+"t  c #A36A50",
+"y  c #AD6159",
+"u  c #A57E5F",
+"i  c #978153",
+"p  c #92815F",
+"a  c #96805B",
+"s  c #97845E",
+"d  c #9A815A",
+"f  c #9C865C",
+"g  c #8A8069",
+"h  c #8E826A",
+"j  c #908266",
+"k  c #928467",
+"l  c #958564",
+"z  c #988668",
+"x  c #9F8969",
+"c  c #90897C",
+"v  c #A5836C",
+"b  c #A1957E",
+"n  c #A69977",
+"m  c #878786",
+"M  c #85868B",
+"N  c #898785",
+"B  c #8C8C8C",
+"V  c #8B8F98",
+"C  c #969592",
+"Z  c #969696",
+"A  c #90939F",
+"S  c #9B9B9B",
+"D  c #868FAB",
+"F  c #8290BC",
+"G  c #959CAF",
+"H  c #A0A09E",
+"J  c #A7A49C",
+"K  c #ADA492",
+"L  c #B1A999",
+"P  c #A5A6A9",
+"I  c #ACA9A2",
+"U  c #A8A8A8",
+"Y  c #A9A9A9",
+"T  c #A1A6B7",
+"R  c #B0ADA9",
+"E  c #B9B6AF",
+"W  c #B3B3B3",
+"Q  c #B7B7B7",
+"!  c #BFBEBA",
+"~  c #BEBEBE",
+"^  c #8094D0",
+"/  c #8196D5",
+"(  c #8297D7",
+")  c #869BD8",
+"_  c #899BD1",
+"`  c #909FCC",
+"'  c #95A1C6",
+"]  c #96A5CF",
+"[  c #9CA5C0",
+"{  c #9BA8CC",
+"}  c #9DACD8",
+"|  c #A4B3DF",
+" . c #B0B4C1",
+".. c #B6C2E4",
+"X. c #C1C1C1",
+"o. c #C5C4C2",
+"O. c #C6C5C4",
+"+. c #C2C4CC",
+"@. c #CBCBCB",
+"#. c #CCCCCC",
+"$. c #C8CBD5",
+"%. c #C7DDC9",
+"&. c #D3CEC5",
+"*. c #D4CDC0",
+"=. c #D1D1D1",
+"-. c #D4D7DF",
+";. c #C8CFE6",
+":. c #D7DDED",
+">. c #DADDE7",
+",. c #D1D9F2",
+"<. c #D6DDF2",
+"1. c #DFE6DB",
+"2. c #DCE2F3",
+"3. c #E0E0E0",
+"4. c #E3E3E3",
+"5. c #E5E5E5",
+"6. c #EAE7E2",
+"7. c #EAEAE9",
+"8. c #EAEBE8",
+"9. c #EFEFEF",
+"0. c #EFF1F8",
+"q. c #F0F0F0",
+"w. c #F1F2F2",
+"e. c #F2F2F2",
+"r. c #F3F3F3",
+"t. c #F7F7F7",
+"y. c #F0F2F9",
+"u. c #F6F7FC",
+"i. c #F8F8F8",
+"p. c #F9FBF9",
+"a. c #FBFBFA",
+"s. c #FBFBFB",
+"d. c #F8F9FC",
+"f. c #FCFBFA",
+"g. c #FCFCFC",
+"h. c #FCFDFE",
+"j. c #FEFDFD",
+"k. c #FEFEFE",
+"l. c #FFFEFE",
+"z. c gray100",
+/* pixels */
+"z.z.z.z.z.z.%.% - 1.z.z.z.z.z.z.",
+"z.z.z.z.z.p.; $ & n *.z.z.z.z.z.",
+"z.z.z.z.z.8.= * d z b 6.z.z.z.z.",
+"z.z.9.#.w.I 0 X y 2 4 L i.z.z.z.",
+"z.z.#.Y =.J l v e u i K a.z.z.z.",
+"z.z.4.Y 5.! 7 t w r f &.z.z.z.z.",
+"z.z.t.B #.O o 8 x a 3 q S 3.z.z.",
+"z.z.z.Q @ C 5 j c j p R @ W z.z.",
+"z.z.z.i.w.7.+ 6 s 9 0 @.X.r.z.z.",
+"z.z.z.z.z.z.o.  . h E w.z.z.z.z.",
+"z.z.z.z.z.z.i.m N H z.z.z.z.z.z.",
+"z.z.z.z.z.z.r.Z X.Y z.z.z.z.z.z.",
+"z.z.z.z.0.<.;.M P A ,.2.u.z.z.z.",
+"z.z.z.>.' _ ^ G V : ( ) ..i.z.z.",
+"z.z.z.-., > [  .T $.` / } 0.z.z.",
+"z.z.z.z.+.D 1 < F { ] | :.z.z.z."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/ktuberling.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/ktuberling.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/ktuberling.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,288 @@
+/* XPM */
+static char *ktuberling[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 250 2",
+"   c #2E281C",
+".  c #312E25",
+"X  c #393937",
+"o  c #3D3D3B",
+"O  c #474238",
+"+  c #544B3B",
+"@  c #584F3C",
+"#  c #434342",
+"$  c #4B4B4C",
+"%  c #474950",
+"&  c #494D58",
+"*  c #57534A",
+"=  c #525252",
+"-  c #595854",
+";  c #5D5D5D",
+":  c #585D6C",
+">  c #605746",
+",  c #655D4B",
+"<  c #6F6552",
+"1  c #746546",
+"2  c #72654B",
+"3  c #77684C",
+"4  c #7F6F4E",
+"5  c #706859",
+"6  c #7D6E53",
+"7  c #786E5D",
+"8  c #7F7052",
+"9  c #646464",
+"0  c #6C6A64",
+"q  c #696969",
+"w  c #726E65",
+"e  c #777165",
+"r  c #77736C",
+"t  c #7E7769",
+"y  c #737373",
+"u  c #7B7B7B",
+"i  c #636C86",
+"p  c #67759E",
+"a  c #6A759A",
+"s  c #6D789B",
+"d  c #727888",
+"f  c #7F7F80",
+"g  c #717B99",
+"h  c #6A78A4",
+"j  c #6F7EAA",
+"k  c #707EA7",
+"l  c #707FAB",
+"z  c #298D32",
+"x  c #2D9339",
+"c  c #2C9A3E",
+"v  c #348A3E",
+"b  c #37963E",
+"n  c #379641",
+"m  c #3A9C42",
+"M  c #429F4E",
+"N  c #4A9B48",
+"B  c #52A65E",
+"V  c #6E934C",
+"C  c #6C9554",
+"Z  c #77856F",
+"A  c #7F8172",
+"S  c #79AA7F",
+"D  c #70B070",
+"F  c #74BB7E",
+"G  c #7D808A",
+"H  c #7781A2",
+"J  c #7E8AAD",
+"K  c #7383B1",
+"L  c #7E8CB5",
+"P  c #798ABF",
+"I  c #7ABC83",
+"U  c #7C8DC2",
+"Y  c #798FD2",
+"T  c #7F90C0",
+"R  c #7D94D8",
+"E  c #9F5A41",
+"W  c #9D5C4F",
+"Q  c #816E48",
+"!  c #8E7545",
+"~  c #8D774A",
+"^  c #857554",
+"/  c #897855",
+"(  c #8B7C5D",
+")  c #926F4A",
+"_  c #937843",
+"`  c #957D4E",
+"'  c #9A7E4D",
+"]  c #927D55",
+"[  c #967A58",
+"{  c #9B795C",
+"}  c #827B6B",
+"|  c #8A7C61",
+" . c #847E71",
+".. c #91796D",
+"X. c #9E7960",
+"o. c #A45D43",
+"O. c #AB5C43",
+"+. c #AE5453",
+"@. c #B04B4B",
+"#. c #BC4F55",
+"$. c #B05B56",
+"%. c #A17A54",
+"&. c #A17965",
+"*. c #A47C73",
+"=. c #CB454A",
+"-. c #CB4C51",
+";. c #C55153",
+":. c #C05559",
+">. c #84935F",
+",. c #9C814D",
+"<. c #978155",
+"1. c #95825A",
+"2. c #938852",
+"3. c #9A8254",
+"4. c #99845B",
+"5. c #9D895B",
+"6. c #8D826C",
+"7. c #868279",
+"8. c #8C877D",
+"9. c #8B907B",
+"0. c #93846B",
+"q. c #968A68",
+"w. c #988661",
+"e. c #9D8A63",
+"r. c #9A8A6A",
+"t. c #968B77",
+"y. c #958D7D",
+"u. c #9C8E72",
+"i. c #9D8C79",
+"p. c #98907F",
+"a. c #A38A56",
+"s. c #A18859",
+"d. c #A38D62",
+"f. c #A5886D",
+"g. c #A18375",
+"h. c #A5926D",
+"j. c #A19273",
+"k. c #AB9B7C",
+"l. c #828282",
+"z. c #80828A",
+"x. c #8C8A86",
+"c. c #8F8E8D",
+"v. c #808698",
+"b. c #868B9C",
+"n. c #8C8E94",
+"m. c #8F9199",
+"M. c #958E80",
+"N. c #918F8A",
+"B. c #94928C",
+"V. c #98938D",
+"C. c #949393",
+"Z. c #9A9A9A",
+"A. c #818CB0",
+"S. c #8692B4",
+"D. c #8892B1",
+"F. c #8D98B8",
+"G. c #979EB4",
+"H. c #929DBC",
+"J. c #989FB4",
+"K. c #82AB85",
+"L. c #8FBD96",
+"P. c #9DA2AF",
+"I. c #9FA7BE",
+"U. c #A49984",
+"Y. c #B3A894",
+"T. c #B0AA9E",
+"R. c #A6A6A4",
+"E. c #ABAAA7",
+"W. c #ABABAB",
+"Q. c #A0A4B1",
+"!. c #A6A9B3",
+"~. c #ACAEB4",
+"^. c #A8AEBF",
+"/. c #B1B0AF",
+"(. c #BAB3A5",
+"). c #BEB8AD",
+"_. c #B4B4B5",
+"`. c #B6B8BD",
+"'. c #BDBBB7",
+"]. c #BCBCBC",
+"[. c #8292C1",
+"{. c #8697CA",
+"}. c #8997C1",
+"|. c #8E9CC5",
+" X c #8A9BCE",
+".X c #8096D6",
+"XX c #8197D8",
+"oX c #8498D5",
+"OX c #8A9CD4",
+"+X c #99A7CF",
+"@X c #93A3D5",
+"#X c #98A7D4",
+"$X c #9CAAD4",
+"%X c #9EAEDE",
+"&X c #A7AEC2",
+"*X c #A4AECB",
+"=X c #ABB4D0",
+"-X c #ACB7D9",
+";X c #AEB8D7",
+":X c #ACB9DD",
+">X c #B4B7C1",
+",X c #B6BAC5",
+"<X c #B2BAD0",
+"1X c #B4BEDE",
+"2X c #AAB8E3",
+"3X c #AFBEE9",
+"4X c #B2BFE4",
+"5X c #9FD1A8",
+"6X c #ABD3B1",
+"7X c #B2CCB5",
+"8X c #BEC2CD",
+"9X c #B6C0DF",
+"0X c #B4C0E6",
+"qX c #BBC7E8",
+"wX c #C1BEBA",
+"eX c #CFCABF",
+"rX c #C2C2C2",
+"tX c #C4C5C9",
+"yX c #C9C7C4",
+"uX c #CBCBCB",
+"iX c #C3C8D9",
+"pX c #CBCDD3",
+"aX c #CBCEDA",
+"sX c #C9D3C1",
+"dX c #DBD6CA",
+"fX c #DDD8CD",
+"gX c #D4D4D3",
+"hX c #D7D9DE",
+"jX c #DEDBD3",
+"kX c #DCDCDB",
+"lX c #C2CDEA",
+"zX c #CED7EF",
+"xX c #D3DBF1",
+"cX c #DCE1F1",
+"vX c #E4E2DE",
+"bX c #E4E4E4",
+"nX c #E6E7EC",
+"mX c #EEECE7",
+"MX c #EDEDED",
+"NX c #E0E4F0",
+"BX c #E5E9F4",
+"VX c #EBF1EB",
+"CX c #EFF7F1",
+"ZX c #EEF1F9",
+"AX c #F4F4F4",
+"SX c #F3F5FB",
+"DX c #F7F8FC",
+"FX c #F9F7F4",
+"GX c #FBF8F7",
+"HX c #FEFEFE",
+/* pixels */
+"HXHXHXHXHXHXHXHXHXHXHXHXHXVX6XI F 5XAXHXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXVXS M x c B sXGXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHX7Xv z x m C q.Y.fXGXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXL.n b N V 2.5.5.h.yXGXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXAXK.B D >.5.5.s.U.k.U.mXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXvX9.Z u 0.[ [ r.y.t.j.dXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXAXAXDXHXgXB.6.+   ^ W $.... @ r.M.kXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXgXZ.C.AXGXR.e r.( 0.0.+.;.g.6.] <.6 T.GXHXHXHXHXHXHXHX",
+"HXHXHXHXGXC.Z.C.kXVX_.5 j.w.h.i.$.;.f.d.a.` 1 (.HXHXHXHXHXHXHXHX",
+"HXHXHXHXAXZ.8XeXW.tXkX7.| d.h.*.#.#.&.` ,.1.6.jXHXHXHXHXHXHXHXHX",
+"HXHXHXHXGX].~._.8XAXHXN.3 d.{ @.=.-.+.{ 5.d.(.GXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXnXB.Z.mXHXHXN.2 s.) o.o.O.o.%.,.4.).HXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXu q GXHXW.# 2 4.! ` ,.' 3.' _ / e Z.].bXHXHXHXHXHXHX",
+"HXHXHXHXHXHXW.# bXgXo o < w.1 u.U.U.U.^ ~ 4 * = O $ W.DXHXHXHXHX",
+"HXHXHXHXHXHXkX# y ; 9 B., r.(  .B.C.8.^ 3.( B.kXgXq = AXHXHXHXHX",
+"HXHXHXHXHXHXHX_.- 9 gXyX* 4.e.q.} } 0.<.3.6.wX].m.o l.GXHXHXHXHX",
+"HXHXHXHXHXHXHXHXAXAXHXkX* 3 ] <.w.r.4.~ Q M.bXwXu B.MXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXGXx.+ ^ <.3.<.<.3.1 r uX8XbXGXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXbXw + 2 / r.e.u.t W.bXGXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXjX0 O + < 7 } '.AXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXW.X x.- - gXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXC.; SXB.; SXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXHXf u HX~.* VXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXHXHXHXGXl.l.HX'.= MXHXHXHXHXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXHXHXDXDXSXSXf y HX_.= nXSXDXHXDXHXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXDXcXlX0X:X0XG $ `.m.% =X2X4XqXzXZXHXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXBX<X#XOXoXR .XS.n.!.: & |.R R .XOX:XBXHXHXHXHXHXHX",
+"HXHXHXHXHXHXSXI.j S.{.oXY Y D.~.8Xd z.S.R R .XR .X1XSXHXHXHXHXHX",
+"HXHXHXHXHXHXAXJ.a j L A.S.I.~.bXP.!.tX>X}..XoXoXoX#XBXHXHXHXHXHX",
+"HXHXHXHXHXHXHXhXv.s j g ^.aXpXP.i iXSXSX&X{.oXoXOX-XZXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXtXb.s p h K J H K }.*X*XH.OXOX at X;XnXHXHXHXHXHXHX",
+"HXHXHXHXHXHXHXHXDXbX,XG.S.K K L S.U P [.#X%X3XxXZXDXHXHXHXHXHXHX"
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kwin4-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kwin4-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kwin4-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,142 @@
+/* XPM */
+static char *kwin4-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 120 2",
+"   c black",
+".  c #000002",
+"X  c #000004",
+"o  c #00000A",
+"O  c #00070F",
+"+  c #00007F",
+"@  c #01017F",
+"#  c #05007C",
+"$  c #05057B",
+"%  c #07077A",
+"&  c #05057C",
+"*  c #06067F",
+"=  c #08007F",
+"-  c #080879",
+";  c #1F006A",
+":  c #120075",
+">  c #13007E",
+",  c #1D017A",
+"<  c #111176",
+"1  c #121275",
+"2  c #131374",
+"3  c #141474",
+"4  c #32005E",
+"5  c #34005D",
+"6  c #36005C",
+"7  c #36075E",
+"8  c #3B015C",
+"9  c #3A005E",
+"0  c #3D0A57",
+"q  c #230068",
+"w  c #2A0061",
+"e  c #2B0064",
+"r  c #2E0060",
+"t  c #270879",
+"y  c #261D66",
+"u  c #3C3059",
+"i  c #3B3A5C",
+"p  c #3C3B5C",
+"a  c #282763",
+"s  c #38386D",
+"d  c #7B133D",
+"f  c #470056",
+"g  c #470057",
+"h  c #4B0153",
+"j  c #4C0152",
+"k  c #4C0153",
+"l  c #4E0151",
+"z  c #54004E",
+"x  c #55014E",
+"c  c #5D004E",
+"v  c #540067",
+"b  c #640047",
+"n  c #670145",
+"m  c #62004B",
+"M  c #6E0046",
+"N  c #690048",
+"B  c #710243",
+"V  c #7A7A3F",
+"C  c #404057",
+"Z  c #464456",
+"A  c #5D5C49",
+"S  c #5C5C4B",
+"D  c #5E5D49",
+"F  c #545152",
+"G  c #595954",
+"H  c #5A5A54",
+"J  c #40406D",
+"K  c #41416D",
+"L  c #636347",
+"P  c #626249",
+"I  c navy",
+"U  c #000086",
+"Y  c #050085",
+"T  c #060684",
+"R  c #00008D",
+"E  c #04048C",
+"W  c #04048D",
+"Q  c #00009A",
+"!  c #000997",
+"~  c #00129E",
+"^  c #0001AB",
+"/  c #0008B1",
+"(  c #000DB3",
+")  c #0011A4",
+"_  c #0000C2",
+"`  c #0004C4",
+"'  c #0008C5",
+"]  c #0000D6",
+"[  c #0000DF",
+"{  c #000BD6",
+"}  c #0000E1",
+"|  c #0006E7",
+" . c #0000F8",
+".. c #0000FA",
+"X. c #0000FB",
+"o. c blue",
+"O. c #0004F8",
+"+. c #80003B",
+"@. c #880037",
+"#. c #97002F",
+"$. c #9B002D",
+"%. c #9F1D2A",
+"&. c #937930",
+"*. c #DA000F",
+"=. c #DB000E",
+"-. c #DB020E",
+";. c #DF000D",
+":. c #D70010",
+">. c #D90010",
+",. c #EF0006",
+"<. c #F10005",
+"1. c #98982E",
+"2. c #D9D80F",
+"3. c #D9D90F",
+"4. c #DBD90E",
+"5. c #DADA0F",
+"6. c #D7D710",
+"7. c #D8D810",
+"8. c #D9D910",
+"9. c #F0F006",
+/* pixels */
+"                                ",
+"  _ U I I I I I I I I I I I ] X ",
+"  [ R I I + + + I I I I I I ..X ",
+"  [ R I + ; M q I I I I I I ..X ",
+"  [ R I I c ,.N I I I I I I ..X ",
+"  [ W 3 % r #.4 % 3 - + I I ..X ",
+"  [ K 4.S l ;.x i 8.P + I I ..X ",
+"  [ s 4.S l -.x i 8.L + I I ..X ",
+"  [ t %.0 5 $.6 a 1.p + + + ..X ",
+"  } v <.+.m <.M F 9.V I + + ..X ",
+"  [ , d 7 w @.w y &.u & 3 T ..X ",
+"  [ K 4.S l -.g 8 -.n Z 8.H ..X ",
+"  } K 8.S h *.g 8 :.n Z 4.H ..X ",
+"O | R 1 & # : # Y > Y & 1 * ..o ",
+") ~ O.o.o.o.o.o.o.o.o.o.o...! / ",
+"{ ( ^ I I I I I + + I I I Q ` ' "
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/kwin4.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/kwin4.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/kwin4.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,176 @@
+/* XPM */
+static char *kwin4[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 138 2",
+"   c #000000",
+".  c #000008",
+"X  c #00080B",
+"o  c #00011E",
+"O  c #000A25",
+"+  c #000829",
+"@  c #000333",
+"#  c #000A3A",
+"$  c #000545",
+"%  c #000C42",
+"&  c #000D5D",
+"*  c #001353",
+"=  c #001B54",
+"-  c #03027D",
+";  c #0D0276",
+":  c #0A0079",
+">  c #0E0B75",
+",  c #0E0D78",
+"<  c #001B7C",
+"1  c #1C016D",
+"2  c #120073",
+"3  c #170B70",
+"4  c #1A0170",
+"5  c #1D1C6E",
+"6  c #131372",
+"7  c #181570",
+"8  c #181870",
+"9  c #3B0059",
+"0  c #34175E",
+"q  c #260066",
+"w  c #24006C",
+"e  c #2B0165",
+"r  c #2A0068",
+"t  c #201C6D",
+"y  c #2A1466",
+"u  c #340062",
+"i  c #331862",
+"p  c #24246B",
+"a  c #2F2F60",
+"s  c #2A2A69",
+"d  c #20207F",
+"f  c #5E003E",
+"g  c #650037",
+"h  c #62003C",
+"j  c #6F0036",
+"k  c #6A003B",
+"l  c #720034",
+"z  c #780437",
+"x  c #77373F",
+"c  c #47004F",
+"v  c #4E034B",
+"b  c #4C0056",
+"n  c #480058",
+"m  c #560347",
+"M  c #5D0042",
+"N  c #452155",
+"B  c #492257",
+"V  c #482358",
+"C  c #5F2F4A",
+"Z  c #670047",
+"A  c #650048",
+"S  c #690046",
+"D  c #673247",
+"F  c #6D3343",
+"G  c #7C7A2E",
+"H  c #767632",
+"J  c #7B7B30",
+"K  c #4A4A4B",
+"L  c #4A4A52",
+"P  c #514F4A",
+"I  c #555543",
+"U  c #51504A",
+"Y  c #616149",
+"T  c #6E6E44",
+"R  c #000080",
+"E  c #02028B",
+"W  c #010090",
+"Q  c #000099",
+"!  c #0B019D",
+"~  c #0B0B9D",
+"^  c #130099",
+"/  c #111184",
+"(  c #1D1D80",
+")  c #131399",
+"_  c #0202A3",
+"`  c #0016B7",
+"'  c #0000C0",
+"]  c #0008C2",
+"[  c #0000DB",
+"{  c #000DD2",
+"}  c #000BDA",
+"|  c #0019CA",
+" . c #0010DE",
+".. c #0019D4",
+"X. c #0004E5",
+"o. c #0005E9",
+"O. c #000AE5",
+"+. c #000BEA",
+"@. c #0000F5",
+"#. c #0000FE",
+"$. c #0012E5",
+"%. c #0010ED",
+"&. c #84022B",
+"*. c #89032B",
+"=. c #860038",
+"-. c #99002F",
+";. c #950035",
+":. c #B6001E",
+">. c #B8001F",
+",. c #A70425",
+"<. c #A50029",
+"1. c #A80028",
+"2. c #B40121",
+"3. c #C70516",
+"4. c #C40019",
+"5. c #CD0015",
+"6. c #C80018",
+"7. c #D20212",
+"8. c #ED0006",
+"9. c #EB0008",
+"0. c #F10004",
+"q. c #F80002",
+"w. c #85842D",
+"e. c #89892B",
+"r. c #868539",
+"t. c #898938",
+"y. c #9B9B2E",
+"u. c #959535",
+"i. c #919138",
+"p. c #BCBC1B",
+"a. c #C0BD19",
+"s. c #C4C419",
+"d. c #CCCB15",
+"f. c #C8C818",
+"g. c #D1D114",
+"h. c #EEEE06",
+"j. c #EAEA08",
+"k. c #F3F304",
+/* pixels */
+"                                                                ",
+"                                                                ",
+"    ` E R R R R R R R R R R R R R R R R R R R R R R R R R X..   ",
+"    ' #.Q R R R R R R R R R R R R R R R R R R R R R R R @.#..   ",
+"    ` #.Q R R R R R R R R R R R R R R R R R R R R R R R @.#..   ",
+"  . ' #.Q R R R R R - R - R R R R R - R R R R R R R R R @.#..   ",
+"    ' #.Q R R R R R - ; 4 4 2 - R R R R R R R R R R R R @.#..   ",
+"    ` #.Q R R R R R ; M 4.4.k 2 R R R R R R R R R R R R @.#..   ",
+"    ` #.Q R R R R R 4 <.0.8.2.4 R R R R R R R R R R R R @.#..   ",
+"    ` #.Q R R R R R 2 <.8.0.2.4 R R R R R R R R R R R R @.#..   ",
+"    ' #.Q R - - - R ; h 4.6.j 2 R - - - - - R R R R R R @.#..   ",
+"  . ` #._ , p s 8 - 2 9 A S 9 : - 6 p s 5 - R R R R R R @.#..   ",
+"    ' #.~ P p.f.J 6 2 g 3.5.l 2 , K p.s.w.6 - R R R R R @.#..   ",
+"    ` #.) u.h.k.f.8 4 1.0.0.<.e 6 r.h.k.d.p - R R R R R @.#..   ",
+"    ` #.Q i.j.k.f.p 4 <.0.0.<.r 6 r.j.h.d.p - R R R R R @.#..   ",
+"    ' #.Q P a.d.G 8 2 f 4.6.k 1 , K p.f.w.8 - R R R R R @.#..   ",
+"    ` #.~ i F x 0 3 2 9 Z S 9 2 > a Y T L 7 R R R R R R @.#..   ",
+"  . ' #.! m 3.7.&.q 1 k 5.7.l 4 7 K s.g.e.8 R R R R R R @.#..   ",
+"    ' #.^ ;.8.q.5.u r -.0.0.>.e 5 t.j.k.d.s R R R R R R @.#..   ",
+"    ` #.^ ;.8.0.5.u e -.8.0.2.e t r.j.k.d.s R R R R R R @.#..   ",
+"    ` #.! f ,.:.z e 1 M 6.4.g 1 7 K p.d.w.8 R R - R R W @.#..   ",
+"    ` #.Q ; V V y ; ; r n b e R : 0 C F N ; - 6 p p 6 E @.#..   ",
+"    ' #.~ U p.s.J 6 ; h 4.6.k R : v >.3.*.1 > I s.s.H / @.#..   ",
+"  . ` #.) u.h.k.s.p 4 <.8.8.2.R ; =.8.q.5.e 7 y.h.h.s.d @.#..   ",
+"    ' #.) u.h.k.s.8 4 ,.8.8.2.R 2 =.8.0.5.r 7 y.h.k.s.( @.#..   ",
+"  . ' #.~ U p.s.J 6 2 f 4.6.j R : c 2.6.&.4 > I s.f.J / @.#..   ",
+"  X ] #._ , p p 8 R - 2 w w 2 R - 2 w w 2 - - 6 5 p 8 E @.#..   ",
+"X O $.#.Q R R R R R R R R R R R W Q E W W R R R R R R R @. at .O   ",
+"+ ` $.+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.X.O.} @ ",
+"} ..* = %. at .#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#. at .& # { X.",
+"#.< O | o.Q R R R R R R R R R R R R R R R R R R R R R [ O.$ # +.",
+"#.$.$.#._ R R R R R R R R R R R R R R R R R R R R R - E @. at .+.#."
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/lskat-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/lskat-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/lskat-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,239 @@
+/* XPM */
+static char *lskat16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 217 2",
+"   c #020F55",
+".  c #071255",
+"X  c #071458",
+"o  c #07165F",
+"O  c #081254",
+"+  c #091356",
+"@  c #081556",
+"#  c #0B1657",
+"$  c #0F1655",
+"%  c #0F1656",
+"&  c #0B1758",
+"*  c #0A175A",
+"=  c #0B175A",
+"-  c #08165E",
+";  c #08165F",
+":  c #08175F",
+">  c #09165E",
+",  c #0A165F",
+"<  c #0C1758",
+"1  c #0C1759",
+"2  c #0D1758",
+"3  c #0D1759",
+"4  c #0E1758",
+"5  c #0D1857",
+"6  c #0F1857",
+"7  c #0B1859",
+"8  c #0B185F",
+"9  c #0C1858",
+"0  c #0D1858",
+"q  c #0D185A",
+"w  c #0E1859",
+"e  c #0E1A5B",
+"r  c #0F1A5A",
+"t  c #101657",
+"y  c #131754",
+"u  c #151655",
+"i  c #151755",
+"p  c #141656",
+"a  c #151855",
+"s  c #171855",
+"d  c #191654",
+"f  c #1C1451",
+"g  c #181854",
+"h  c #1E1853",
+"j  c #071660",
+"k  c #091761",
+"l  c #0A1761",
+"z  c #091765",
+"x  c #0A1860",
+"c  c #0A1861",
+"v  c #0B1861",
+"b  c #0E1B63",
+"n  c #1A2167",
+"m  c #182461",
+"M  c #1B2664",
+"N  c #29194F",
+"B  c #201751",
+"V  c #251752",
+"C  c #231951",
+"Z  c #251851",
+"A  c #231F5A",
+"S  c #261F59",
+"D  c #34184D",
+"F  c #3D1A49",
+"G  c #23225C",
+"H  c #23235D",
+"J  c #202B67",
+"K  c #242B66",
+"L  c #242E67",
+"P  c #202B68",
+"I  c #212C68",
+"U  c #222E68",
+"Y  c #232E68",
+"T  c #252E68",
+"R  c #292761",
+"E  c #292769",
+"W  c #26306A",
+"Q  c #26316A",
+"!  c #26316B",
+"~  c #24306C",
+"^  c #26316C",
+"/  c #26336C",
+"(  c #27336D",
+")  c #27346D",
+"_  c #2A356E",
+"`  c #2B356F",
+"'  c #263173",
+"]  c #293475",
+"[  c #5F1C3E",
+"{  c #6C1B39",
+"}  c #6D1A38",
+"|  c #6E183A",
+" . c #761735",
+".. c #7D1C34",
+"X. c #7F1D34",
+"o. c #471945",
+"O. c #531B41",
+"+. c #551B40",
+"@. c #541B42",
+"#. c #561B40",
+"$. c #561B41",
+"%. c #591B40",
+"&. c #5D1A40",
+"*. c #422556",
+"=. c #433466",
+"-. c #6E3657",
+";. c #6B3459",
+":. c #6E3558",
+">. c #4B4555",
+",. c #5B5353",
+"<. c #604744",
+"1. c #655F5E",
+"2. c #784350",
+"3. c #696B6B",
+"4. c #757666",
+"5. c #726C8A",
+"6. c #786487",
+"7. c #747C8D",
+"8. c #737A9E",
+"9. c #77799E",
+"0. c #7A7F9D",
+"q. c #812A43",
+"w. c #A45B12",
+"e. c #BA6F3C",
+"r. c #92797C",
+"t. c #FF5959",
+"y. c #E87878",
+"u. c #FF6767",
+"i. c #FF6868",
+"p. c #FF7978",
+"a. c #FF7D7D",
+"s. c #907C98",
+"d. c #A57083",
+"f. c #CC7583",
+"g. c #B28C74",
+"h. c #BDB45C",
+"j. c #C6AD7E",
+"k. c #E8D11C",
+"l. c #D1CD44",
+"z. c #848B8D",
+"x. c #908C8C",
+"c. c #929391",
+"v. c #9C9191",
+"b. c #8789A6",
+"n. c #8389AC",
+"m. c #8888A8",
+"M. c #898EAB",
+"N. c #948FAC",
+"B. c #BCAE88",
+"V. c #A9AAA9",
+"C. c #B2A6A3",
+"Z. c #B3AAB2",
+"A. c #B3B6BC",
+"S. c #CB8A97",
+"D. c #C89292",
+"F. c #D98E8E",
+"G. c #CFA7A6",
+"H. c #DBAEA3",
+"J. c #E38D94",
+"K. c #E68E94",
+"L. c #E89599",
+"P. c #FF8585",
+"I. c #FF9391",
+"U. c #E39AA0",
+"Y. c #E3A8AA",
+"T. c #E2ABB2",
+"R. c #E6B7BD",
+"E. c #FFA6A6",
+"W. c #FFA9A9",
+"Q. c #FFAAAA",
+"!. c #FFB9B8",
+"~. c #FFB9B9",
+"^. c #FFBFBF",
+"/. c #D1D192",
+"(. c #DAD2BD",
+"). c #C3C7C7",
+"_. c #C7CAD2",
+"`. c #CBC3D1",
+"'. c #CDCED5",
+"]. c #C9CCD9",
+"[. c #CCCEDB",
+"{. c #D0D1D8",
+"}. c #D4D5DA",
+"|. c #DFDCE0",
+" X c #E3C1C3",
+".X c #E3CDD4",
+"XX c #E3CED6",
+"oX c #E3D0D8",
+"OX c #E3D2DA",
+"+X c #E2D8D8",
+"@X c #E4D8DF",
+"#X c #F0DDDD",
+"$X c #F5DEDE",
+"%X c #FFD9D9",
+"&X c #E3DBE2",
+"*X c #E6DCE2",
+"=X c #FFE0DF",
+"-X c #E3E4EB",
+";X c #E3E5ED",
+":X c #E3E6ED",
+">X c #E5E4E8",
+",X c #E4E6ED",
+"<X c #E6E7EE",
+"1X c #F8EBEB",
+"2X c #FFE8E8",
+"3X c #FFE9E9",
+"4X c #F2EDF0",
+"5X c #FFF0EF",
+"6X c #F2F3F6",
+"7X c #FFF2F1",
+"8X c #FFF3F3",
+"9X c #FFF5F5",
+"0X c #FFFCFC",
+"qX c #FFFEFD",
+"wX c #FEFEFE",
+"eX c #FFFFFE",
+"rX c gray100",
+/* pixels */
+"8 q # Z +.O.[ g q q q 4 s # w t ",
+"8 q 7 $...} } f % y h s +.N q q ",
+"8 # q Z q.-.-.;.=.*.} %.X.F q q ",
+"8 q 7 o.2.H.L.Y.Z.d. .+.[ D q # ",
+"8 q q p >.B. Xr.1.5.d s d s 7 q ",
+"8 q q X 7.j.e.w.<.0.W ) T q & q ",
+"8 X @   z.l.h.k.(.}._.A.[.M O q ",
+"n 6.m.n.)./.4.g.C.3.D.G.>XN.9.M ",
+"E L.9XwXwXwXv.F.+X,.y.t.=XI..X_ ",
+"] -XwX7XwX6Xm.s.}.x.#XQ.%XE.oX_ ",
+"] :X3Xa.7X:XI L }.V.1XP.i.p.OX` ",
+"] :XwX^.7X&XJ W {.c.$Xu.~.i..X` ",
+"] :XwXwXwXK.Z m 9.M.4XQ.3X~.T.R ",
+"' [.:X:X*Xf.A & . J `.K. at XR.S.S ",
+"b K ^ W / H % 7 & q L / W / G % ",
+"z : : k j j 8 8 8 8 : : : o : 8 "
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/icons/lskat.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/icons/lskat.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/icons/lskat.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,58 @@
+/* XPM */
+static char *lskat[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 20 1",
+"  c #08186B",
+". c #10185A",
+"X c #08185A",
+"o c #101852",
+"O c gray100",
+"+ c red",
+"@ c black",
+"# c yellow",
+"$ c #BD2121",
+"% c #5A0810",
+"& c #B52121",
+"* c #941831",
+"= c #5A1842",
+"- c #7B1839",
+"; c #291852",
+": c #9C1829",
+"> c #8C1831",
+", c #211852",
+"< c #521842",
+"1 c #181852",
+/* pixels */
+" o.o.o.o.o.o.o.o.o.o.o.o.o.o.o.o",
+" .X.X...&&,$$$.XX.X....X.XX.X...",
+" .Xo...&$.$$X$.XX.Xo...X,&X..X..",
+" .X..XX$$.,$.$.XXo.XXoX.o$o.o..X",
+" .X..X.X&$<.X$..*1X:**&.$$$..X.X",
+" .Xo...X;:$=.$*>X...*,$.=$X.o...",
+" .Xo...$.OOOOOOOOOO-*.$X.$X.o..X",
+" .X..XX$$@$O+$+OO%O&*$$.=$*..Xo.",
+" .X..XX..@#OOOO@@@O...X..XX..XX.",
+" .Xo...XXO at OOO@OO at O..XX...oX.XXo",
+" .Xo...X.O at O+@@+@@O..X.XXo.XXo..",
+" .X..XX..O#O+##+@@O..XXo...X.XX.",
+" .X..X.XXO#@O@##OOOOOOOOOOX..o..",
+" .Xo...X.O##O###OOOOOO at OOOX..XX.",
+" .Xo...XXO#@O at O+@O@@@OO at OOX..X..",
+" .OOOOOOOOOO@@O at OO@OO+OOOOOOOO.X",
+" .++OOOOOOOOO at OOOO@@O+++OOO+OO.X",
+" .OOOOOOOOOOO at ++OO@@+O++OO++OO..",
+" .OOOOOOOOOOOOOOOOOOOOOOOOOOOOXo",
+" .OOOOOOOOOOX.oXOO@@OOO+OOO+OO.X",
+" .OOOO+OOOOOX.XoOO at OOO++O+++OO.X",
+" .OOOO++OOOOX..XOOOOOOOO++OOOO..",
+" .OOOOO+OOOOX.oXOO@@OO++OO++OO..",
+" .OOOOOOOOOOX.X.OO at OOO++OO++OO.X",
+" .OOOOOOOOO+X.XoOOOOOOOOOOOOOOX.",
+" .OOOOOOOOO+X..XX..XOOO+OOO+O+X.",
+" .OOOOOOOO+OX.o..XoXOO++OOO+OOX.",
+" .OOOOOOOOO+X.X.o..XOOOOOOOOO+.X",
+" .X..XX..XX..XoXX.Xo.XXo.XXo.XXo",
+" .Xo.XXo.XXo...X.XX.oXX.oXX.oXX.",
+" .Xo.X.XX.oXX.Xo...XX...oXX.Xo..",
+"                                "
+};

Added: people/jriddell/KDE/3.5/kdegames/debian/kasteroids.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kasteroids.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kasteroids.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/games/kasteroids
+/usr/share/man/man6/kasteroids*
+/usr/share/icons/hicolor/128x128/apps/kasteroids.png
+/usr/share/icons/hicolor/64x64/apps/kasteroids.png
+/usr/share/icons/hicolor/48x48/apps/kasteroids.png
+/usr/share/icons/hicolor/32x32/apps/kasteroids.png
+/usr/share/icons/hicolor/22x22/apps/kasteroids.png
+/usr/share/icons/hicolor/16x16/apps/kasteroids.png
+/usr/share/applications/kde/kasteroids.desktop
+/usr/share/apps/kasteroids/*
+/usr/share/config.kcfg/kasteroids.kcfg
+/usr/share/doc/kdegames/kasteroids/*
+/usr/share/doc/kde/HTML/en/kasteroids/*
+../icons/kasteroids.xpm /usr/share/pixmaps
+../icons/kasteroids-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kasteroids.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kasteroids.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kasteroids.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kasteroids /usr/share/doc/kasteroids/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kasteroids.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kasteroids.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kasteroids.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kasteroids):\
+	needs="x11"\
+	section="Games/Arcade"\
+	hints="KDE"\
+	title="KAsteroids"\
+	icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
+	icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+	command="/usr/games/kasteroids"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/katomic.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/katomic.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/katomic.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/apps/katomic/*
+/usr/share/icons/hicolor/16x16/apps/katomic.png
+/usr/share/icons/hicolor/22x22/apps/katomic.png
+/usr/share/icons/hicolor/32x32/apps/katomic.png
+/usr/share/icons/hicolor/48x48/apps/katomic.png
+/usr/share/icons/hicolor/64x64/apps/katomic.png
+/usr/share/icons/hicolor/128x128/apps/katomic.png
+/usr/share/applications/kde/katomic.desktop
+/usr/games/katomic
+/usr/share/man/man6/katomic*
+/usr/share/doc/kdegames/katomic/*
+/usr/share/doc/kde/HTML/en/katomic/*
+../icons/katomic.xpm /usr/share/pixmaps
+../icons/katomic-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/katomic.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/katomic.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/katomic.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/katomic /usr/share/doc/katomic/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/katomic.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/katomic.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/katomic.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(katomic):\
+	needs="x11"\
+	section="Games/Puzzles"\
+	hints="KDE"\
+	title="KDE Atomic Entertainment"\
+	icon32x32="/usr/share/pixmaps/katomic.xpm"\
+	icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+	command="/usr/games/katomic"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+/usr/games/kbackgammon
+/usr/share/man/man6/kbackgammon*
+/usr/share/applications/kde/kbackgammon.desktop
+/usr/share/apps/kbackgammon/*
+/usr/share/icons/hicolor/48x48/apps/kbackgammon_engine.png
+/usr/share/icons/hicolor/32x32/apps/kbackgammon_engine.png
+/usr/share/icons/hicolor/16x16/apps/kbackgammon_engine.png
+/usr/share/icons/hicolor/64x64/apps/kbackgammon_engine.png
+/usr/share/icons/hicolor/48x48/apps/kbackgammon.png
+/usr/share/icons/hicolor/32x32/apps/kbackgammon.png
+/usr/share/icons/hicolor/22x22/apps/kbackgammon.png
+/usr/share/icons/hicolor/16x16/apps/kbackgammon.png
+/usr/share/icons/hicolor/64x64/apps/kbackgammon.png
+/usr/share/icons/hicolor/128x128/apps/kbackgammon.png
+/usr/share/doc/kde/HTML/en/kbackgammon/*
+
+../icons/kbackgammon.xpm /usr/share/pixmaps
+../icons/kbackgammon-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kbackgammon /usr/share/doc/kbackgammon/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kbackgammon.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kbackgammon):\
+	needs="x11"\
+	section="Games/Board"\
+	hints="KDE"\
+	title="KDE Backgammon"\
+	icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
+	icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+	command="/usr/games/kbackgammon"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kbattleship.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kbattleship.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kbattleship.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/apps/kbattleship/*
+/usr/share/icons/hicolor/128x128/apps/kbattleship.png
+/usr/share/icons/hicolor/64x64/apps/kbattleship.png
+/usr/share/icons/hicolor/48x48/apps/kbattleship.png
+/usr/share/icons/hicolor/32x32/apps/kbattleship.png
+/usr/share/icons/hicolor/22x22/apps/kbattleship.png
+/usr/share/icons/hicolor/16x16/apps/kbattleship.png
+/usr/share/applications/kde/kbattleship.desktop
+/usr/games/kbattleship
+/usr/share/doc/kde/HTML/en/kbattleship/*
+/usr/share/apps/zeroconf/_kbattleship._tcp
+
+../icons/kbattleship.xpm /usr/share/pixmaps
+../icons/kbattleship-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kbattleship.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kbattleship.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kbattleship.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kbattleship /usr/share/doc/kbattleship/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kbattleship.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kbattleship.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kbattleship.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kbattleship):\
+        needs="x11"\
+        section="Games/Board"\
+        hints="KDE"\
+        title="KBattleship"\
+	icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
+	icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+        command="/usr/games/kbattleship"

Added: people/jriddell/KDE/3.5/kdegames/debian/kblackbox.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kblackbox.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kblackbox.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/apps/kblackbox/*
+/usr/share/icons/hicolor/128x128/apps/kblackbox.png
+/usr/share/icons/hicolor/64x64/apps/kblackbox.png
+/usr/share/icons/hicolor/48x48/apps/kblackbox.png
+/usr/share/icons/hicolor/32x32/apps/kblackbox.png
+/usr/share/icons/hicolor/22x22/apps/kblackbox.png
+/usr/share/icons/hicolor/16x16/apps/kblackbox.png
+/usr/share/applications/kde/kblackbox.desktop
+/usr/games/kblackbox
+/usr/share/man/man6/kblackbox*
+/usr/share/doc/kdegames/kblackbox/*
+/usr/share/doc/kde/HTML/en/kblackbox/*
+../icons/kblackbox.xpm /usr/share/pixmaps
+../icons/kblackbox-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kblackbox.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kblackbox.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kblackbox.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kblackbox /usr/share/doc/kblackbox/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kblackbox.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kblackbox.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kblackbox.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kblackbox):\
+	needs="x11"\
+	section="Games/Puzzles"\
+	hints="KDE,BlackBox"\
+	title="KBlackBox"\
+	icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
+	icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+	command="/usr/games/kblackbox"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kbounce.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kbounce.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kbounce.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+/usr/share/apps/kbounce/*
+/usr/share/applications/kde/kbounce.desktop
+/usr/share/icons/hicolor/16x16/apps/kbounce.png
+/usr/share/icons/hicolor/22x22/apps/kbounce.png
+/usr/share/icons/hicolor/32x32/apps/kbounce.png
+/usr/share/icons/hicolor/48x48/apps/kbounce.png
+/usr/share/icons/hicolor/64x64/apps/kbounce.png
+/usr/share/icons/hicolor/128x128/apps/kbounce.png
+/usr/games/kbounce
+/usr/share/man/man6/kbounce*
+/usr/share/doc/kde/HTML/en/kbounce/*
+../icons/kbounce.xpm /usr/share/pixmaps
+../icons/kbounce-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kbounce.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kbounce.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kbounce.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kbounce /usr/share/doc/kbounce/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kbounce.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kbounce.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kbounce.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kbounce):\
+	needs="x11"\
+	section="Games/Arcade"\
+	hints="KDE"\
+	title="KDE Bounce Ball Game"\
+	icon32x32="/usr/share/pixmaps/kbounce.xpm"\
+	icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+	command="/usr/games/kbounce"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kdegames-card-data.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kdegames-card-data.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-card-data.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/apps/carddecks/*

Added: 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.atlantik	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.atlantik	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-atlantik
+Title: The Atlantik Handbook
+Author: Rob Kaper
+Abstract: Atlantik is a KDE client for playing Monopoly-like
+ boardgames on the monopd network.
+Section: Games/Board
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/atlantik/index.html
+Files: /usr/share/doc/kde/HTML/en/atlantik/*.html

Added: 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.kasteroids	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kasteroids	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-kasteroids
+Title: The KAsteroids Handbook
+Author: Philip Rodrigues
+Abstract: KAsteroids is, as you would expect, the KDE clone of the
+ popular Asteroids game.
+Section: Games/Arcade
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kasteroids/index.html
+Files: /usr/share/doc/kde/HTML/en/kasteroids/*.html

Added: 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.katomic	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.katomic	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-katomic
+Title: The Atomic Entertainment Handbook
+Author: Dirk Doerflinger
+Abstract: This Handbook describes KAtomic Version 2.0
+Section: Games/Puzzles
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/katomic/index.html
+Files: /usr/share/doc/kde/HTML/en/katomic/*.html

Added: 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.kbackgammon	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Document: kdegames-doc-html-kbackgammon
+Title: The KBackgammon Handbook
+Author: Jens Hoefkens, Bo Thorsen
+Abstract: KBackgammon is a graphical backgammon program for KDE.
+ It supports backgammon games with other players, games against
+ computer engines like GNU bg and even on-line games on the First
+ Internet Backgammon Server.
+Section: Games/Board
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kbackgammon/index.html
+Files: /usr/share/doc/kde/HTML/en/kbackgammon/*.html

Added: 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.kbattleship	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kbattleship	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-kbattleship
+Title: The KBattleship Handbook
+Author: Daniel Molkentin, Nikolas Zimmermann
+Abstract: KBattleship is a network-enabled implementation of the
+ famous Battle Ship game for KDE.
+Section: Games/Board
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kbattleship/index.html
+Files: /usr/share/doc/kde/HTML/en/kbattleship/*.html

Added: 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.kblackbox	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kblackbox	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-kblackbox
+Title: KBlackbox Game Manual
+Author: Robert Cimrman, Philip Rodrigues
+Abstract: KBlackbox is a superb graphical logical game, inspired by
+ the emacs blackbox.
+Section: Games/Puzzles
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kblackbox/index.html
+Files: /usr/share/doc/kde/HTML/en/kblackbox/*.html

Added: 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.kbounce	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kbounce	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-kbounce
+Title: The KBounce Handbook
+Author: Aaron J. Seigo
+Abstract: KBounce is a clone of Jezzball for KDE.
+Section: Games/Arcade
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kbounce/index.html
+Files: /usr/share/doc/kde/HTML/en/kbounce/*.html

Added: 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.kenolaba	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kenolaba	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-kenolaba
+Title: The Kenolaba Handbook
+Author: Josef Weidendorfer, Philip Rodrigues
+Abstract: Kenolaba is a simple board strategy game that is played
+ by two players.
+Section: Games/Board
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kenolaba/index.html
+Files: /usr/share/doc/kde/HTML/en/kenolaba/*.html

Added: 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.kfouleggs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-kfouleggs
+Title: The KFouleggs Handbook
+Author: Philip Rodrigues
+Abstract: KFouleggs is a clone of the Japanese PuyoPuyo game for
+ the K Desktop Environment.
+Section: Games/Tetris-like
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kfouleggs/index.html
+Files: /usr/share/doc/kde/HTML/en/kfouleggs/*.html

Added: 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.kgoldrunner	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdegames-doc-html-kgoldrunner
+Title: The KGoldrunner Handbook
+Author: Ian Wadham, Marco Krueger
+Abstract: KGoldrunner, a game of action and puzzle solving.  Run through
+ the maze, dodge your enemies, collect all the gold and climb up to the
+ next level.
+Section: Games/Arcade
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kgoldrunner/index.html
+Files: /usr/share/doc/kde/HTML/en/kgoldrunner/*.html

Added: 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.kjumpingcube	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-kjumpingcube
+Title: The KJumpingcube Handbook
+Author: Matthias Kiefer
+Abstract: KJumpingcube is a simple tactical game you can play against
+ a friend or the computer.
+Section: Games/Strategy
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kjumpingcube/index.html
+Files: /usr/share/doc/kde/HTML/en/kjumpingcube/*.html

Added: 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.klines	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.klines	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-klines
+Title: The KLines Handbook
+Author: Roman Razilov, Roman Merzlyakov
+Abstract: KLines is a nice little game meant to amuse you for anywhere
+ from 3 minutes to 6 days(straight).
+Section: Games/Board
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/klines/index.html
+Files: /usr/share/doc/kde/HTML/en/klines/*.html

Added: 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.kmines	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kmines	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-kmines
+Title: The KMines Handbook
+Author: Nicolas Hadacek, Michael McBride
+Abstract: KMines is the KDE version of the classic minesweeper game.
+Section: Games/Puzzles
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmines/index.html
+Files: /usr/share/doc/kde/HTML/en/kmines/*.html

Added: 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.kolf	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kolf	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-kolf
+Title: The Kolf Handbook
+Author: Jason Katz-Brown
+Abstract: Kolf is a miniature golf game for KDE.
+Section: Games/Arcade
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kolf/index.html
+Files: /usr/share/doc/kde/HTML/en/kolf/*.html

Added: 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.konquest	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.konquest	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-konquest
+Title: The Konquest Handbook
+Author: Nicholas Robbins
+Abstract: Konquest is a wonderfully complex game for universal
+ domination, or konquest, if you like.
+Section: Games/Strategy
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/konquest/index.html
+Files: /usr/share/doc/kde/HTML/en/konquest/*.html

Added: 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.kpat	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kpat	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-kpat
+Title: The KPat Handbook
+Author: Paul Olav Tvete, Maren Pakura, Stephan Kulow
+Abstract: KPat is a highly addictive card game for KDE.
+Section: Games/Card
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpat/index.html
+Files: /usr/share/doc/kde/HTML/en/kpat/*.html

Added: 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.kpoker	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kpoker	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-kpoker
+Title: KPoker Handbook
+Author: Jochen Tuchbreiter, Andreas Beckermann
+Abstract: This is the helpfile of KPoker, a little poker game.
+Section: Games/Card
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpoker/index.html
+Files: /usr/share/doc/kde/HTML/en/kpoker/*.html

Added: 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.kreversi	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kreversi	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-kreversi
+Title: The KReversi Handbook
+Author: Clay Pradarits
+Abstract: KReversi is a simple one player strategy game.
+Section: Games/Board
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kreversi/index.html
+Files: /usr/share/doc/kde/HTML/en/kreversi/*.html

Added: 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.ksame	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ksame	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-ksame
+Title: The KSame Handbook
+Author: Nicholas Robbins
+Abstract: KSame is a nice little program meant to amuse you for
+ anywhere from 3 minutes to 6 days(straight).
+Section: Games/Puzzles
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ksame/index.html
+Files: /usr/share/doc/kde/HTML/en/ksame/*.html

Added: 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.kshisen	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kshisen	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-kshisen
+Title: The KShisen Handbook
+Author: Dirk Doerflinger
+Abstract: This Handbook describes KShisen Version 1.3.
+Section: Games/Board
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kshisen/index.html
+Files: /usr/share/doc/kde/HTML/en/kshisen/*.html

Added: 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.ksirtet	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ksirtet	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-ksirtet
+Title: The KSirtet Handbook
+Author: Dirk Doerflinger
+Abstract: This program is a clone of the well known game Tetris. You
+ must fit the falling pieces to form full lines.
+Section: Games/Tetris-like
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ksirtet/index.html
+Files: /usr/share/doc/kde/HTML/en/ksirtet/*.html

Added: 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.ksnake	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ksnake	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdegames-doc-html-ksnake
+Title: The KSnake Handbook
+Author: Michel Filippi
+Abstract: Snake Race is a game of speed and agility. You are a hungry
+ snake and are trying to eat all the apples in the room before getting
+ out!
+Section: Games/Arcade
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ksnake/index.html
+Files: /usr/share/doc/kde/HTML/en/ksnake/*.html

Added: 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.ksokoban	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ksokoban	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-ksokoban
+Title: The KSokoban Handbook
+Author: Anders Widell
+Abstract: KSokoban is a KDE implementation of the Japanese warehouse
+ keeper game sokoban. This document describes KSobona version 0.4.2.
+Section: Games/Puzzles
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ksokoban/index.html
+Files: /usr/share/doc/kde/HTML/en/ksokoban/*.html

Added: 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.kspaceduel	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-kspaceduel
+Title: The KSpaceduel Handbook
+Author: Andreas Zehender
+Abstract: KSpaceduel is a space arcade game. Two ships fly around the
+ sun and try to shoot each other.
+Section: Games/Arcade
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kspaceduel/index.html
+Files: /usr/share/doc/kde/HTML/en/kspaceduel/*.html

Added: 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.ktron	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ktron	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegames-doc-html-ktron
+Title: The KTron Handbook
+Author: Fabian Dal Santo
+Abstract: KTron is a simple Tron close for KDE, which you can play
+ alone or against a friend.
+Section: Games/Arcade
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ktron/index.html
+Files: /usr/share/doc/kde/HTML/en/ktron/*.html

Added: 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.ktuberling	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.ktuberling	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-ktuberling
+Title: The KTuberling Handbook
+Author: Eric Bischoff, Paul E. Ahlquist Jr.
+Abstract: KTuberling is a game intended for small children.
+Section: Games/Toys
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ktuberling/index.html
+Files: /usr/share/doc/kde/HTML/en/ktuberling/*.html

Added: 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.kwin4	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.kwin4	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-kwin4
+Title: KWin4 Manual
+Author: Martin Heni
+Abstract: This documentation describes KWin4 version 1.0.0.
+Section: Games/Board
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kwin4/index.html
+Files: /usr/share/doc/kde/HTML/en/kwin4/*.html

Added: people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.lskat
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.lskat	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kdegames-doc-html.doc-base.lskat	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdegames-doc-html-lskat
+Title: Lskat Manual
+Author: Martin Heni
+Abstract: This documentation describes Lskat version 0.9.1.
+Section: Games/Card
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/lskat/index.html
+Files: /usr/share/doc/kde/HTML/en/lskat/*.html

Added: people/jriddell/KDE/3.5/kdegames/debian/kenolaba.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kenolaba.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kenolaba.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+/usr/share/apps/kenolaba/*
+/usr/share/icons/hicolor/16x16/apps/kenolaba.png
+/usr/share/icons/hicolor/22x22/apps/kenolaba.png
+/usr/share/icons/hicolor/32x32/apps/kenolaba.png
+/usr/share/icons/hicolor/48x48/apps/kenolaba.png
+/usr/share/icons/hicolor/64x64/apps/kenolaba.png
+/usr/share/icons/hicolor/128x128/apps/kenolaba.png
+/usr/share/applications/kde/kenolaba.desktop
+/usr/games/kenolaba
+/usr/share/doc/kde/HTML/en/kenolaba/*
+../icons/kenolaba.xpm /usr/share/pixmaps
+../icons/kenolaba-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kenolaba.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kenolaba.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kenolaba.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kenolaba /usr/share/doc/kenolaba/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kenolaba.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kenolaba.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kenolaba.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kenolaba):\
+	needs="x11"\
+	section="Games/Board"\
+	hints="KDE"\
+	title="KEnolaba"\
+	icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
+	icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+	command="/usr/games/kenolaba"

Added: people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/applications/kde/kfouleggs.desktop
+/usr/share/apps/kfouleggs/*
+/usr/share/config.kcfg/kfouleggs.kcfg
+/usr/games/kfouleggs
+/usr/share/doc/kdegames/kfouleggs/*
+/usr/share/doc/kde/HTML/en/kfouleggs/*
+/usr/share/icons/hicolor/16x16/apps/kfouleggs.png
+/usr/share/icons/hicolor/22x22/apps/kfouleggs.png
+/usr/share/icons/hicolor/32x32/apps/kfouleggs.png
+/usr/share/icons/hicolor/48x48/apps/kfouleggs.png
+/usr/share/icons/hicolor/64x64/apps/kfouleggs.png
+/usr/share/icons/hicolor/128x128/apps/kfouleggs.png
+../icons/kfouleggs.xpm /usr/share/pixmaps
+../icons/kfouleggs-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kfouleggs /usr/share/doc/kfouleggs/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kfouleggs.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kfouleggs):\
+        needs="x11"\
+        section="Games/Tetris-like"\
+	hints="KDE"\
+        title="KDE Foul Eggs"\
+	icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
+	icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+        command="/usr/games/kfouleggs"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/apps/kgoldrunner/*
+/usr/share/icons/hicolor/16x16/apps/kgoldrunner.png
+/usr/share/icons/hicolor/22x22/apps/kgoldrunner.png
+/usr/share/icons/hicolor/32x32/apps/kgoldrunner.png
+/usr/share/icons/hicolor/48x48/apps/kgoldrunner.png
+/usr/share/icons/hicolor/64x64/apps/kgoldrunner.png
+/usr/share/icons/hicolor/128x128/apps/kgoldrunner.png
+/usr/share/applications/kde/KGoldrunner.desktop
+/usr/games/kgoldrunner
+/usr/share/man/man6/kgoldrunner*
+/usr/share/doc/kdegames/kgoldrunner/*
+/usr/share/doc/kde/HTML/en/kgoldrunner/*
+../icons/kgoldrunner.xpm /usr/share/pixmaps
+../icons/kgoldrunner-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kgoldrunner /usr/share/doc/kgoldrunner/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kgoldrunner.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kgoldrunner):\
+	needs="x11"\
+	section="Games/Arcade"\
+	hints="KDE"\
+	title="KGoldrunner"\
+	icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
+	icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+	command="/usr/games/kgoldrunner"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/games/kjumpingcube
+/usr/share/icons/hicolor/128x128/apps/kjumpingcube.png
+/usr/share/icons/hicolor/64x64/apps/kjumpingcube.png
+/usr/share/icons/hicolor/48x48/apps/kjumpingcube.png
+/usr/share/icons/hicolor/32x32/apps/kjumpingcube.png
+/usr/share/icons/hicolor/22x22/apps/kjumpingcube.png
+/usr/share/icons/hicolor/16x16/apps/kjumpingcube.png
+/usr/share/man/man6/kjumpingcube*
+/usr/share/apps/kjumpingcube/*
+/usr/share/applications/kde/kjumpingcube.desktop
+/usr/share/config.kcfg/kjumpingcube.kcfg
+/usr/share/doc/kdegames/kjumpingcube/*
+/usr/share/doc/kde/HTML/en/kjumpingcube/*
+../icons/kjumpingcube.xpm /usr/share/pixmaps
+../icons/kjumpingcube-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kjumpingcube /usr/share/doc/kjumpingcube/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kjumpingcube.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kjumpingcube):\
+	needs="x11"\
+	section="Games/Strategy"\
+	hints="KDE"\
+	title="KJumpingCube"\
+	icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
+	icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+	command="/usr/games/kjumpingcube"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/klickety.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/klickety.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/klickety.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/games/klickety
+/usr/share/doc/kde/HTML/en/klickety/*
+/usr/share/applications/kde/klickety.desktop
+/usr/share/icons/crystalsvg/32x32/actions/endturn.png
+/usr/share/icons/crystalsvg/16x16/actions/endturn.png
+/usr/share/icons/hicolor/16x16/apps/klickety.png
+/usr/share/icons/hicolor/22x22/apps/klickety.png
+/usr/share/icons/hicolor/32x32/apps/klickety.png
+/usr/share/icons/hicolor/48x48/apps/klickety.png
+/usr/share/icons/hicolor/64x64/apps/klickety.png
+/usr/share/icons/hicolor/128x128/apps/klickety.png
+/usr/share/apps/klickety/klicketyui.rc
+/usr/share/apps/klickety/eventsrc
+../icons/klickety.xpm /usr/share/pixmaps
+../icons/klickety-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/klickety.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/klickety.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/klickety.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/klickety /usr/share/doc/klickety/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/klickety.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/klickety.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/klickety.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(klickety):\
+	needs="x11"\
+	section="Games/Puzzles"\
+	hints="KDE"\
+	title="Klickety"\
+	icon32x32="/usr/share/pixmaps/klickety.xpm"\
+	icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+	command="/usr/games/klickety"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/klines.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/klines.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/klines.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+/usr/share/apps/klines/*
+/usr/share/applications/kde/klines.desktop
+/usr/games/klines
+/usr/share/config.kcfg/klines.kcfg
+/usr/share/doc/kde/HTML/en/klines/*
+/usr/share/icons/hicolor/16x16/apps/klines.png
+/usr/share/icons/hicolor/22x22/apps/klines.png
+/usr/share/icons/hicolor/32x32/apps/klines.png
+/usr/share/icons/hicolor/48x48/apps/klines.png
+/usr/share/icons/hicolor/64x64/apps/klines.png
+/usr/share/icons/hicolor/128x128/apps/klines.png
+../icons/klines.xpm /usr/share/pixmaps
+../icons/klines-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/klines.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/klines.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/klines.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/klines /usr/share/doc/klines/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/klines.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/klines.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/klines.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(klines):\
+	needs="x11"\
+	section="Games/Board"\
+	hints="KDE"\
+	title="KLines"\
+	icon32x32="/usr/share/pixmaps/klines.xpm"\
+	icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+	command="/usr/games/klines"

Added: people/jriddell/KDE/3.5/kdegames/debian/kmahjongg.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kmahjongg.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kmahjongg.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/share/apps/kmahjongg/*
+/usr/share/icons/hicolor/128x128/apps/kmahjongg.png
+/usr/share/icons/hicolor/64x64/apps/kmahjongg.png
+/usr/share/icons/hicolor/48x48/apps/kmahjongg.png
+/usr/share/icons/hicolor/32x32/apps/kmahjongg.png
+/usr/share/icons/hicolor/22x22/apps/kmahjongg.png
+/usr/share/icons/hicolor/16x16/apps/kmahjongg.png
+/usr/share/applications/kde/kmahjongg.desktop
+/usr/games/kmahjongg
+/usr/share/man/man6/kmahjongg*
+/usr/share/config.kcfg/kmahjongg.kcfg
+/usr/share/doc/kdegames/kmahjongg/*
+/usr/share/doc/kde/HTML/en/kmahjongg/*
+../icons/kmahjongg.xpm /usr/share/pixmaps
+../icons/kmahjongg-16.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kmahjongg.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kmahjongg.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kmahjongg.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kmahjongg):\
+	needs="x11"\
+	section="Games/Board"\
+	hints="KDE,Mahjongg"\
+	title="KMahjongg"\
+	icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
+	icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+	command="/usr/games/kmahjongg"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kmines.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kmines.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kmines.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/icons/hicolor/128x128/apps/kmines.png
+/usr/share/icons/hicolor/64x64/apps/kmines.png
+/usr/share/icons/hicolor/48x48/apps/kmines.png
+/usr/share/icons/hicolor/32x32/apps/kmines.png
+/usr/share/icons/hicolor/22x22/apps/kmines.png
+/usr/share/icons/hicolor/16x16/apps/kmines.png
+/usr/share/applications/kde/kmines.desktop
+/usr/share/apps/kmines/*
+/usr/games/kmines
+/usr/share/man/man6/kmines*
+/usr/share/doc/kdegames/kmines/*
+/usr/share/doc/kde/HTML/en/kmines/*
+../icons/kmines.xpm /usr/share/pixmaps
+../icons/kmines-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kmines.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kmines.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kmines.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kmines /usr/share/doc/kmines/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kmines.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kmines.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kmines.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kmines):\
+	needs="x11"\
+	section="Games/Puzzles"\
+	hints="KDE,Mines"\
+	title="Kmines"\
+	icon32x32="/usr/share/pixmaps/kmines.xpm"\
+	icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+	command="/usr/games/kmines"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/knetwalk.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/knetwalk.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/knetwalk.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,31 @@
+/usr/share/apps/knetwalk/background.png
+/usr/share/apps/knetwalk/background_locked.png
+/usr/share/apps/knetwalk/cable0001.png
+/usr/share/apps/knetwalk/cable0010.png
+/usr/share/apps/knetwalk/cable0011.png
+/usr/share/apps/knetwalk/cable0100.png
+/usr/share/apps/knetwalk/cable0101.png
+/usr/share/apps/knetwalk/cable0110.png
+/usr/share/apps/knetwalk/cable0111.png
+/usr/share/apps/knetwalk/cable1000.png
+/usr/share/apps/knetwalk/cable1001.png
+/usr/share/apps/knetwalk/cable1010.png
+/usr/share/apps/knetwalk/cable1011.png
+/usr/share/apps/knetwalk/cable1100.png
+/usr/share/apps/knetwalk/cable1101.png
+/usr/share/apps/knetwalk/cable1110.png
+/usr/share/apps/knetwalk/computer1.png
+/usr/share/apps/knetwalk/computer2.png
+/usr/share/apps/knetwalk/server.png
+/usr/share/apps/knetwalk/eventsrc
+/usr/share/apps/knetwalk/knetwalkui.rc
+/usr/share/apps/knetwalk/sounds/click.wav
+/usr/share/apps/knetwalk/sounds/connect.wav
+/usr/share/apps/knetwalk/sounds/start.wav
+/usr/share/apps/knetwalk/sounds/turn.wav
+/usr/share/apps/knetwalk/sounds/win.wav
+/usr/share/icons/hicolor/32x32/apps/knetwalk.png
+/usr/share/icons/hicolor/22x22/apps/knetwalk.png
+/usr/share/icons/hicolor/64x64/apps/knetwalk.png
+/usr/share/icons/hicolor/128x128/apps/knetwalk.png
+/usr/games/knetwalk

Added: people/jriddell/KDE/3.5/kdegames/debian/kolf-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kolf-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kolf-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+/usr/include/kde/kolf
+/usr/lib/libkolf.so

Added: people/jriddell/KDE/3.5/kdegames/debian/kolf.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kolf.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kolf.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,24 @@
+/etc/kde3/magic/kolf.magic
+/usr/share/apps/kolf/*
+/usr/games/kolf
+/usr/share/applications/kde/kolf.desktop
+/usr/share/doc/kdegames/kolf/*
+/usr/share/doc/kde/HTML/en/kolf/*
+/usr/share/icons/hicolor/16x16/apps/kolf.png
+/usr/share/icons/hicolor/22x22/apps/kolf.png
+/usr/share/icons/hicolor/32x32/apps/kolf.png
+/usr/share/icons/hicolor/48x48/apps/kolf.png
+/usr/share/icons/hicolor/64x64/apps/kolf.png
+/usr/share/icons/hicolor/128x128/apps/kolf.png
+/usr/share/man/man6/kolf*
+/usr/share/mimelnk/application/x-kolf.desktop
+/usr/share/mimelnk/application/x-kourse.desktop
+/usr/lib/libkdeinit_kolf.so
+/usr/lib/libkdeinit_kolf.la
+/usr/lib/kde3/kolf.la
+/usr/lib/kde3/kolf.so
+/usr/lib/libkolf.la
+/usr/lib/libkolf.so.1
+/usr/lib/libkolf.so.1.2.0
+../icons/kolf.xpm /usr/share/pixmaps
+../icons/kolf-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kolf.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kolf.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kolf.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kolf /usr/share/doc/kolf/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kolf.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kolf.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kolf.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kolf):\
+	needs="x11"\
+	section="Games/Arcade"\
+	hints="KDE"\
+	title="KDE Miniature Golf"\
+	icon32x32="/usr/share/pixmaps/kolf.xpm"\
+	icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+	command="/usr/games/kolf"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/konquest.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/konquest.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/konquest.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/apps/konquest/*
+/usr/share/icons/hicolor/128x128/apps/konquest.png
+/usr/share/icons/hicolor/64x64/apps/konquest.png
+/usr/share/icons/hicolor/48x48/apps/konquest.png
+/usr/share/icons/hicolor/32x32/apps/konquest.png
+/usr/share/icons/hicolor/22x22/apps/konquest.png
+/usr/share/icons/hicolor/16x16/apps/konquest.png
+/usr/share/applications/kde/konquest.desktop
+/usr/games/konquest
+/usr/share/man/man6/konquest*
+/usr/share/doc/kdegames/konquest/*
+/usr/share/doc/kde/HTML/en/konquest/*
+../icons/konquest.xpm /usr/share/pixmaps
+../icons/konquest-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/konquest.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/konquest.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/konquest.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/konquest /usr/share/doc/konquest/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/konquest.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/konquest.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/konquest.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(konquest):\
+	needs="x11"\
+	section="Games/Strategy"\
+	hints="KDE"\
+	title="Konquest"\
+	icon32x32="/usr/share/pixmaps/konquest.xpm"\
+	icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+	command="/usr/games/konquest"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kpat.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kpat.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kpat.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/icons/hicolor/128x128/apps/kpat.png
+/usr/share/icons/hicolor/64x64/apps/kpat.png
+/usr/share/icons/hicolor/48x48/apps/kpat.png
+/usr/share/icons/hicolor/32x32/apps/kpat.png
+/usr/share/icons/hicolor/22x22/apps/kpat.png
+/usr/share/icons/hicolor/16x16/apps/kpat.png
+/usr/share/apps/kpat/*
+/usr/share/applications/kde/kpat.desktop
+/usr/games/kpat
+/usr/share/man/man6/kpat*
+/usr/share/doc/kdegames/kpat/*
+/usr/share/doc/kde/HTML/en/kpat/*
+../icons/kpat.xpm /usr/share/pixmaps
+../icons/kpat-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kpat.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kpat.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kpat.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kpat /usr/share/doc/kpat/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kpat.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kpat.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kpat.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kpat):\
+	needs="x11"\
+	section="Games/Card"\
+	hints="KDE"\
+	title="KDE Patience"\
+	icon32x32="/usr/share/pixmaps/kpat.xpm"\
+	icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+	command="/usr/games/kpat"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kpoker.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kpoker.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kpoker.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/apps/kpoker/*
+/usr/share/icons/hicolor/128x128/apps/kpoker.png
+/usr/share/icons/hicolor/64x64/apps/kpoker.png
+/usr/share/icons/hicolor/48x48/apps/kpoker.png
+/usr/share/icons/hicolor/32x32/apps/kpoker.png
+/usr/share/icons/hicolor/22x22/apps/kpoker.png
+/usr/share/icons/hicolor/16x16/apps/kpoker.png
+/usr/share/applications/kde/kpoker.desktop
+/usr/games/kpoker
+/usr/share/man/man6/kpoker*
+/usr/share/doc/kdegames/kpoker/*
+/usr/share/doc/kde/HTML/en/kpoker/*
+../icons/kpoker.xpm /usr/share/pixmaps
+../icons/kpoker-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kpoker.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kpoker.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kpoker.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kpoker /usr/share/doc/kpoker/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kpoker.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kpoker.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kpoker.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kpoker):\
+	needs="x11"\
+	section="Games/Card"\
+	hints="KDE"\
+	title="KDE Poker"\
+	icon32x32="/usr/share/pixmaps/kpoker.xpm"\
+	icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+	command="/usr/games/kpoker"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kreversi.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kreversi.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kreversi.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,26 @@
+/usr/games/kreversi
+/usr/share/man/man6/kreversi*
+/usr/share/doc/kdegames/kreversi/*
+/usr/share/doc/kde/HTML/en/kreversi/*
+/usr/share/applications/kde/kreversi.desktop
+/usr/share/apps/kreversi/*
+/usr/share/config.kcfg/kreversi.kcfg
+/usr/share/icons/hicolor/128x128/apps/kreversi.png
+/usr/share/icons/hicolor/64x64/apps/kreversi.png
+/usr/share/icons/hicolor/48x48/apps/kreversi.png
+/usr/share/icons/hicolor/32x32/apps/kreversi.png
+/usr/share/icons/hicolor/22x22/apps/kreversi.png
+/usr/share/icons/hicolor/16x16/apps/kreversi.png
+/usr/share/icons/crystalsvg/16x16/actions/lastmoves.png
+/usr/share/icons/crystalsvg/16x16/actions/legalmoves.png
+/usr/share/icons/crystalsvg/32x32/actions/legalmoves.png
+/usr/share/icons/crystalsvg/32x32/actions/lastmoves.png
+/usr/share/icons/crystalsvg/22x22/actions/lastmoves.png
+/usr/share/icons/crystalsvg/22x22/actions/legalmoves.png
+/usr/share/icons/crystalsvg/scalable/actions/lastmoves.svgz
+/usr/share/icons/crystalsvg/scalable/actions/legalmoves.svgz
+/usr/share/icons/crystalsvg/48x48/actions/legalmoves.png
+/usr/share/icons/crystalsvg/48x48/actions/lastmoves.png
+
+../icons/kreversi.xpm /usr/share/pixmaps
+../icons/kreversi-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kreversi.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kreversi.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kreversi.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kreversi /usr/share/doc/kreversi/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kreversi.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kreversi.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kreversi.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kreversi):\
+	needs="x11"\
+	section="Games/Board"\
+	hints="KDE"\
+	title="KDE Reversi"\
+	icon32x32="/usr/share/pixmaps/kreversi.xpm"\
+	icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+	command="/usr/games/kreversi"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/ksame.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksame.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksame.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/games/ksame
+/usr/share/man/man6/ksame*
+/usr/share/doc/kdegames/ksame/*
+/usr/share/doc/kde/HTML/en/ksame/*
+/usr/share/icons/hicolor/128x128/apps/ksame.png
+/usr/share/icons/hicolor/64x64/apps/ksame.png
+/usr/share/icons/hicolor/48x48/apps/ksame.png
+/usr/share/icons/hicolor/32x32/apps/ksame.png
+/usr/share/icons/hicolor/22x22/apps/ksame.png
+/usr/share/icons/hicolor/16x16/apps/ksame.png
+/usr/share/apps/ksame/*
+/usr/share/applications/kde/ksame.desktop
+../icons/ksame.xpm /usr/share/pixmaps
+../icons/ksame-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/ksame.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksame.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksame.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/ksame /usr/share/doc/ksame/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/ksame.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksame.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksame.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(ksame):\
+	needs="x11"\
+	section="Games/Puzzles"\
+	hints="KDE,SameGame"\
+	title="KDE SameGame"\
+	icon32x32="/usr/share/pixmaps/ksame.xpm"\
+	icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+	command="/usr/games/ksame"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kshisen.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kshisen.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kshisen.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/share/apps/kshisen/*
+/usr/share/config.kcfg/kshisen.kcfg
+/usr/share/icons/hicolor/128x128/apps/kshisen.png
+/usr/share/icons/hicolor/64x64/apps/kshisen.png
+/usr/share/icons/hicolor/48x48/apps/kshisen.png
+/usr/share/icons/hicolor/32x32/apps/kshisen.png
+/usr/share/icons/hicolor/22x22/apps/kshisen.png
+/usr/share/icons/hicolor/16x16/apps/kshisen.png
+/usr/share/applications/kde/kshisen.desktop
+/usr/games/kshisen
+/usr/share/man/man6/kshisen*
+/usr/share/doc/kdegames/kshisen/*
+/usr/share/doc/kde/HTML/en/kshisen/*
+../icons/kshisen.xpm /usr/share/pixmaps
+../icons/kshisen-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kshisen.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kshisen.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kshisen.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kshisen /usr/share/doc/kshisen/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kshisen.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kshisen.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kshisen.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kshisen):\
+	needs="x11"\
+	section="Games/Board"\
+	hints="KDE"\
+	title="KDE Shisen-Sho"\
+	icon32x32="/usr/share/pixmaps/kshisen.xpm"\
+	icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+	command="/usr/games/kshisen"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/ksirtet.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksirtet.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksirtet.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/share/applications/kde/ksirtet.desktop
+/usr/share/icons/hicolor/128x128/apps/ksirtet.png
+/usr/share/icons/hicolor/64x64/apps/ksirtet.png
+/usr/share/icons/hicolor/48x48/apps/ksirtet.png
+/usr/share/icons/hicolor/32x32/apps/ksirtet.png
+/usr/share/icons/hicolor/22x22/apps/ksirtet.png
+/usr/share/icons/hicolor/16x16/apps/ksirtet.png
+/usr/share/apps/ksirtet/*
+/usr/games/ksirtet
+/usr/share/man/man6/ksirtet*
+/usr/share/config.kcfg/ksirtet.kcfg
+/usr/share/doc/kdegames/ksirtet/*
+/usr/share/doc/kde/HTML/en/ksirtet/*
+../icons/ksirtet.xpm /usr/share/pixmaps
+../icons/ksirtet-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/ksirtet.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksirtet.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksirtet.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/ksirtet /usr/share/doc/ksirtet/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/ksirtet.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksirtet.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksirtet.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(ksirtet):\
+	needs="x11"\
+	section="Games/Tetris-like"\
+	hints="KDE"\
+	title="KDE Sirtet"\
+	icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
+	icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+	command="/usr/games/ksirtet"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/ksmiletris.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksmiletris.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksmiletris.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/share/apps/ksmiletris/*
+/usr/share/icons/hicolor/128x128/apps/ksmiletris.png
+/usr/share/icons/hicolor/64x64/apps/ksmiletris.png
+/usr/share/icons/hicolor/48x48/apps/ksmiletris.png
+/usr/share/icons/hicolor/32x32/apps/ksmiletris.png
+/usr/share/icons/hicolor/22x22/apps/ksmiletris.png
+/usr/share/icons/hicolor/16x16/apps/ksmiletris.png
+/usr/share/applications/kde/ksmiletris.desktop
+/usr/games/ksmiletris
+/usr/share/man/man6/ksmiletris*
+/usr/share/doc/kdegames/ksmiletris/*
+/usr/share/doc/kde/HTML/en/ksmiletris/*
+../icons/ksmiletris.xpm /usr/share/pixmaps
+../icons/ksmiletris-16.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdegames/debian/ksmiletris.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksmiletris.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksmiletris.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(ksmiletris):\
+	needs="x11"\
+	section="Games/Tetris-like"\
+	hints="KDE"\
+	title="KDE Smiletris"\
+	icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
+	icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+	command="/usr/games/ksmiletris"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/ksnake.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksnake.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksnake.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/share/apps/ksnake/*
+/usr/share/config.kcfg/ksnake.kcfg
+/usr/share/icons/hicolor/128x128/apps/ksnake.png
+/usr/share/icons/hicolor/64x64/apps/ksnake.png
+/usr/share/icons/hicolor/48x48/apps/ksnake.png
+/usr/share/icons/hicolor/32x32/apps/ksnake.png
+/usr/share/icons/hicolor/22x22/apps/ksnake.png
+/usr/share/icons/hicolor/16x16/apps/ksnake.png
+/usr/share/applications/kde/ksnake.desktop
+/usr/games/ksnake
+/usr/share/man/man6/ksnake*
+/usr/share/doc/kdegames/ksnake/*
+/usr/share/doc/kde/HTML/en/ksnake/*
+../icons/ksnake.xpm /usr/share/pixmaps
+../icons/ksnake-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/ksnake.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksnake.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksnake.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/ksnake /usr/share/doc/ksnake/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/ksnake.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksnake.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksnake.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(ksnake):\
+	needs="x11"\
+	section="Games/Arcade"\
+	hints="KDE"\
+	title="KDE Snake Race"\
+	icon32x32="/usr/share/pixmaps/ksnake.xpm"\
+	icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+	command="/usr/games/ksnake"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/ksokoban.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksokoban.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksokoban.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+/usr/share/applications/kde/ksokoban.desktop
+/usr/share/icons/hicolor/128x128/apps/ksokoban.png
+/usr/share/icons/hicolor/64x64/apps/ksokoban.png
+/usr/share/icons/hicolor/48x48/apps/ksokoban.png
+/usr/share/icons/hicolor/32x32/apps/ksokoban.png
+/usr/share/icons/hicolor/22x22/apps/ksokoban.png
+/usr/share/icons/hicolor/16x16/apps/ksokoban.png
+/usr/games/ksokoban
+/usr/share/man/man6/ksokoban*
+/usr/share/doc/kdegames/ksokoban/*
+/usr/share/doc/kde/HTML/en/ksokoban/*
+../icons/ksokoban.xpm /usr/share/pixmaps
+../icons/ksokoban-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/ksokoban.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksokoban.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksokoban.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/ksokoban /usr/share/doc/ksokoban/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/ksokoban.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ksokoban.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ksokoban.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(ksokoban):\
+	needs="x11"\
+	section="Games/Puzzles"\
+	hints="KDE,Sokoban"\
+	title="KDE Sokoban"\
+	icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
+	icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+	command="/usr/games/ksokoban"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/share/apps/kspaceduel/*
+/usr/share/icons/hicolor/16x16/apps/kspaceduel.png
+/usr/share/icons/hicolor/22x22/apps/kspaceduel.png
+/usr/share/icons/hicolor/32x32/apps/kspaceduel.png
+/usr/share/icons/hicolor/48x48/apps/kspaceduel.png
+/usr/share/icons/hicolor/64x64/apps/kspaceduel.png
+/usr/share/icons/hicolor/128x128/apps/kspaceduel.png
+/usr/share/applications/kde/kspaceduel.desktop
+/usr/games/kspaceduel
+/usr/share/man/man6/kspaceduel*
+/usr/share/config.kcfg/kspaceduel.kcfg
+/usr/share/doc/kdegames/kspaceduel/*
+/usr/share/doc/kde/HTML/en/kspaceduel/*
+../icons/kspaceduel.xpm /usr/share/pixmaps
+../icons/kspaceduel-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kspaceduel /usr/share/doc/kspaceduel/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kspaceduel.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kspaceduel):\
+	needs="x11"\
+	section="Games/Arcade"\
+	hints="KDE"\
+	title="KDE SpaceDuel"\
+	icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
+	icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+	command="/usr/games/kspaceduel"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/ktron.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ktron.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ktron.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/games/ktron
+/usr/share/icons/hicolor/16x16/apps/ktron.png
+/usr/share/icons/hicolor/22x22/apps/ktron.png
+/usr/share/icons/hicolor/32x32/apps/ktron.png
+/usr/share/icons/hicolor/48x48/apps/ktron.png
+/usr/share/icons/hicolor/64x64/apps/ktron.png
+/usr/share/icons/hicolor/128x128/apps/ktron.png
+/usr/share/man/man6/ktron*
+/usr/share/doc/kdegames/ktron/*
+/usr/share/doc/kde/HTML/en/ktron/*
+/usr/share/applications/kde/ktron.desktop
+/usr/share/apps/ktron/*
+/usr/share/config.kcfg/ktron.kcfg
+../icons/ktron.xpm /usr/share/pixmaps
+../icons/ktron-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/ktron.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ktron.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ktron.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/ktron /usr/share/doc/ktron/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/ktron.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ktron.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ktron.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(ktron):\
+	needs="x11"\
+	section="Games/Arcade"\
+	hints="KDE"\
+	title="KDE Tron"\
+	icon32x32="/usr/share/pixmaps/ktron.xpm"\
+	icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+	command="/usr/games/ktron"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/ktuberling.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ktuberling.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ktuberling.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/games/ktuberling
+/usr/share/icons/hicolor/128x128/apps/ktuberling.png
+/usr/share/icons/hicolor/64x64/apps/ktuberling.png
+/usr/share/icons/hicolor/48x48/apps/ktuberling.png
+/usr/share/icons/hicolor/32x32/apps/ktuberling.png
+/usr/share/icons/hicolor/22x22/apps/ktuberling.png
+/usr/share/icons/hicolor/16x16/apps/ktuberling.png
+/usr/share/man/man6/ktuberling*
+/usr/share/doc/kdegames/ktuberling/*
+/usr/share/doc/kde/HTML/en/ktuberling/*
+/usr/share/applications/kde/ktuberling.desktop
+/usr/share/apps/ktuberling/*
+/usr/share/mimelnk/application/x-tuberling.desktop
+../icons/ktuberling.xpm /usr/share/pixmaps
+../icons/ktuberling-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/ktuberling.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ktuberling.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ktuberling.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/ktuberling /usr/share/doc/ktuberling/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/ktuberling.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/ktuberling.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/ktuberling.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(ktuberling):\
+	needs="x11"\
+	section="Games/Toys"\
+	hints="KDE"\
+	title="KDE Potato Guy"\
+	icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
+	icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+	command="/usr/games/ktuberling"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/kwin4.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kwin4.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kwin4.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+/usr/games/kwin4
+/usr/games/kwin4proc
+/usr/share/man/man6/kwin4*
+/usr/share/man/man6/kproc4*
+/usr/share/apps/kwin4/*
+/usr/share/config.kcfg/kwin4.kcfg
+/usr/share/icons/hicolor/128x128/apps/kwin4.png
+/usr/share/icons/hicolor/64x64/apps/kwin4.png
+/usr/share/icons/hicolor/48x48/apps/kwin4.png
+/usr/share/icons/hicolor/32x32/apps/kwin4.png
+/usr/share/icons/hicolor/22x22/apps/kwin4.png
+/usr/share/icons/hicolor/16x16/apps/kwin4.png
+/usr/share/applications/kde/kwin4.desktop
+/usr/share/doc/kde/HTML/en/kwin4/*
+../icons/kwin4.xpm /usr/share/pixmaps
+../icons/kwin4-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/kwin4.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kwin4.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kwin4.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kwin4 /usr/share/doc/kwin4/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/kwin4.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/kwin4.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/kwin4.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kwin4):\
+	needs="x11"\
+	section="Games/Board"\
+	hints="KDE"\
+	title="KWin4"\
+	icon32x32="/usr/share/pixmaps/kwin4.xpm"\
+	icon16x16="/usr/share/pixmaps/kwin4-16.xpm"\
+	command="/usr/games/kwin4"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/libkdegames-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/libkdegames-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/libkdegames-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+/usr/include/kde/*.h
+/usr/include/kde/kgame
+/usr/lib/libkdegames.so
+/usr/lib/libkdegames.la

Added: people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.doc-base
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.doc-base	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.doc-base	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: libkdegames-doc
+Title: KDE Games Library API Documentation
+Author: The KDE Developers
+Abstract: This is the developers' API documentation for libkdegames.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kdegames-rc1-apidocs/index.html
+Files: /usr/share/doc/kde/HTML/en/kdegames-rc1-apidocs/*.html

Added: people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kdegames-*-apidocs/*

Added: people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/libkdegames-doc.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kdegames-rc1-apidocs /usr/share/doc/libkdegames-doc/html

Added: people/jriddell/KDE/3.5/kdegames/debian/libkdegames1.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/libkdegames1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/libkdegames1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+/usr/lib/libkdegames.so.*
+/usr/share/apps/kdegames/pics/star.png
+/usr/share/icons/crystalsvg/16x16/actions/roll.png
+/usr/share/icons/crystalsvg/16x16/actions/highscore.png
+/usr/share/icons/crystalsvg/22x22/actions/roll.png
+/usr/share/icons/crystalsvg/32x32/actions/roll.png
+/usr/share/icons/crystalsvg/32x32/actions/highscore.png

Added: people/jriddell/KDE/3.5/kdegames/debian/lskat.install
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/lskat.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/lskat.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/games/lskat
+/usr/games/lskatproc
+/usr/share/man/man6/lskat*
+/usr/share/doc/kdegames/lskat/*
+/usr/share/doc/kde/HTML/en/lskat/*
+/usr/share/apps/lskat/*
+/usr/share/icons/hicolor/128x128/apps/lskat.png
+/usr/share/icons/hicolor/64x64/apps/lskat.png
+/usr/share/icons/hicolor/48x48/apps/lskat.png
+/usr/share/icons/hicolor/32x32/apps/lskat.png
+/usr/share/icons/hicolor/22x22/apps/lskat.png
+/usr/share/icons/hicolor/16x16/apps/lskat.png
+/usr/share/applications/kde/lskat.desktop
+../icons/lskat.xpm /usr/share/pixmaps
+../icons/lskat-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegames/debian/lskat.links
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/lskat.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/lskat.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/lskat /usr/share/doc/lskat/html

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

Added: people/jriddell/KDE/3.5/kdegames/debian/lskat.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/lskat.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/lskat.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(lskat):\
+	needs="x11"\
+	section="Games/Card"\
+	hints="KDE"\
+	title="KDE Lieutnant Skat"\
+	icon32x32="/usr/share/pixmaps/lskat.xpm"\
+	icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+	command="/usr/games/lskat"
+

Added: people/jriddell/KDE/3.5/kdegames/debian/man/atlantik.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/atlantik.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/atlantik.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+.TH ATLANTIK 6
+.SH NAME
+atlantik \- KDE monopd client
+.SH SYNOPSIS
+.B atlantik
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+\fBAtlantik\fP is a KDE client for playing Monopoly-like boardgames on
+the monopd network.
+
+Purpose of the \fBatlantik\fP board game is to acquire land in major
+cities in North America and Europe while being a transatlantic
+traveller. All game modes are served by monopd, a dedicated game
+server designed for \fBatlantik\fP.  One of the game modes plays like
+the popular real estate board game known as Monopoly.
+.so kdeopt.part
+.SH PROGRAM OPTIONS
+.TP
+.B -h, --host \fI<argument>\fB
+connect to this host
+.B -p, --port \fI<argument>\fB
+connect to this port
+.B -g, --game \fI<argument>\fB
+join this game
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/atlantik
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/atlantik').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kasteroids.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kasteroids.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kasteroids.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+.TH KASTEROIDS 6
+.SH NAME
+kasteroids \- Asteroids for KDE
+.SH SYNOPSIS
+.B kasteroids
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+The objective of \fBkasteroids\fP is to destroy all the asteroids on
+the screen to advance to the next level. Your ship is destroyed if it
+makes contact with an asteroid.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kasteroids
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kasteroids').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/katomic.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/katomic.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/katomic.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+.TH KATOMIC 6
+.SH NAME
+katomic \- The Atomic Entertainment Handbook
+.SH SYNOPSIS
+.B katomic
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+Atomic Entertainment is a smal game which resembles Sokoban. The
+object of the game is to build chemical molecules on a Sokoban-like
+board.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/katomic
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/katomic').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kbackgammon.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kbackgammon.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kbackgammon.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+.TH KBACKGAMMON 6
+.SH NAME
+kbackgammon \- Graphical backgammon program for KDE
+.SH SYNOPSIS
+.B kbackgammon
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kbackgammon
+is a graphical backgammon program for KDE. It supports backgammon
+games with other players, games against computer engines like GNU bg
+and even on-line games on the First Internet Backgammon Server.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kbackgammon
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kbackgammon').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kbattleship.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kbattleship.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kbattleship.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+.TH KBATTLESHIP 6
+.SH NAME
+kbattleship \- The KDE Battleship clone
+.SH SYNOPSIS
+.B kbattleship
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kbattleship
+is a network-enabled implementation of the famous `Battle Ship' game
+for KDE.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kbattleship
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kbattleship).

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kblackbox.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kblackbox.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kblackbox.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+.TH KBLACKBOX 6
+.SH NAME
+kblackbox \- KDE Blackbox Game
+.SH SYNOPSIS
+.B kblackbox
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kblackbox
+is a superb graphical logical game, inspired by the
+.B emacs
+blackbox.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kblackbox
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kblackbox').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kbounce.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kbounce.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kbounce.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,27 @@
+.TH KBOUNCE 6
+.SH NAME
+kbounce \- KDE Jezz Ball game
+.SH SYNOPSIS
+.B kbounce
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+This is a clone of the popular Jezzball game originally created by
+Microsoft. Jezzball is one of the rare and simple games requiring
+skill, timing, and patience in order to be successful.  A ball begins
+to bounce off of an area enclosed by four borders (like a square). You
+must move your pointer to certain areas within the square. Upon
+clicking, a new border is constructed at a relatively quick pace. You
+can change the direction of the borders by 90 degrees as
+well. Ultimately, you must force the ball to bounce around in a
+smaller, and smaller area as time goes by without the ball ever
+touching the borders as they are being constructed. If a ball touches
+a certian part of the border as it is being built, the game is over.
+After 75% of the original space has been blocked off from the moving
+ball, you advance one level, and one more ball is added to the mix in
+the following level.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kbounce
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kbounce').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kdeopt.part
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kdeopt.part	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kdeopt.part	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,110 @@
+.\" This portion of the manual page is from kdeopt.man, from the
+.\" kdegames Debian package.
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-kde
+Show KDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+.TP
+.B \-\-license
+Show license information.
+.TP
+.B \-\-
+End of options.
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+.SH KDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kenolaba.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kenolaba.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kenolaba.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,27 @@
+.TH KENOLABA 6
+.SH NAME
+kenolaba \- Abalone board game for KDE
+.SH SYNOPSIS
+.B kabalone
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+KEnolaba is a simple board strategy game that is played by two players.
+There are red and yellow pieces for each player. Beginning from a
+start position where each player has 14 pieces, moves are drawn until
+one player has pushed 6 of his opponent's pieces out of the board.
+
+The original program was developed in 1993 for DOS and pure Xlib. For
+KDE there was a major rewrite.
+.so kdeopt.part
+.SH PROGRAM OPTIONS
+.TP
+.B \-h, \-\-host \fI<host>\fB
+Use `host' for network game.
+.TP
+.B \-p, \-\-port \fI<port>\fB
+Use `port' for network game.
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kenolaba
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kenolaba).

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kfouleggs.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kfouleggs.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kfouleggs.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,19 @@
+.TH KFOULEGGS 6
+.SH NAME
+kfouleggs \- PuyoPuyo game for KDE
+.SH SYNOPSIS
+.B kfouleggs
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kfouleggs
+is a clone of the Japanese PuyoPuyo game, with advanced features such
+as multiplayer games againts human or AI, and network play. If you
+have played Tetris, or one of its many clones, you will find
+.B kfouleggs
+easy to learn.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kfouleggs
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kfouleggs').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kgoldrunner.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kgoldrunner.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kgoldrunner.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+.TH KGOLDRUNNER 6
+.SH NAME
+kgoldrunner \- KDE version of the Loderunner arcade game
+.SH SYNOPSIS
+.B kgoldrunner
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+\fBKGoldrunner\fP is a game of action and puzzle solving.  Run through
+the maze, dodge your enemies, collect all the gold and climb up to the
+next level.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kgoldrunner
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/konqueror').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kjumpingcube.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kjumpingcube.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kjumpingcube.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,20 @@
+.TH KJUMPINGCUBE 6
+.SH NAME
+kjumpingcube \- Tactical one- or two-player game
+.SH SYNOPSIS
+.B kjumpingcube
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kjumpingcube
+is a simple tactical game. You can play it against the computer or
+against a friend. The playing field consists of squares that contain
+points. By clicking on the squares you can increase the points, and if
+the points reach a maximum the points will jump to the squares'
+neighbours and take them over. The winner is the one who owns all the
+squares.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kjumpingcube
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kjumpingcube').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/klickety.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/klickety.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/klickety.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+.TH KLICKETY 6
+.SH NAME
+klickety \- A Clickomania-alike game
+.SH SYNOPSIS
+.B klickety
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+Klickety is an adaptation of the (perhaps) well-known Clickomania
+game; it is very similar to the `same' game.
+.so kdeopt.part

Added: people/jriddell/KDE/3.5/kdegames/debian/man/klines.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/klines.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/klines.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+.TH KLINES 6
+.SH NAME
+klines \- Color Lines game for KDE
+.SH SYNOPSIS
+.B klines
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+KLines is a simple game. It is played by one player, so there is only one
+winner :-). You play for fun and against the high score. It was inspired
+by a well known game - ``Color lines'', written for DOS by Olga Demina,
+Igor Demina, Igor Ivkin and Gennady Denisov back in 1992.
+
+The main rules of the game are as simple as possible: you move (using the
+mouse) marbles from cell to cell and build lines (horizontal, vertical or
+diagonal). When a line contains 5 or more marbles, they are removed and
+your score grows. After each turn the computer drops three more marbles.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/klines
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/klines').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kmahjongg.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kmahjongg.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kmahjongg.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+.TH KMAHJONGG 6
+.SH NAME
+kmahjongg \- Mahjongg game for KDE
+.SH SYNOPSIS
+.B kmahjongg
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+Your mission in this game is to remove all tiles from the game
+board. A matching pair of tiles can be removed, if they are `free',
+which means that no other tiles block them on the left or right side.
+.so kdeopt.part
+

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kmines.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kmines.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kmines.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+.TH KMINES 6
+.SH NAME
+kmines \- KDE mine sweeper game
+.SH SYNOPSIS
+.B kmines
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kmines
+is the classic Minesweeper game. You must uncover all the empty cases
+without blowing on a mine.
+
+When you uncover a case, a number appears: it indicates how many mines
+surround this case. If there is no number the neighbour cases are
+automatically uncovered. In your process of uncovering secure cases,
+it is \fIvery\fP useful to put a flag on the cases which contain a
+mine.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kmines
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kmines').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kolf.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kolf.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kolf.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+.TH KOLF 6
+.SH NAME
+kolf \- A miniature golf game for KDE
+.SH SYNOPSIS
+.B kolf
+.I [Qt-options] [KDE-options] [--course-info] file
+.SH DESCRIPTION
+\fBKolf\fP is a miniature golf game with block graphics and a 2d
+top-down view. Courses are dynamic, and up to 10 people can play at
+once in competition.
+
+\fBKolf\fP comes with a tutorial course. Playing this course is the
+easiest way to get started.
+.so kdeopt.part
+.SH PROGRAM OPTIONS
+.TP
+.B --course-info
+Print course information and exit.
+.B file
+Play this course.
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kolf
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kolf').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/konquest.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/konquest.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/konquest.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+.TH KONQUEST 6
+.SH NAME
+konquest \- Gnu-Lactic Konquest
+.SH SYNOPSIS
+.B konquest
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+This is the KDE version of Gnu-Lactic Konquest, a multi-player
+strategy game. The goal of the game is to expand your interstellar
+empire across the galaxy and, of course, crush your rivals in the
+process.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/konquest
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/konquest').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kpat.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kpat.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kpat.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+.TH KPAT 6
+.SH NAME
+kpat \- KDE patience game
+.SH SYNOPSIS
+.B kpat
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kpat
+is a collection of 14 single-player card games.
+<Insert here>
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kpat
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kpat').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kpoker.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kpoker.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kpoker.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+.TH KPOKER 6
+.SH NAME
+kpoker \- KDE video poker game
+.SH SYNOPSIS
+.B kpoker
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kpoker
+is a KDE compliant clone of those highly addictive pocket video poker
+games which are sometimes called ``Videopoker'' as well.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kpoker
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kpoker').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kreversi.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kreversi.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kreversi.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+.TH KREVERSI 6
+.SH NAME
+kreversi \- Reversi for KDE
+.SH SYNOPSIS
+.B kreversi
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kreversi
+is a simple one player strategy game played against the computer. The
+playing field is an 8 by 8 square board divided into 64 squares. The
+game piece used is a colored stone - one side of it is red, the other
+blue. If a piece is captured by an opposing player, that piece is
+turned to reveal the color of that player. A winner is declared when
+one player has more pieces of his own color on the board and if there
+are no more possible moves.  <Insert here>
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kreversi
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kreversi').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/ksame.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/ksame.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/ksame.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+.TH KSAME 6
+.SH NAME
+ksame \- a little game about balls and how to get rid of them
+.SH SYNOPSIS
+.B ksame
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B ksame
+is a simple game. It is played by one player, so there is only one
+winner. You play for fun and against the high score. It has been
+inspired by SameGame, which is only really famous on the Macintosh.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/ksame
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/ksame').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kshisen.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kshisen.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kshisen.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+.TH KSHISEN 6
+.SH NAME
+kshisen \- Shisen-Sho for KDE
+.SH SYNOPSIS
+.B kshisen
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kshisen
+is a single-player game similar to Mahjongg and uses the same set of
+tiles as Mahjongg. The object of the game is to remove all tiles from
+the field.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kshisen
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kshisen').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/ksirtet.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/ksirtet.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/ksirtet.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH KSIRTET 6
+.SH NAME
+ksirtet \- Tetris game for KDE
+.SH SYNOPSIS
+.B ksirtet
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+This program is a clone of the well known game Tetris. You must fit
+the falling pieces to form full lines.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/ksirtet
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/ksirtet').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/ksmiletris.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/ksmiletris.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/ksmiletris.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+.TH KSMILETRIS 6
+.SH NAME
+ksmiletris \- Tetris like game for KDE
+.SH SYNOPSIS
+.B ksmiletris
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B ksmiletris
+is a game with falling blocks composed of different symbols. The
+object is to guide the blocks so that there are two or more identical
+symbols adjacent vertically.
+.so kdeopt.part

Added: people/jriddell/KDE/3.5/kdegames/debian/man/ksnake.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/ksnake.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/ksnake.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+.TH KSNAKE 6
+.SH NAME
+ksnake \- KDE Snake Race game
+.SH SYNOPSIS
+.B ksnake
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B ksnake
+is a game of speed and agility. You are a hungry snake and are trying
+to eat all the apples in the room before getting out.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/ksnake
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/ksnake').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/ksokoban.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/ksokoban.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/ksokoban.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,35 @@
+.TH KSOKOBAN 6
+.SH NAME
+ksokoban \- The Japanese warehouse keeper game
+.SH SYNOPSIS
+.B ksokoban
+.I [Qt-options] [KDE-options] [file]
+.SH DESCRIPTION
+The first sokoban game was created in 1982 by Hiroyuki Imabayashi at
+the Japanese company Thinking Rabbit, Inc. ``Sokoban'' is Japanese for
+``warehouse keeper''. The idea is that you are a warehouse keeper
+trying to push crates to their proper locations in a warehouse.
+
+The problem is that you cannot pull the crates or step over them. If
+you are not careful, some of the crates can get stuck in wrong places
+and/or block your way.
+
+It can be rather difficult just to solve a level. But if you want to
+make it even harder, you can try to minimise the number of moves
+and/or pushes you use to solve the level.
+
+To make the game more fun for small kids (below 10 years or so), some
+collections with easier levels are also included in
+\fBksokoban\fP. These are marked \fI(easy)\fP in the level collection
+menu. Of course, these levels can be fun for adults too, for example
+if you don't want to expose yourself to too much mental strain.
+.so kdeopt.part
+.SH PROGRAM ARGUMENTS
+.TP
+.I file
+Level collection file to load
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/ksokoban
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/ksokoban').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kspaceduel.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kspaceduel.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kspaceduel.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,20 @@
+.TH KSPACEDUEL 6
+.SH NAME
+kspaceduel \- Arcade two-player space game for KDE
+.SH SYNOPSIS
+.B kspaceduel
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kspaceduel
+is a space arcade game for two players. Each player controls a ship
+that flies around the sun and tries to shoot at the other ship. You
+can play
+.B kspaceduel
+with another person, against the computer, or you can have the
+computer control both ships and play each other.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kspaceduel
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kspaceduel').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/ktron.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/ktron.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/ktron.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,20 @@
+.TH KTRON 6
+.SH NAME
+ktron \- Tron clone for KDE
+.SH SYNOPSIS
+.B ktron
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B ktron
+is a simple Tron-Clone for the K Desktop Environment. You can play
+.B ktron
+against the computer or a friend.
+
+The aim of the game is to live longer than your opponent. To do that,
+avoid running into a wall, your own tail and that of your opponent.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/ktron
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/ktron').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/ktuberling.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/ktuberling.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/ktuberling.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,28 @@
+.TH KTUBERLING 6
+.SH NAME
+ktuberling \- Potato game for kids
+.SH SYNOPSIS
+.B ktuberling
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B ktuberling
+is a game intended for small children. Of course, it may be suitable
+for adults who have remained young at heart.
+
+It is a potato editor. That means you can drag and drop eyes, mouths,
+mustache, and other parts of face and goodies onto a potato-like guy.
+
+There is no winner for the game. The only purpose is to make the
+funniest faces you can.
+
+There is a museum (like a ``Madame Tusseau'' gallery) where you can
+find many funny examples of decorated potatoes. Of course, you can
+send your own creations to the programmer, Eric Bischoff
+(e.bischoff at noos.fr), who will include them in the museum if he gets
+some spare time.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/ktuberling
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/ktuberling').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kwin4.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kwin4.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kwin4.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+.TH KWIN4 6
+.SH NAME
+kwin4 \- Connect Four clone for KDE
+.SH SYNOPSIS
+.B kwin4
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+Four wins is a game for two players.  Each player is represented by a
+color (yellow and red).  The goal of the game is to get four connected
+pieces of your color into a row, column or any diagonal.  This is done
+by placing one of your pieces into any of the seven columns.  A piece
+will begin to fill a column from the bottom, i.e. it will fall down
+until it reaches the ground level or another stone.  After a move is
+done it is the turn of the other player. This is repeated until the
+game is over, i.e. one of the players has four pieces in a row, column
+or diagonal or no more moves are possible because the board is filled.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kwin4
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kwin4').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/kwin4proc.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/kwin4proc.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/kwin4proc.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+.TH KWIN4PROC 6
+.SH NAME
+kwin4proc \- AI backend for kwin4
+.SH DESCRIPTION
+This program is used internally by kwin4. Users should not run it
+directly.
+.SH SEE ALSO
+.BR kwin4 (6).

Added: people/jriddell/KDE/3.5/kdegames/debian/man/lskat.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/lskat.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/lskat.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+.TH LSKAT 6
+.SH NAME
+lskat \- Lieutnant Skat card game for KDE
+.SH SYNOPSIS
+.B lskat
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+Lieutnant skat (from German \fIOffiziersskat\fP) is a card game for
+two players. It is roughly played according to the rules of Skat but
+with only two players and simplified rules.
+
+Every player has a set of cards in front of him/her, half of them
+covered and half of them open. Both players try to win more than 60 of
+the 120 possible points. After 16 moves all cards are played and the
+game ends.
+.so kdeopt.part
+.SH PROGRAM OPTIONS
+.TP
+.B -d, --debug \fI<level>\fB
+Enter debug level.
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/lskat
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/lskat').

Added: people/jriddell/KDE/3.5/kdegames/debian/man/lskatproc.man
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/man/lskatproc.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/man/lskatproc.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+.TH LSKATPROC 6
+.SH NAME
+lskatproc \- AI backend for lskat
+.SH DESCRIPTION
+This program is used internally by lskat. Users should not run it
+directly.
+.SH SEE ALSO
+.BR lskat (6).

Added: people/jriddell/KDE/3.5/kdegames/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/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/kdegames/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdegames/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegames/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,54 @@
+#! /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
+
+export kde_bindir = /usr/games
+
+DEB_KDE_CVS_MAKE := yes
+DEB_KDE_ENABLE_FINAL := yes
+DEB_KDE_APIDOX := yes
+
+DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
+
+post-patches:: debian/stamp-libtool-update
+
+debian/stamp-libtool-update:
+	cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in
+	cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh
+	for f in /usr/share/automake-1.9/*; do \
+		if test -f $$f && ! test -L $$f && \
+			test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
+			cp -f $$f $(DEB_SRCDIR)/admin/; \
+		fi; \
+	done
+	touch debian/stamp-libtool-update
+
+binary-post-install/%::
+# Put full paths to games into desktop files
+	if [ -d debian/$*/usr/share/applications/kde ]; then \
+		find debian/$*/usr/share/applications/kde -name \*.desktop -print | \
+		xargs --no-run-if-empty perl -pi -e 's:^Exec=:Exec=/usr/games/:'; \
+	fi
+
+clean::
+	rm -f debian/stamp-libtool-update
+	rm -f debian/patches/common/02_autotools_update.diff \
+		debian/patches/common/03_libtool_update.diff
+
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
+
+DEB_INSTALL_CHANGELOGS_kdegames := $(DEB_SRCDIR)/ChangeLog
+
+DEB_DH_MAKESHLIBS_ARGS_libkdegames1 := -V'libkdegames1 (>= 4:3.4.0)'
+DEB_DH_MAKESHLIBS_ARGS_atlantik := -V
+DEB_DH_MAKESHLIBS_ARGS_kolf := -V
+
+PACKAGES_WITH_LIBS := libkdegames1 atlantik kolf
+
+# the kmahjongg docs are a useless placeholder
+DOC_HTML_PRUNE := kmahjongg


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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,88 @@
+# -*- 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-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
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif

Added: people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,1130 @@
+kdegraphics (4:3.5.1-0ubuntu2) dapper; urgency=low
+
+  * Add debian/patches/kubuntu_05_poppler.diff.patch:
+    - Do not use the shipped xpdf copy and build against poppler instead.
+  * Ran debian/rules buildprep to make Makefile.am changes effective.
+  * debian/control: Add build dependency libpoppler-dev.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 30 Jan 2006 16:11:32 +0000
+
+kdegraphics (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Add kubuntu_04_kpdf_dont_overwrite_file.diff on advise of upstream
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:06 +0000
+
+kdegraphics (4:3.5.0-0ubuntu4) dapper; urgency=low
+
+  * SECURITY UPDATE: Multiple integer/buffer overflows.
+  * Update kubuntu_04_xpdf_vulnerability.diff
+  * xpdf/Stream.cc, CCITTFaxStream::CCITTFaxStream():
+    - Check columns for negative or large values.
+    - CVE-2005-3624
+  * xpdf/Stream.cc, numComps checks introduced in CVE-2005-3191 patch:
+    - Reset numComps to 0 since it's a global variable that is used later.
+    - CVE-2005-3627
+  * xpdf/Stream.cc, DCTStream::readHuffmanTables():
+    - Fix out of bounds array access in Huffman tables.
+    - CVE-2005-3627
+  * xpdf/Stream.cc, DCTStream::readMarker():
+    - Check for EOF in while loop to prevent endless loops.
+    - CVE-2005-3625
+  * xpdf/JBIG2Stream.cc, JBIG2Bitmap::JBIG2Bitmap(), JBIG2Bitmap::expand(),
+    JBIG2Stream::readHalftoneRegionSeg():
+    - Check user supplied width and height against invalid values.
+    - Allocate one extra byte to prevent out of bounds access in combine().
+    - CVE-2005-3628
+  * References:
+      CVE-2005-3626
+      CESA-2005-003
+      http://www.kde.org/info/security/advisory-20051207-2.txt
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun,  8 Jan 2006 23:15:49 +0000
+
+kdegraphics (4:3.5.0-0ubuntu3) dapper; urgency=low
+
+  * SECURITY UPDATE: Multiple integer/buffer overflows.
+  * Update kubuntu_04_xpdf_vulnerability.diff
+  * xpdf/Stream.cc, DCTStream::readBaselineSOF(),
+    DCTStream::readProgressiveSOF(), DCTStream::readScanInfo():
+    - Check numComps for invalid values.
+    - http://www.idefense.com/application/poi/display?id=342&type=vulnerabilities
+    - CVE-2005-3191
+  * xpdf/Stream.cc, StreamPredictor::StreamPredictor():
+    - Check rowBytes for invalid values.
+    - http://www.idefense.com/application/poi/display?id=344&type=vulnerabilities
+    - CVE-2005-3192
+  * xpdf/JPXStream.cc, JPXStream::readCodestream():
+    - Check img.nXTiles * img.nYTiles * sizeof for integer overflow.
+    - http://www.idefense.com/application/poi/display?id=345&type=vulnerabilities
+    - CVE-2005-3193
+  * Add kubuntu_05_kpovmodeller_save_file.diff from upstream authors,
+    allow saving files in KPovModeller
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  9 Dec 2005 15:52:09 +0000
+
+kdegraphics (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * SECURITY UPDATE: kpdf/xpdf multiple integer overflows
+  * kpdf, the KDE pdf viewer, shares code with xpdf. xpdf contains
+    multiple integer overflow vulnerabilities that allow specially
+    crafted pdf files, when opened, to overflow a heap allocated
+    buffer and execute arbitrary code. 
+  * Add kubuntu_04_xpdf_vulnerability.diff
+  * References:
+    http://www.kde.org/info/security/advisory-20051207-1.txt
+    CAN-2005-3191
+    CAN-2005-3192
+    CAN-2005-3193
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  8 Dec 2005 00:13:23 +0000
+
+kdegraphics (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:28:08 +0000
+
+kdegraphics (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 20:07:45 +0000
+
+kdegraphics (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 16:42:18 +0000
+
+kdegraphics (4:3.5-rc1-1) alioth; urgency=low
+
+  * New upstream pre-release.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+   - Includes a build fix for ksvg. (Closes: #338142)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 12 Nov 2005 12:40:23 -0400
+
+kdegraphics (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Add ocrad to kooka's Recommends.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Oct 2005 13:44:50 -0400
+
+kdegraphics (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Use gcc-3.4 on arm, m68k and hppa, where gcc-4.0 ICEs.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 16 Sep 2005 15:18:03 +0200
+
+kdegraphics (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+    - kpdf temp file writing DoS vulnerability, closes: #322458
+    - FTBFS in amd64 with gcc4, closes: #287007
+
+  +++ Changes by Christopher Martin:
+
+  * Remove 07_xlibs-static-pic.diff and the xlibs-static-pic build-dependency,
+    and add a build-dependency on libxxf86vm-dev, for the X.Org transition.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Aug 2005 13:30:37 +0200
+
+kdegraphics (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
+
+kdegraphics (4:3.4.3-0ubuntu2) breezy; urgency=low
+
+  * Fix kview.install for libphotobook move
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun,  9 Oct 2005 13:21:50 +0100
+
+kdegraphics (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build with GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  7 Oct 2005 18:13:46 +0000
+
+kdegraphics (4:3.4.2-0ubuntu2) breezy; urgency=low
+
+  * Rebuild to get proper libgl/libglu shlibs dependencies.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Thu, 25 Aug 2005 00:10:12 +1000
+
+kdegraphics (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:25:01 +0000
+
+kdegraphics (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number due to KDE 3.4.1 release
+  * Move remove xpdf-utils depend on kpdf, add as 
+    suggests on kdegraphics-kfile-plugins
+  * Add all packages back to meta package
+
+ -- Jonathan Riddell <jr at jriddell.org>  Tue, 31 May 2005 16:33:00 +0000
+
+kdegraphics (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
+
+  * Remove build-dep on xpdf-utils, add as dependency for kpdf
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 26 May 2005 12:26:34 +0000
+
+kdegraphics (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+
+  * Sync with Debian
+  * Change kubuntu_03_kmenu_tidy_kghostview.diff to use NoDisplay
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 25 May 2005 11:14:53 +0000
+
+kdegraphics (4:3.4.0-0ubuntu3) hoary; urgency=low
+
+  * Add kubuntu_03_kmenu_tidy_kghostview.diff to hide kghostview from menu
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  6 Apr 2005 03:14:25 +0100
+
+kdegraphics (4:3.4.0-0ubuntu2) hoary; urgency=low
+
+  * Add kubuntu_02_kmenu_tidy.diff to move ksnapshot up a level.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 17 Mar 2005 00:54:22 +0000
+
+kdegraphics (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * Remove kcoloredit, kfax, kfaxview, kpovmodeler, kiconedit, kruler depends from kdegraphics.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 16 Mar 2005 22:12:12 +0000
+
+kdegraphics (4:3.4.0-0pre1ubuntu3) hoary; urgency=low
+
+  * Build-Depend on imlib1-dev, not libimlib2-dev
+
+ -- Matt Zimmerman <mdz at ubuntu.com>  Tue,  8 Mar 2005 06:09:32 -0800
+
+kdegraphics (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
+
+  * Add patch kubuntu_01_Xxf86vm.diff to link to libXxf86vm
+  * Use imlib2 instead of imlib11
+
+ -- Jonathan Riddell <jr at jriddell.org>  Tue,  8 Mar 2005 11:31:15 +0000
+
+kdegraphics (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+  * Ubuntu build
+  * Remove kview from kdegraphics dependency
+  * Disable DRM in KPDF
+
+ -- Jonathan Riddell <jr at jriddell.org>  Sun,  6 Mar 2005 02:43:48 +0000
+
+kdegraphics (4:3.4.0-0pre1) alioth; urgency=low
+
+  * New upstream release.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+    - no longer FTBFS on amd64/gcc-4.0. (Closes: #287007)
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Switch to CDBS for packaging.
+
+  * [cdbs/kde.mk] Don't compress *.el files. (Closes: #296847)
+
+  * Removed patches (applied upstream):
+    - 11_ksvgplugin-bump-preference.diff
+
+  * 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 kdegraphics-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,  3 Mar 2005 03:33:15 +0100
+
+kdegraphics (4:3.3.2-2) unstable; urgency=medium
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update. This includes a small but important patch to
+    kpdf's xpdf code. Fully resolves CAN-2005-0064, a buffer overflow
+    vulnerability. Urgency=medium as this is release critical.
+    (Closes: #303238)
+
+  * Add GFDL to debian/copyright.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 14 Apr 2005 22:55:13 +0200
+
+kdegraphics (4:3.3.2-1ubuntu4) hoary; urgency=low
+
+  * removed kuickshow and replaced it with gwenview
+  * linian cleanup
+
+ -- Andreas Mueller <amu at ubuntu.com>  Wed, 16 Feb 2005 01:21:21 +0100
+
+kdegraphics (4:3.3.2-1ubuntu3) hoary; urgency=low
+
+  * Patched for CAN-2005-0064: kpdf Buffer Overflow Vulnerability
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 19 Jan 2005 16:45:49 +0000
+
+kdegraphics (4:3.3.2-1ubuntu2) hoary; urgency=low
+
+  * Fix build-dep on automake1.9
+  * Add --install-missing to dh_install
+  * Patched for CAN-2004-1125: kpdf Buffer Overflow Vulnerability
+
+ -- Andreas Mueller <amu at canonical.com>  Wed, 29 Dec 2004 04:13:02 +0000
+
+kdegraphics (4:3.3.2-0ubuntu1) hoary; urgency=low
+
+  * New upstream release
+  * Removed patches:
+    - 01_kdegraphics_branch.diff.uu
+    - 02_autotools_update.diff
+    - 05_pedantic-errors.diff
+    - 07_xlibs-static-pic.diff
+  * Don't run cvs-clean.pl if debian/patches exists
+
+ -- Jonathan Riddell <jr at jriddell.org>  Tue, 28 Dec 2004 20:23:29 +0000
+
+kdegraphics (4:3.3.2-1) unstable; urgency=high
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Apply patch for the latest kpdf vulnerability (CAN-2005-0064).
+    URL: http://www.kde.org/info/security/advisory-20050119-1.txt
+    (Closes: #291251)
+
+  * Update package description for several packages, provided by JesÃºs
+    Roncero, thanks! These are: kolourpaint, kgamma, kooka, kpovmodeler,
+    kuickshow. (Closes: #286891, #286892, #286893, #286894, #286895, #286881)
+
+  * Correct typo in kamera's description. (Closes: #291139)
+
+  +++ 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:
+
+  * Remove libgtk1.2-dev from Build-Depends.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 19 Jan 2005 19:31:25 +0100
+
+kdegraphics (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+    - kfax prints correctly multipage tiff files. (Closes: #288754)
+  * KDE_3_3_BRANCH update.
+  * Remove build-dependency on automake1.9.
+  * Tightened build-dep on libsane-dev to >> 1.0.15. (Closes: #270488)
+  * Updated kfax package description. (Closes: #280563)
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Make konqueror capable of displaying SVG images out-of-the-box, without
+    need of tweaking with mime types in the Control Center (closes: #260201):
+    - this is a workaround until bugs.kde.org/74457 gets fixed.
+    - services/ksvgplugin.desktop: give InitialPreference=11.
+    - added mimelnk/image/svg-xml.desktop since some sites use that mimetype
+      instead of image/svg+xml.
+
+  * debian/control:
+    - make kpdf Provide: pdf-viewer.
+    - version Build-Dependency on libexif-dev to (>= 0.6.9-1), just in case,
+      acknowledging NMU from Steve Langasek. (Closes: #268966)
+
+  * debian/patches:
+    - added new patch 10_correct-nedit-invocation.diff, to invoke NEdit with
+      the proper binary name on Debian systems. (Closes: #274035)
+
+ -- Christopher Martin <chrsmrtn at freeshell.org>  Sun, 19 Dec 2004 20:14:10 -0500
+
+kdegraphics (4:3.3.1-2) unstable; urgency=high
+
+  * Upload to fix security vulnerability "kpdf Buffer Overflow Vulnerability".
+    As per CAN-2004-1125, the xpdf codebase contains a buffer overflow that
+    can be triggered by a specially crafted PDF file, and remotely supplied
+    pdf files could be used to execute arbitrary code on the client machine.
+
+ -- Adeodato SimÃ³ <asp16 at alu.ua.es>  Thu, 23 Dec 2004 08:35:23 +0100
+
+kdegraphics (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+    - CAN-2004-0888: arbitrary code execution (Closes: #278173)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri,  5 Nov 2004 01:00:00 -0600
+
+kdegraphics (4:3.3.0-2) unstable; urgency=low
+
+  * KDE_3_3_BRANCH update.
+  * kpdf Recommends: kghostview. (Closes: #268479)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sun, 26 Sep 2004 01:00:00 -0500
+
+kdegraphics (4:3.3.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild against new libopenexr2. (Closes: #266505)
+
+ -- Andrew Lau <netsnipe at users.sourceforge.net>  Sat, 28 Aug 2004 00:57:16 +1000
+
+kdegraphics (4:3.3.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat, 14 Aug 2004 04:30:00 -0500
+
+kdegraphics (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * Update kpovmodeler Debian menu entry. (Closes: #246203)
+  * Update kdvi Debian menu entry. (Closes: #246210)
+  * Rebuild against new libexif10. (Closes: #255709, #257690, #261158)
+  * Added kpdf Debian mime entry. (Closes: #260731)
+  * Build-Depends: xlibs-static-pic. (Closes: #260962)
+  * Build-Depends: libtiff4-dev. (Closes: #262591, #262853)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue,  3 Aug 2004 18:00:00 -0500
+
+kdegraphics (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added dh_compress -X.sty (Closes: #238812)
+  * debian/*.menu: remove the obsolete kderemove tag.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 13 Apr 2004 19:00:00 -0500
+
+kdegraphics (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri,  5 Mar 2004 22:00:00 -0600
+
+kdegraphics (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstrem release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Thu, 19 Feb 2004 00:00:00 -0600
+
+kdegraphics (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat, 24 Jan 2004 21:00:00 -0600
+
+kdegraphics (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added libtool arm patch.
+  * Removed kiconedit enum patch, see #225663.
+  * Moved libkscan.la from libkscan-dev into libkscan1 since the KDE scan
+    service uses it for module loading.
+  * libkscan1-dev Depends kdelibs4-dev.
+  * kdvi lower mime priority. (Closes: #139990)
+  * kooka Recommends gocr. (Closes: #146628)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 13 Jan 2004 14:00:00 -0600
+
+kdegraphics (4:3.1.4-2) unstable; urgency=low
+
+  * Corrected kdegraphics Description indention. (Closes: #226601)
+  * Added patch to work with new freetype version.
+  * Added patch from CVS HEAD for kiconedit enum issue with --enable-final.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed,  7 Jan 2004 17:00:00 -0600
+
+kdegraphics (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added patch to update autotools files.
+    Cannot update libtool at this time due it causing build breakage.
+  * 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>  Fri, 17 Oct 2003 18:00:00 -0500
+
+kdegraphics (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri,  1 Aug 2003 16:00:00 -0500
+
+kdegraphics (4:3.1.2-1.1) unstable; urgency=low
+
+  * NMU.
+  * Build-depends on imlib11-dev instead of imlib-dev. (Closes: #196009).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 18 Jul 2003 16:28:56 +0200
+
+kdegraphics (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 23 May 2003 02:00:00 -0500
+
+kdegraphics (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add 'chmod +x configure' to rules. (Closes: #181352)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed, 12 Mar 2003 11:00:00 -0600
+
+kdegraphics (4:3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rebuilt debian dir.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 04 Feb 2003 01:00:00 -0600
+
+kdegraphics (4:2.2.2-6.11) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patch so ghostscript won't execute arbitrary commands
+    hidden inside of postscript files.
+
+ -- Martin Schulze <joey at infodrom.org>  Thu, 10 Apr 2003 11:59:28 +0200
+
+kdegraphics (4:2.2.2-6.10) 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>  Mon,  6 Jan 2003 07:41:24 +0100
+
+kdegraphics (4:2.2.2-6.9) unstable; urgency=high
+
+  * Rebuilt for unstable
+
+ -- Martin Schulze <joey at infodrom.org>  Mon, 21 Oct 2002 17:25:59 +0200
+
+kdegraphics (4:2.2.2-6.8) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Looks like I missed one more occurrence of sscanf().  Thanks to Dirk
+    Mueller of KDE.
+
+ -- Martin Schulze <joey at infodrom.org>  Thu, 17 Oct 2002 09:49:11 +0200
+
+kdegraphics (4:2.2.2-6.7) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Include security patch from Olaf Kirch to fix buffer overflows in
+    kghostview that includes secscanf.c
+  * Add 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>  Tue, 15 Oct 2002 15:24:40 +0200
+
+kdegraphics (4:2.2.2-6.6) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Include security patch from Olaf Kirch to fix buffer overflows in
+    kghostview that includes secscanf.c
+  * Added kghostview/secscanf.c as a personal exception to the cvs-clean
+    target so our newly added source file is not removed this fast
+
+ -- Martin Schulze <joey at infodrom.org>  Mon, 14 Oct 2002 19:49:18 +0200
+
+kdegraphics (4:2.2.2-6.5) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied security patch from Olaf Kirch to fix buffer overflows in
+    kghostview including secscanf.c
+
+ -- Martin Schulze <joey at infodrom.org>  Mon, 14 Oct 2002 12:16:53 +0200
+
+kdegraphics (4:2.2.2-6.4) unstable; urgency=high
+
+  * NMU
+  * Fix kamera.h so that we build on all archs...hopefully
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 17 Mar 2002 16:45:00 -0700
+
+kdegraphics (4:2.2.2-6.3) unstable; urgency=high
+
+  * NMU
+  * Not so anal on build-deps
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 14 Mar 2002 00:15:00 -0700
+
+kdegraphics (4:2.2.2-6.2) unstable; urgency=high
+
+  * NMU
+  * Don't build-depend on libsane-dev for hppa and also don't build any of 
+    the scanner on hppa as sane doesn't currently build on hppa.
+  * Fix documentation links (Closes: #136429, #136421, #136420)
+  * Add kooka russian debconf template (Closes: #137665)
+  * No more missing symbol (Closes: #134135)
+  * Fix kghostview startup (Closes: #127736)
+  * Fix x-dvi registration (Closes: #129207)
+  * Re-add kdvi to kview (Closes: #126241)
+  * Add Build-Depend for libusb-dev as libkscan seems to need it now...
+  * Add Build-Depend for libexif-dev as gphoto2-dev doesn't depend on it
+  * Not missing anything (Closes: #131655)
+  * Fix kamera build (Closes: #137905)
+  * Change Maintainer to: Christopher L Cheney <ccheney at debian.org> since
+    he's taking over from Daniel.  Both are cool with this to boot.
+    and I said I wasn't going to touch any kde stuff...geesh!
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 11 Mar 2002 12:46:00 -0700
+
+kdegraphics (4:2.2.2-6) unstable; urgency=low
+
+  * The "muzak-Christmas-carols-suck" release.
+    Alternately, the "I'm-under-peer-pressure-to-give-this-a-name" release,
+    or the "no-notice-NMUs-suck-donkey-balls" release (hi lamont!).
+  * Acknowledge lamont's NMU. (closes: #125871, #125956)
+  * kamera/kioslave/kamera.cpp:
+    - Apply patch to fix dodgy Canon camera drivers. (closes: #125873).
+  * debian/rules:
+    - Build with a different builddir to srcdir, thanks to Eray Ozkural.
+      kdvi still doesn't build, though. 
+    - While I'm at it, make sure index.cache.bz2 and any other excess crap is
+      removed.
+  * Here's a few fixed bugs, merry Christmas. I could well be out of contact
+    for some time, depending on my sister fixing my machine or not. If she
+    doesn't, feel free to NMU my packages if *needed*. (Building on
+    danish's machine now).
+
+ -- Daniel Stone <daniel at sfarc.net>  Sun, 23 Dec 2001 10:37:39 -0500
+
+kdegraphics (4:2.2.2-5.1) unstable; urgency=low
+
+  * NMU
+  * Add Replaces: kview (<<4:2.2.2-5) to kfract.  Closes: #125871.
+  * Add docbook-to-man to build-depends.
+
+ -- LaMont Jones <lamont at security.hp.com>  Sat, 22 Dec 2001 19:41:59 -0700
+
+kdegraphics (4:2.2.2-5) unstable; urgency=low
+
+  * CVS resync. (Taken at 9-12-21, 23:21 - UTC+11).
+    - New repository - my /var/cvs. Sorry.
+  * New maintainer. (closes: #114108) 
+  * Rebuild with latest sid stuff. hopefully (closes: #123029)
+  * debian/{kfax,kview,ksnapshot,kruler,kpaint,kooka,kiconedit,
+    kghostview,kfract,kcolorchooser,kcoloredit,kviewshell}.sgml:
+    - Wrote new manpages. (closes: #100389)
+  * debian/kview.menu:
+    - Added "Images" menu hint. (closes: #121034)
+  * debian/kghostview.menu:
+    - Added "Documents" menu hint. (closes: #121031)
+  * debian/rules, debian/control, etc:
+    - Stopped building kdvi. For some bizzare reason, it randomly refused to
+    build; it looks like it's fine building the once, but then after that,
+    just refuses to build. This could cause random problems on autobuilders.
+    *sigh*
+  * debian/control:
+    - Spelling updates. (closes: #124776, #124841, #124992)
+
+ -- Daniel Stone <daniel at sfarc.net>  Fri, 30 Nov 2001 21:51:05 +1100
+
+kdegraphics (4:2.2.2-4.1) unstable; urgency=low
+
+  * Ok..so I fixed kamera...it builds fine on i386...but doesn't on non-i386
+    systems.  dig dig dig..ahhh..not linking to gphoto2_port.. (Closes: #121897)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 01 Dec 2001 01:17:00 -0700
+
+kdegraphics (4:2.2.2-4) unstable; urgency=low
+
+  * fix kamera after breaking it last time
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 30 Nov 2001 00:10:00 -0700
+
+kdegraphics (4:2.2.2-3) unstable; urgency=low
+
+  * Sync with upstream
+  * More build cleanup/fixes
+  * Build-dep/dep/etc cleanup
+  * Update documentation for freeze
+  * Fix kamera desktop file...
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 29 Nov 2001 04:23:00 -0700
+
+kdegraphics (4:2.2.2-2) unstable; urgency=low
+
+  * Let's get kamera to  work
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 27 Nov 2001 03:02:00 -0700
+
+kdegraphics (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version
+  * Don't build kamera as it doesn't build. :)  (Closes: #119813)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 21 Nov 2001 12:18:00 -0700
+
+kdegraphics (4:2.2.1.0-2) unstable; urgency=low
+
+  * Fix configure
+  * Add missing build-dep
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 05 Oct 2001 12:18:00 -0700
+
+kdegraphics (4:2.2.1.0-1) unstable; urgency=low
+
+  * Provide kamera package now that libgpio is available
+  * build with automake 1.5 maybe
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 01 Oct 2001 22:17:00 -0700
+
+kdegraphics (4:2.2.1-1) unstable; urgency=low
+ 
+  * New upstream version 2.2.1
+  * Change maintainer
+  * Lintian error cleanup
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 25 Aug 2001 14:38:00 -0700
+
+kdegraphics (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
+
+kdegraphics (4:2.2.0-0.1beta1-2) unstable; urgency=low
+ 
+  * grr...get rid of that ^H so it'll build on alpha and others
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 27 Jul 2001 23:00:00 -0700
+
+kdegraphics (4:2.2.0-0.1beta1-1) unstable; urgency=low
+ 
+  * sync with upstream
+  * more alpha build fixes
+  * gcc3 build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 27 Jul 2001 02:02:00 -0700
+
+kdegraphics (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * sync with upstream
+  * More alpha build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 07 Jul 2001 03:42:00 -0700
+
+kdegraphics (4:2.2.0-0beta1-2) unstable; urgency=low
+ 
+  * sync with upstream
+  * Autobuild for alpha
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 03 Jul 2001 02:20:00 -0700
+
+kdegraphics (4:2.2.0-0beta1-1) unstable; urgency=low
+ 
+  * sync with upstream
+  * add translation (Closes: #102889)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 30 Jun 2001 19:06:00 -0700
+
+kdegraphics (4:2.2-cvs20010622-1) unstable; urgency=low
+ 
+  * New upstream cvs pull
+  * 2.2 beta1
+  * Add in Enhances: tags
+  * Update build-depends:  add libsane-dev for kooka and libkscan
+  * Update standards version
+  * cleanup menu entries
+  * New packages: libkscan1 and libkscan-dev
+  * Add menu entry for kpixmap2bitmap
+  * Update description (Closes: #93819)
+  * Fix anchors problems (Closes: #101188)
+  * pixie, minimagick and kpixmap2bitmap bits were removed
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
+
+kdegraphics (4:2.1.1-2) unstable; urgency=low
+  
+  * Update menu bits to include new kde menu removal tag
+  * a couple upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 08 Apr 2001 17:32:00 -0700
+
+kdegraphics (4:2.1.1-1.0.1) unstable; urgency=low
+ 
+  * Building with older libc
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 26 Mar 2001 17:00:00 -0700
+
+kdegraphics (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Mar 2001 23:11:00 -0700
+
+kdegraphics (4:2.1.0-1) unstable; urgency=low
+ 
+  * New upstream CVS pull
+  * Updating shlibs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 07 Mar 2001 23:11:00 -0700
+
+kdegraphics (4:2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Upping standards version
+  * Adding in provides for pdf-viewer and postscript-viewer for 
+    kghostview (Closes: #85329)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdegraphics (4:2.1-beta2-2) unstable; urgency=low
+ 
+  * Adding missing gs dependency for kghostview
+  * Building with --disable-debug
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 26 Jan 2001 02:31:00 -0700
+
+kdegraphics (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
+
+kdegraphics (4:2.1-20010115-1) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
+
+kdegraphics (4:2.1-20010109-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * breaking out kruler, kpaint and kiconedit into their own package
+  * fixing libminimagick-dev's file inclusion
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 09 Jan 2001 13:14:00 -0700
+
+kdegraphics (4:2.1-20010101-1) unstable; urgency=low
+ 
+  * More upstream fixes
+      
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 01 Jan 2001 17:15:00 -0700
+       
+kdegraphics (4:2.1-20001218-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in missing conflicts for kdegraphics
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Dec 2000 23:50:00 -0700
+
+kdegraphics (4:2.1-20001213-1) unstable; urgency=low
+ 
+  * New upstream cvs version
+  * Fixing build-depends (Closes: #79473)
+  * Pixie is back
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 13 Dec 2000 18:00:00 -0700
+
+kdegraphics (4:2.0-final-7) unstable; urgency=low
+ 
+  * Fixing task package and libminimagic-dev
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 22 Nov 2000 05:25:00 -0700
+
+kdegraphics (4:2.0-final-6) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing shlibs files
+  * Major cleanup of build rules
+  * build-depends fixes for non x4 ports
+  * adding in lintian overrides if any
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 21 Nov 2000 09:15:00 -0700
+
+kdegraphics (4:2.0-final-5) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More dependency fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 18 Nov 2000 06:30:00 -0700
+
+kdegraphics (4:2.0-final-4.1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in replaces for pixie
+  * Adding in provides for postscript-viewer
+  * Fixing priorities of mime types
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 10 Nov 2000 13:30:00 -0700
+
+kdegraphics (4:2.0-final-4) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in menu hints
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
+                                                                                
+kdegraphics (4:2.0-final-3.1) unstable; urgency=low
+ 
+  * Fixing kview's bmp mime entry (Closes: #72831)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 07 Nov 2000 00:30:00 -0700
+                                                                                
+kdegraphics (4:2.0-final-3) unstable; urgency=low
+ 
+  * More upstream fixes
+  * building against new xlibs
+  * more mime work
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
+                                                                                
+kdegraphics (4:2.0-final-2) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing mime entries
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
+                                                                                
+kdegraphics (4:2.0-final-0) unstable; urgency=low
+ 
+  * KDE 2.0
+  * pixie no longer provided
+  * providing seperate libminimagick package as well as a kpixmap2bitmap 
+    package.  Changing kdegraphics-dev to libminimagick-dev
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
+                                                                                
+kdegraphics (4:2.0-20001016-0) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
+
+kdegraphics (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
+                                                                                
+kdegraphics (4:2.0-20001006-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 06 Oct 2000 18:00:00 -0700
+                                                                                
+kdegraphics (4:2.0-20001005-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Compiling once again against non-versioned kdelibs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
+                                                                                
+kdegraphics (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
+                                                                                
+kdegraphics (4:2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Updating build-depends
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdegraphics (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Breaking up kdegraphics into individual packages
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
+
+kdegraphics (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Sep 2000 22:00:00 -0700      
+
+kdegraphics (4:2.0-20000912-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 12 Sep 2000 22:00:00 -0700
+
+kdegraphics (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
+
+kdegraphics (4:2.0-20000901-0) unstable; urgency=low
+
+  * More upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
+
+kdegraphics (4:2.0-20000827-0) experimental; urgency=low
+ 
+  * More upstream fixes
+  * Merging package updates into CVS
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 27 Aug 2000 19:30:00 -0700
+                                                                               
+kdegraphics (4:2.0-20000825-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
+
+kdegraphics (4:2.0-20000820-1.0) experimental; urgency=low
+ 
+  * new beta version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 20 Aug 2000 09:45:00 -0700
+
+kdegraphics (4:2.0-20000524-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 24 May 2000 04:15:37 -0700
+                                                                                
+kdegraphics-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 21 May 2000 02:15:37 -0700
+
+kdegraphics-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+
+  * new cvs version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 12 May 2000 22:00:37 -0700
+
+kdegraphics-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 08 Mar 2000 22:00:37 -0700
+
+kdegraphics-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+
+  * new cvs version
+  * Adding in build-depends
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 29 Feb 2000 22:00:37 -0700
+
+kdegraphics-cvs (4:2.0-19991201-1.0) experimental; urgency=low
+
+  * new cvs version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 01 Dec 1999 03:00:37 -0400
+
+kdegraphics-cvs (4:2.0-19991001-1) experimental; urgency=low
+
+  * new cvs version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Oct 1999 03:30:37 -0400
+
+kdegraphics-cvs (4:2.0-19990825-1) experimental; urgency=low
+
+  * new version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 25 Aug 1999 08:21:37 -0400
+
+kdegraphics-cvs (4:2.0-19990626-1) experimental; urgency=low
+
+  * new version
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 27 Jun 1999 20:21:37 +0200
+
+kdegraphics-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * migrating out of /opt to /
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 24 May 1999 07:30:09 -0400
+
+kdegraphics (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo at kde.org>  Wed, 17 Feb 1999 19:09:42 +0100
+
+kdegraphics (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:45 +0100
+
+kdegraphics (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
+
+kdegraphics (2:980710-1.0-1) unstable; urgency=low
+
+  * new upstream version 1.0
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 12 Jul 1998 10:12:19 +0200
+
+kdegraphics (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 19 Apr 1998 17:29:21 +0200
+
+kdegraphics (2:980312-3) frozen; urgency=low
+
+  * add man page for undocumented
+  * compile with fixed kdelibs. This time from CVS
+  * use debhelper now
+
+ -- Stephan Kulow <coolo at kde.org>  Fri,  3 Apr 1998 19:39:55 +0200
+
+kdegraphics (2:980312-2) frozen; urgency=low
+
+  * new compile cycle with qt-1.33 and libstdc++-2.8
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 24 Mar 1998 21:05:12 +0100
+
+kdegraphics (2:980312-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo at kde.org>  Fri, 13 Mar 1998 00:04:55 +0100
+
+kdegraphics (2:980310-2) unstable; urgency=low
+
+  * added the call to kderules
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 10 Mar 1998 21:28:05 +0100
+
+kdegraphics (2:980310-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/kdegraphics/debian/compat
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/compat	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/compat	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+4

Added: people/jriddell/KDE/3.5/kdegraphics/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,380 @@
+Source: kdegraphics
+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 net.com.org.es>, 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.0), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.1), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, libxxf86vm-dev, libpoppler-dev (>= 0.5)
+Standards-Version: 3.6.2
+
+Package: kdegraphics
+Section: kde
+Architecture: all
+Depends: kamera (>= ${Source-Version}), kcoloredit (>= ${Source-Version}), kdegraphics-kfile-plugins (>= ${Source-Version}), kdvi (>= ${Source-Version}), kfax (>= ${Source-Version}), kfaxview (>= ${Source-Version}), kgamma (>= ${Source-Version}), kghostview (>= ${Source-Version}), kiconedit (>= ${Source-Version}), kmrml (>= ${Source-Version}), kolourpaint (>= ${Source-Version}), kooka (>= ${Source-Version}), kpdf (>= ${Source-Version}), kpovmodeler (>= ${Source-Version}), kruler (>= ${Source-Version}), ksnapshot (>= ${Source-Version}), ksvg (>= ${Source-Version}), kuickshow (>= ${Source-Version}), kview (>= ${Source-Version}), kviewshell (>= ${Source-Version}), libkscan1 (>= ${Source-Version})
+Suggests: kdegraphics-doc-html (>= ${Source-Version})
+Description: graphics apps 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 graphics applications
+ provided with the official release of KDE.
+
+Package: kdegraphics-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdebase
+Description: KDE graphics 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 graphics 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/kamera/. Documentation is provided for most
+ KDE graphics packages.
+ .
+ This package is part of KDE, and a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kamera
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: digital camera io_slave for Konqueror
+ This is a digital camera io_slave for KDE which uses gphoto2 and libgpio
+ to allow access to your camera's pictures with the URL camera:/
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kcoloredit
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a color palette editor and color picker for KDE
+ This package contains two programs, a color palette editor and also a color
+ picker.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kdegraphics-dev
+Section: devel
+Architecture: any
+Depends: kghostview (= ${Source-Version}), kmrml (= ${Source-Version}), kpovmodeler (= ${Source-Version}), ksvg (= ${Source-Version}), kuickshow (= ${Source-Version}), kview (= ${Source-Version}), kviewshell (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.0)
+Description: development files for the KDE graphics module
+ This package contains headers and other development files for the KDE
+ graphics module.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kdegraphics-kfile-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE metainfo plugins for graphic files
+ This packages provides meta information for graphic files (file sizes,
+ tags, etc. all from within the file manager).
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kdvi
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: tetex-bin
+Suggests: khelpcenter
+Replaces: kdebase-data (<< 4:3.3.91)
+Description: dvi viewer for KDE
+ This program and KPart allow the user to display *.DVI files from TeX.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kfax
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}, libtiff-tools
+Description: G3/G4 fax viewer for KDE
+ A fax viewer for KDE, supporting the display of raw and tiffed fax images
+ (g3, g3-2d, g4).
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kfaxview
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: G3/G4 fax viewer for KDE using kviewshell
+ A fax viewer for KDE, supporting the display of raw and tiffed fax images
+ (g3, g3-2d, g4).
+ .
+ This faxviewer uses kviewshell and is intended to replace the standalone
+ kfax application once it reproduces all of kfax's features.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kgamma
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: gamma correction module for the KDE Control Center
+ KGamma is a KDE Control Center module for gamma calibration/correction
+ of XFree86. With proper gamma settings, your display (websites, images,
+ etc.) will look the same on your monitor as on other monitors.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+ .
+ Homepage: http://kgamma.berlios.de/index2.php
+
+Package: kghostview
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}, gs
+Suggests: khelpcenter
+Provides: postscript-viewer, pdf-viewer
+Description: PostScript viewer for KDE
+ KGhostview is KDE's PostScript viewer. It is a port of Tim Theisen's
+ Ghostview program which is used to view documents prepared in Adobe's
+ PostScript page description language. PostScript is the major page
+ description language for printing on UNIX systems, and this application is
+ useful to preview material intended for printing, or for reading documents
+ online.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kiconedit
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: an icon editor for KDE
+ KIconedit allows you easily to create and edit icons.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kmrml
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: a Konqueror plugin for searching pictures
+ MRML is short for Multimedia Retrieval Markup Language, which defines a
+ protocol for querying a server for images based on their content. See 
+ http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an 
+ MRML server.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kolourpaint
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a simple paint program for KDE
+ KolourPaint is a very simple paint program for KDE. It aims to be
+ conceptually simple to understand; providing a level of functionality
+ targeted towards the average user. It's designed for daily tasks like:
+ .
+  * Painting - drawing diagrams and "finger painting" 
+  * Image Manipulation - editing screenshots and photos; applying effects 
+  * Icon Editing - drawing clipart and logos with transparency 
+ .
+ It's not an unusable and monolithic program where simple tasks like
+ drawing lines become near impossible. Nor is it so simple that it lacks
+ essential features like Undo/Redo.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+ .
+ Homepage: http://kolourpaint.sourceforge.net
+
+Package: kooka
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: ocrad | gocr
+Suggests: khelpcenter
+Description: scanner program for KDE
+ Kooka is an open source GNU/Linux scan program based on SANE and
+ KScan library.
+ .
+ Kooka helps you to handle the most important scan parameters, find the
+ correct image file format to save and manage your scanned images. It
+ offers support for different OCR modules. Libkscan, a autonomous part
+ of Kooka, provides a scan service for easy and consistent use to all
+ KDE applications.
+ .
+ Install ocrad or gocr if you wish to enable optical character recognition
+ in kooka.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+ .
+ Homepage: http://www.kde.org/apps/kooka
+
+Package: kpdf
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: kghostview (= ${Source-Version})
+Suggests: khelpcenter
+Provides: pdf-viewer
+Description: PDF viewer for KDE
+ KPDF allows you to view PDF (Portable Document Format) files. This package
+ includes kpdfpart so you can embed in konqueror or run as a standalone
+ application.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kpovmodeler
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter, povray
+Description: a graphical editor for povray scenes
+ KPovmodeler is KDE's graphical editor for povray scenes. KPovModeler is a
+ modeling and composition program for creating POV-Ray scenes in KDE.
+ .
+ For most modelers, POV-Ray is nothing but a rendering engin. This greatly
+ limits the innate possibilities of the POV-Ray scripted language. This
+ is not the case for KPovModeler, which allows you to use all the features
+ of POV-Ray through the translation of POV-Ray language into a graphical
+ tree.
+ .
+ kpovmodeler uses the povray package, currently available only in Debian's
+ non-free, unsupported repository.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+ .
+ Homepage: http://www.kpovmodeler.org
+
+Package: kruler
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a screen ruler and color measurement tool for KDE
+ Kruler is a screen ruler (supporting inches, centimeters, and pixels) and
+ color measurement tool for KDE.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: ksnapshot
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase-data (<< 4:3.3.91)
+Description: screenshot utility for KDE
+ KSnapshot is a simple applet for taking screenshots. It is capable of 
+ capturing images of either the whole desktop or just a single window. 
+ The images can then be saved in a variety of formats.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: ksvg
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: SVG viewer for KDE
+ KSVG allows you view SVG (scalable vector graphics) files. This package
+ includes kpart so you can embed it in konqueror and a standalone
+ application.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kuickshow
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: KDE image/slideshow viewer
+ KuickShow is an image browser/viewer with a nice filebrowser to select
+ images to be shown, slideshow support and the ability to display the
+ following image formats: jpg, gif, tiff, png, bmp, psd, xpm, xbm, pbm
+ and eim. Images can be displayed either in their own window, as large
+ as the image, or fullscreen (which shrinks images too large to
+ display). KuickShow also has a slideshow mode. 
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+ .
+ Homepage: http://kuickshow.sourceforge.net
+
+Package: kview
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: simple image viewer/converter for KDE
+ KView is a simple image viewer and converter application. It supports
+ a number of plugins, which add an array of basic editing capabilities
+ as well.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kviewshell
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: generic framework for viewer applications in KDE
+ KViewShell is a generic viewing framework that allows the graphical
+ applications, such as the kview image viewer, to be embedded in other
+ KDE applications, such as Konqueror.
+ .
+ KViewShell comes with a djvuviewpart plugin included, for viewing
+ DjVu images.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: libkscan-dev
+Section: libdevel
+Architecture: any
+Depends: libkscan1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.0)
+Description: development files for the KDE scanner library
+ This package contains development files for KDE's scanner library.
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: libkscan1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: scanner library for KDE
+ KScan is KDE's scanner library. It's used by kooka and by koffice currently.
+ It provides an easy-to-use library, which allows you to access your scanner
+ (as long as it's sane compatible).
+ .
+ This package is part of KDE, as a component of the KDE graphics module.
+ See the 'kde' and 'kdegraphics' packages for more information.
+
+Package: kdegraphics-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: libkscan1 (= ${Source-Version})
+Description: debugging symbols for kdegraphics
+ This package contains the debugging symbols associated with kdegraphics.
+ They will automatically be used by gdb for debugging kdegraphics-related
+ issues.

Added: people/jriddell/KDE/3.5/kdegraphics/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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: Stephan Kulow <coolo at kde.org> 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/kdegraphics/debian/icons/kcolorchooser-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcolorchooser-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcolorchooser-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,95 @@
+/* XPM */
+static char *kcolorchooser-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 73 1",
+"  c black",
+". c #010001",
+"X c #020202",
+"o c #020302",
+"O c #030303",
+"+ c #000700",
+"@ c #040404",
+"# c #050505",
+"$ c #000900",
+"% c #070907",
+"& c #090509",
+"* c #080908",
+"= c #090909",
+"- c #0B0B0B",
+"; c #0D0D0D",
+": c #0F0F0F",
+"> c #131313",
+", c #151515",
+"< c #171617",
+"1 c #171717",
+"2 c #141814",
+"3 c #141914",
+"4 c #181818",
+"5 c #1A1A1A",
+"6 c #1C1C1C",
+"7 c #002200",
+"8 c #003D00",
+"9 c #003E00",
+"0 c #113C11",
+"q c #3B3B3B",
+"w c #164916",
+"e c #184018",
+"r c #185418",
+"t c #006900",
+"y c #535353",
+"u c #476147",
+"i c #4B674B",
+"p c #4B694B",
+"a c #547754",
+"s c #6F6E6F",
+"d c #767676",
+"f c #008A00",
+"g c #008B00",
+"h c #009C00",
+"j c #00A200",
+"k c #02A402",
+"l c #00B800",
+"z c #00B900",
+"x c #609260",
+"c c #5CC05C",
+"v c #51DC51",
+"b c #53DC53",
+"n c #56DF56",
+"m c #63C763",
+"M c #848484",
+"N c #858585",
+"B c #868686",
+"V c #878787",
+"C c #888888",
+"Z c #8A8A8A",
+"A c #8D8D8D",
+"S c #8F8F8F",
+"D c #869F86",
+"F c #939393",
+"G c #979797",
+"H c #999999",
+"J c #DDDDDD",
+"K c #E0E0E0",
+"L c #E2E2E2",
+"P c #E4E4E4",
+"I c #E6E6E6",
+"U c #EAEAEA",
+"Y c None",
+/* pixels */
+"YYYYYYYYY -0w2  ",
+"YYYYYYYY *abhe& ",
+"YYYYYY  *anzg7  ",
+"YYYYYY at urbzf9$  ",
+"YYYYYY pckj9$   ",
+"YYYYYY#ZDmt$    ",
+"YYYYY HJsix    Y",
+"YYY #GLC<*2   YY",
+"YY *FLB<      YY",
+"Y ;FPB<      YYY",
+" ;APB4    YYYYYY",
+" qUB4     YYYYYY",
+"<dy6    YYYYYYYY",
+";q     YYYYYYYYY",
+"      YYYYYYYYYY",
+"     YYYYYYYYYYY"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcolorchooser.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcolorchooser.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcolorchooser.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,39 @@
+/* XPM */
+static char *kcolorchooser[] = {
+/* columns rows colors chars-per-pixel */
+"22 22 11 1",
+"  c black",
+". c #004000",
+"X c #008000",
+"o c #009B00",
+"O c #00B000",
+"+ c #808080",
+"@ c #AAAAAA",
+"# c gainsboro",
+"$ c #C0FFC0",
+"% c gray100",
+"& c None",
+/* pixels */
+"&&&&&&&&&&&&&&&&&&  &&",
+"&&&&&&&&&&&&&&&&& $o &",
+"&&&&&&&&&&&&&&&& $Ooo ",
+"&&&&&&&&&&&&&&& $OOoX ",
+"&&&&&&&&&&&&&& $OOoX. ",
+"&&&&&&&&&&&&  $OOoX. &",
+"&&&&&&&&&&& $OOOoX. &&",
+"&&&&&&&&&&&& $XoX. &&&",
+"&&&&&&&&&&& %@$XX &&&&",
+"&&&&&&&&&& %#@+$. &&&&",
+"&&&&&&&&& %#@+ & &&&&&",
+"&&&&&&&& %#@+ &&&&&&&&",
+"&&&&&&& %#@+ &&&&&&&&&",
+"&&&&&& %#@+ &&&&&&&&&&",
+"&&&&& %#@+ &&&&&&&&&&&",
+"&&&& %#@+ &&&&&&&&&&&&",
+"&&& %#@+ &&&&&&&&&&&&&",
+"&& %#@+ &&&&&&&&&&&&&&",
+"& %#@+ &&&&&&&&&&&&&&&",
+"& #@+ &&&&&&&&&&&&&&&&",
+" +@  &&&&&&&&&&&&&&&&&",
+" + &&&&&&&&&&&&&&&&&&&"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcoloredit-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcoloredit-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcoloredit-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,219 @@
+/* XPM */
+static char *kcoloredit-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 197 2",
+"   c black",
+".  c #060000",
+"X  c #080000",
+"o  c #0D0400",
+"O  c #0E0700",
+"+  c #130606",
+"@  c #140600",
+"#  c #150C00",
+"$  c #190C00",
+"%  c #1B0D03",
+"&  c #111100",
+"*  c #211607",
+"=  c #241302",
+"-  c #271906",
+";  c #2E1E06",
+":  c #35210B",
+">  c #36250D",
+",  c #35280F",
+"<  c #382509",
+"1  c #3A2414",
+"2  c #4C1919",
+"3  c #432D0B",
+"4  c #44290B",
+"5  c #4B2512",
+"6  c #4D2F1A",
+"7  c #4F3B19",
+"8  c #553711",
+"9  c #573C1C",
+"0  c #5F4429",
+"q  c #62471A",
+"w  c #664816",
+"e  c #674C1E",
+"r  c #694919",
+"t  c #744D1D",
+"y  c #674D2C",
+"u  c #6B5123",
+"i  c #734425",
+"p  c #316AFF",
+"a  c #3F6FF9",
+"s  c #4772F3",
+"d  c #009B00",
+"f  c #009C01",
+"g  c #3DBB4B",
+"h  c #76BA3E",
+"j  c #52BF57",
+"k  c #804A2A",
+"l  c #975C23",
+"z  c #8F6019",
+"x  c #94631B",
+"c  c #986615",
+"v  c #956631",
+"b  c #91653B",
+"n  c #957234",
+"m  c #AF7E2E",
+"M  c #A57431",
+"N  c #A27C37",
+"B  c #B47E26",
+"V  c #876546",
+"C  c #8D714F",
+"Z  c #9D7E52",
+"A  c #FC0000",
+"S  c #FD370F",
+"D  c #FA3A3D",
+"F  c #CC651D",
+"G  c #F04415",
+"H  c #FF4D2C",
+"J  c #FC6216",
+"K  c #EF6021",
+"L  c #FF454E",
+"P  c #9CB73D",
+"I  c #BB8731",
+"U  c #B0BC3F",
+"Y  c #89B943",
+"T  c #8CBF5D",
+"R  c #A6804D",
+"E  c #AB8743",
+"W  c #AD8751",
+"Q  c #B88946",
+"!  c #BF9B59",
+"~  c #A0BD4D",
+"^  c #A8BC47",
+"/  c #AFB75F",
+"(  c #BEB64D",
+")  c #ACD46F",
+"_  c #B3CE70",
+"`  c #C18F37",
+"'  c #DB9728",
+"]  c #D39C31",
+"[  c #C5AA3D",
+"{  c #F28F31",
+"}  c #FA9621",
+"|  c #E1A031",
+" . c #E1A53A",
+".. c #FDA726",
+"X. c #F9AF32",
+"o. c #FFB220",
+"O. c #FFB425",
+"+. c #FFB525",
+"@. c #FFB922",
+"#. c #FFB825",
+"$. c #FFBB32",
+"%. c #FFBC31",
+"&. c #C4994B",
+"*. c #D5A84E",
+"=. c #D8A751",
+"-. c #FF9053",
+";. c #FC9D71",
+":. c #EBB347",
+">. c #F4A248",
+",. c #FDA44B",
+"<. c #FABB45",
+"1. c #FABC44",
+"2. c #FFBD43",
+"3. c #FFC228",
+"4. c #FFC643",
+"5. c #FBC651",
+"6. c #FFCA53",
+"7. c #FFCA56",
+"8. c #FECD50",
+"9. c #FFCC51",
+"0. c #FFCB58",
+"q. c #FFCB59",
+"w. c #FFCB5A",
+"e. c #FFCE5E",
+"r. c #FFD455",
+"t. c #FFD45F",
+"y. c #F4C865",
+"u. c #F5CC6A",
+"i. c #FFCF62",
+"p. c #FFD265",
+"a. c #FFD661",
+"s. c #FFD767",
+"d. c #FFD368",
+"f. c #FFD66D",
+"g. c #FFD86B",
+"h. c #FFDE6E",
+"j. c #F7D374",
+"k. c #FFD770",
+"l. c #FFD871",
+"z. c #FFDA74",
+"x. c #FFDD77",
+"c. c #FFDC79",
+"v. c #FFDD7B",
+"b. c #FFDD7C",
+"n. c #FFDF7F",
+"m. c #FFE06A",
+"M. c #8FA1D2",
+"N. c #9EA7C2",
+"B. c #83A5FB",
+"V. c #84A8FF",
+"C. c #A9B5DB",
+"Z. c #B5B6CA",
+"A. c #9AD792",
+"S. c #BBC1B6",
+"D. c #BBCAD0",
+"F. c #E6D18C",
+"G. c #E8DE84",
+"H. c #E8DB9F",
+"J. c #F4DF84",
+"K. c #F9E284",
+"L. c #FFE080",
+"P. c #FFE082",
+"I. c #FFE284",
+"U. c #FFE286",
+"Y. c #FFE387",
+"T. c #FFE482",
+"R. c #FFE48A",
+"E. c #FFE78E",
+"W. c #FFE884",
+"Q. c #FFE88E",
+"!. c #FFE98F",
+"~. c #FFEC8E",
+"^. c #FBE391",
+"/. c #FFE790",
+"(. c #FFE993",
+"). c #FFEB96",
+"_. c #FFEF99",
+"`. c #FFEF9E",
+"'. c #FFF098",
+"]. c #FFF59C",
+"[. c #EBECBE",
+"{. c #F4E5A1",
+"}. c #F4EDA6",
+"|. c #FFF0A1",
+" X c #FFF3A0",
+".X c #FFF4A4",
+"XX c #FDF3AF",
+"oX c #FDFAB6",
+"OX c #FFFDB1",
+"+X c #FFFCB4",
+"@X c #FFFFB5",
+"#X c #FFFFB6",
+"$X c #FFFDBA",
+"%X c #FFFDBB",
+"&X c #CFD2CC",
+"*X c #C3CEF1",
+"=X c None",
+/* pixels */
+"=X=X=X=X=X=X5 k b R W V 6 X =X=X",
+"=X=X=X=X2 i Q / J._.&X*XZ.C % =X",
+"=X=X=X+ v ( ) A._ G.C.V.B.[.Z . ",
+"=X=XO M 6.h g j T K.M.p a D.{.1 ",
+"=X  l 2.r.U f d Y !.N.s S.oX%X0 ",
+"=Xw ,.;.-.[ P ^ ~ U.!.H.}.#X%Xy ",
+"& F H L D >.s.l.v.J.E._..X+XXX9 ",
+"8 ..S A K 5.e.d.l.n.R.).].#XF.: ",
+"x 3.J G { 9.0.p.l.n.U.(.`.#X! o ",
+"B #.} X.4.9.7.i.f.x.U.E.].^.t   ",
+"I +.+.$. .*.0.e.g.x.n.!.].&.$ =X",
+"N %.o.' - * :.t.y.j.W.T.=.4 =X=X",
+"7 0. at .c =X3 <.` > , u r =   =X=X",
+"  E m.] z | 1.< =X=X=X=X=X=X=X=X",
+"=X@ n u.h.a.m   =X=X=X=X=X=X=X=X",
+"=X=X  ; e q # =X=X=X=X=X=X=X=X=X"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcoloredit.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcoloredit.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kcoloredit.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kcoloredit[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #0A0300",
+"X  c #0C0800",
+"o  c #110505",
+"O  c #150A02",
+"+  c #1D0E05",
+"@  c #1F0A0A",
+"#  c #1C1104",
+"$  c #220F04",
+"%  c #251305",
+"&  c #2D1C09",
+"*  c #281407",
+"=  c #311D0A",
+"-  c #341D03",
+";  c #3D2010",
+":  c #452C0D",
+">  c #482400",
+",  c #482B15",
+"<  c #4C300E",
+"1  c #4F3112",
+"2  c #502E0E",
+"3  c #562C16",
+"4  c #52340C",
+"5  c #56380D",
+"6  c #583615",
+"7  c #633B1D",
+"8  c #693A1C",
+"9  c #64361C",
+"0  c #703D1F",
+"q  c #6C3C21",
+"w  c #69440F",
+"e  c #664213",
+"r  c #734B13",
+"t  c #74471B",
+"y  c #6C4023",
+"u  c #724224",
+"i  c #794A26",
+"p  c #346BFF",
+"a  c #3B68F7",
+"s  c #396EFF",
+"d  c #3E71FF",
+"f  c #4371F9",
+"g  c #5778E7",
+"h  c #577EF2",
+"j  c #009B00",
+"k  c #089F06",
+"l  c #19970A",
+"z  c #0AA40C",
+"x  c #26A213",
+"c  c #24AF38",
+"v  c #2BB02F",
+"b  c #3BB63C",
+"n  c #4AA728",
+"m  c #47A420",
+"M  c #61B749",
+"N  c #64BA54",
+"B  c #7BB045",
+"V  c #66C76F",
+"C  c #6CC96E",
+"Z  c #76CC79",
+"A  c #5C81EB",
+"S  c #5F87FB",
+"D  c #7E8FCD",
+"F  c #6A87D7",
+"G  c #6486E1",
+"H  c #648DFE",
+"J  c #8B5C1A",
+"K  c #915B1E",
+"L  c #8B5C25",
+"P  c #86542F",
+"I  c #8C5F3B",
+"U  c #966216",
+"Y  c #8C6428",
+"T  c #946728",
+"R  c #956C2E",
+"E  c #996922",
+"W  c #926439",
+"Q  c #976939",
+"!  c #A9721C",
+"~  c #AA6E22",
+"^  c #A16926",
+"/  c #B36A24",
+"(  c #B77C26",
+")  c #BC7E23",
+"_  c #B07835",
+"`  c #9D7244",
+"'  c #A37A49",
+"]  c #A47742",
+"[  c red",
+"{  c #F80801",
+"}  c #FF0B15",
+"|  c #F51D0A",
+" . c #FF1C1D",
+".. c #FD1E12",
+"X. c #F2240B",
+"o. c #EA591F",
+"O. c #FF5213",
+"+. c #EB4716",
+"@. c #EC4C24",
+"#. c #F8781C",
+"$. c #EE6419",
+"%. c #EC672B",
+"&. c #FC732A",
+"*. c #FD5656",
+"=. c #FE6969",
+"-. c #FF6972",
+";. c #FC7563",
+":. c #FC7A73",
+">. c #FF7C80",
+",. c #81A934",
+"<. c #87B130",
+"1. c #8EB331",
+"2. c #BD812B",
+"3. c #AEBC3F",
+"4. c #8CBD40",
+"5. c #85B454",
+"6. c #9EB648",
+"7. c #AD8C5F",
+"8. c #B38041",
+"9. c #B9965A",
+"0. c #B39561",
+"q. c #87CB7E",
+"w. c #96C96F",
+"e. c #A4C24F",
+"r. c #ADD264",
+"t. c #C18225",
+"y. c #C8882C",
+"u. c #C98F38",
+"i. c #C38030",
+"p. c #D28B24",
+"a. c #D28F2A",
+"s. c #DB9521",
+"d. c #D49737",
+"f. c #D8A13C",
+"g. c #E78422",
+"h. c #EE8932",
+"j. c #E69E2C",
+"k. c #E19621",
+"l. c #FF8026",
+"z. c #FF9027",
+"x. c #F39530",
+"c. c #EB9835",
+"v. c #FFAC1C",
+"b. c #E9A42B",
+"n. c #E9A738",
+"m. c #E8A537",
+"M. c #FFAE21",
+"N. c #F9AD2B",
+"B. c #FAA937",
+"V. c #FEB324",
+"C. c #FEB42B",
+"Z. c #FDBB2A",
+"A. c #FFB732",
+"S. c #FCB439",
+"D. c #FDB832",
+"F. c #FFBD3A",
+"G. c #F5B036",
+"H. c #C99848",
+"J. c #C69D55",
+"K. c #D19A43",
+"L. c #CEBE4B",
+"P. c #DDA442",
+"I. c #DEA648",
+"U. c #D7A956",
+"Y. c #CCAD6C",
+"T. c #D0B670",
+"R. c #D7BC79",
+"E. c #C5AB78",
+"W. c #ED9D42",
+"Q. c #FB847A",
+"!. c #EBA743",
+"~. c #EEBC44",
+"^. c #E6B854",
+"/. c #FCBC43",
+"(. c #F0B955",
+"). c #E5BB65",
+"_. c #FDC02C",
+"`. c #FFC23D",
+"'. c #DAC04D",
+"]. c #C5C260",
+"[. c #D9C07C",
+"{. c #D9D176",
+"}. c #EFCC56",
+"|. c #FEC245",
+" X c #FFC54B",
+".X c #FECA4B",
+"XX c #FEC752",
+"oX c #FEC758",
+"OX c #FFCA53",
+"+X c #FFCC5B",
+"@X c #FDD25B",
+"#X c #F0D059",
+"$X c #E7C668",
+"%X c #E3C87F",
+"&X c #E5D276",
+"*X c #FECE61",
+"=X c #F8CC6C",
+"-X c #F4C666",
+";X c #FED164",
+":X c #FFD46B",
+">X c #FFD96D",
+",X c #F1D764",
+"<X c #FDD572",
+"1X c #FFD973",
+"2X c #FEDC7B",
+"3X c #F5D67F",
+"4X c #FFE07C",
+"5X c #A9A094",
+"6X c #B3B8BD",
+"7X c #85A1FF",
+"8X c #9AB3FE",
+"9X c #96A6E4",
+"0X c #A6B2DA",
+"qX c #A3BCFF",
+"wX c #A3DDA8",
+"eX c #B7D6A3",
+"rX c #A8E1AC",
+"tX c #B8C2C7",
+"yX c #BEC7D2",
+"uX c #A7C0FF",
+"iX c #B0C0EA",
+"pX c #B5C6FF",
+"aX c #FF8084",
+"sX c #FEB2B0",
+"dX c #C5CAB9",
+"fX c #D6CDA1",
+"gX c #DAD2A4",
+"hX c #CBC7A6",
+"jX c #DFE3BA",
+"kX c #EBCF82",
+"lX c #EADC9C",
+"zX c #E9D894",
+"xX c #F0DA83",
+"cX c #FFE183",
+"vX c #FEE58A",
+"bX c #FEE98C",
+"nX c #F6E385",
+"mX c #FCE591",
+"MX c #FEEA93",
+"NX c #FEEE9B",
+"BX c #F1E39C",
+"VX c #FFF28F",
+"CX c #FFF29C",
+"ZX c #FFF498",
+"AX c #ECE5A6",
+"SX c #F9EFA7",
+"DX c #F8EFA8",
+"FX c #FEF2A3",
+"GX c #FEF5AA",
+"HX c #FFF8AD",
+"JX c #FEFBB3",
+"KX c #FEFEBC",
+"LX c #F7F3B3",
+"PX c #CFDCFF",
+"IX c #D6E1FF",
+"UX c #FFFFC2",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX8 8 8 q u y 8 6 , $ YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX  q u P ` 9.Y.R.[.T.0.Q u ;   YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYX6 q W 9.].vXVXZXZXGXyXiX0X5X` 3 O YXYXYXYX",
+"YXYXYXYXYXYXYXYXYX, 3 P U.2Xr.N &XMXMXBX9XpXIXPX8XdX0.q o YXYXYX",
+"YXYXYXYXYXYXYXYX; u 8.;X#X6.wXeX$XnXbXgX7XuX8XuX8X0XKX7.3   YXYX",
+"YXYXYXYXYXYXYXo y H.#X4.M C wXwXw.M {.VX6XS H H H dXUXLXI * YXYX",
+"YXYXYXYXYXYXo u I. at X1.c C C C Z V 5.xXVXgXd d d a A jXUXE.3   YX",
+"YXYXYXYXYX$ i P..XOX'.n v b b b B 3XbXlXA s d d f g dXUXAXi . YX",
+"YXYXYXYX  q P..X.XXX+XL.k z z z 6.cXbXzXg p s G gXAXJXKXKXW + YX",
+"YXYXYXYX3 ) &.F..X}.+X3.j j j j x &XbXbXzXD a F ZXHXKXUXKX` + YX",
+"YXYXYX+ E B.:.W.S.B.oX<.l B 6.m l ].vXvXMXbXfXhXGXHXJXKXKX' $ YX",
+"YXYXYX7 b.S.sXQ.;.*.%.}.^.;X<X:X$X3XcXvXMXMXZXFXGXHXJXKXKX] % YX",
+"YXYX# / z.&.=.aXaX-. at .+X@X;X:X<X4X4XcXcXvXMXNXFXGXHXJXKXLXQ $ YX",
+"YXYX6 g... . . . .} %. at X+X;X:X>X1X4XcXcXvXMXNXNXFXHXHXKXlXL . YX",
+"YX  ^ V.#.{ { [ X.o.!.OX+X+X:X:X<X2X4XcXvXMXMXNXSXGXHXUXR.t   YX",
+"YX& p.V._.$.[ [ | ~.OXXXoX;X;X:X<X2X4XcXvXbXMXNXSXFXHXJXJ.2   YX",
+"YX1 b.V.V.#.{ +.X.h..XXX+X+X;X:X>X1X2XcXvXvXMXNXNXGXHXDX_ = YXYX",
+"YXr N.M.Z.O.{ n.x.c..XXXXX+X+X:X>X1X2XcXcXvXMXNXNXSXHXkXL . YXYX",
+"YXL C.M.V.#.o.D.`.|.|. XXX+X+X:X>X1X2X2XcXvXmXNXNXFXGXH.6   YXYX",
+"YXT D.M.M.V.Z.A.F.F.|. XOX+X+X;X:X<X1X2XcXvXvXMXNXGXkX~ # YXYXYX",
+"YXR F.v.M.M.A.A.F. X;X>XOXOX+X;X:X>X1X4X4XvXvXMXNXNXK.e   YXYXYX",
+"YXR |.v.M.M.C.A.G.u.T H.:XOX+X;X;X:X<X2X4XcXvXMXCX).~ # YXYXYXYX",
+"YXY +XM.M.M.C.A.( =   * P.OX+X*X<X4X1X4X4XcXbXMX$Xy.<   YXYXYXYX",
+"YXe =XD.v.M.V.j.:   YX  2.XX+X;X-X-X<XvXvXvX2X^.) 6   YXYXYXYXYX",
+"YX% U.:Xv.v.V.)   YXYXO d..XoXd.r : 6 Y H.K.) J =   YXYXYXYXYXYX",
+"YX  E cX|.v.V.!   YXYXr G..Xm.5         . # X     YXYXYXYXYXYXYX",
+"YXYX- I.MX|.v.s.& > ~ a. X/.J   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYX  w (.NX:XC.s.p.j.S.|.m.& YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYX  r !.MXNX1X+X.X+X+X2.  YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYX  4 2.(.2XMXmX=Xn.5   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXX 5 U t.a.! 6   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYX    . X     YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kdvi-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kdvi-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kdvi-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,187 @@
+/* XPM */
+static char *kdvi-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 165 2",
+"   c black",
+".  c #060600",
+"X  c #040404",
+"o  c #060606",
+"O  c #090400",
+"+  c #0E0400",
+"@  c #0F0500",
+"#  c #0C0C0C",
+"$  c #090913",
+"%  c #170D00",
+"&  c #141405",
+"*  c #1C191C",
+"=  c #242407",
+"-  c gray13",
+";  c #3C3128",
+":  c gray24",
+">  c #3D3F43",
+",  c #294042",
+"<  c #3F606D",
+"1  c #423A2D",
+"2  c #4C3726",
+"3  c #58581E",
+"4  c #494526",
+"5  c #79762F",
+"6  c #414444",
+"7  c gray37",
+"8  c #626262",
+"9  c #696A6A",
+"0  c #6A6A68",
+"q  c #7DBED7",
+"w  c #7CC3DD",
+"e  c #B87110",
+"r  c #C47C1A",
+"t  c #9D9D2F",
+"y  c #918D5F",
+"u  c #B5954F",
+"i  c #B7984E",
+"p  c #BB9445",
+"a  c #BCBA4C",
+"s  c #E89E31",
+"d  c #DEB777",
+"f  c #CECE18",
+"g  c #E5E233",
+"h  c #CAD071",
+"j  c #E1DD7A",
+"k  c #FECF79",
+"l  c #E6E66D",
+"z  c #FEE079",
+"x  c #FEE47F",
+"c  c #878888",
+"v  c gray54",
+"b  c #959494",
+"n  c #8096A6",
+"m  c #9293AC",
+"M  c #8DADBA",
+"N  c #93ADB7",
+"B  c #AD9880",
+"V  c #A2A2A2",
+"C  c #A1AEAE",
+"Z  c #A4B5BE",
+"A  c #BFBDBE",
+"S  c #8BB2C2",
+"D  c #93B3CF",
+"F  c #94BED1",
+"G  c #9AB7D2",
+"H  c #8CBFED",
+"J  c #A5BBC9",
+"K  c #A9B5C5",
+"L  c #95C4DB",
+"P  c #87CAE2",
+"I  c #8CC8E0",
+"U  c #88C3F7",
+"Y  c #89CCF7",
+"T  c #9ACEE1",
+"R  c #9CCFE6",
+"E  c #9FCEE5",
+"W  c #91C4F3",
+"Q  c #9ACEF6",
+"!  c #98D0F7",
+"~  c #9EDCF7",
+"^  c #AFC0CE",
+"/  c #B7C2CE",
+"(  c #BDC5CE",
+")  c #BFC4CF",
+"_  c #B9C2D0",
+"`  c #A6C9E1",
+"'  c #AAD6E9",
+"]  c #AAD5ED",
+"[  c #A0D3F5",
+"{  c #A1D7F3",
+"}  c #A4DDF9",
+"|  c #ABDAF6",
+" . c #B6CCE7",
+".. c #B5D0E2",
+"X. c #B5D1E3",
+"o. c #B6DCEE",
+"O. c #B9D5E6",
+"+. c #BCD5E4",
+"@. c #B8D2EC",
+"#. c #B8D8E6",
+"$. c #AFE2EE",
+"%. c #A3E1FB",
+"&. c #A8E0F9",
+"*. c #AAE2F9",
+"=. c #AFE3FB",
+"-. c #B1EBFD",
+";. c #B9E9F3",
+":. c #BDE9F6",
+">. c #C2B9BB",
+",. c #DCDE9B",
+"<. c #C5C2A4",
+"1. c #CBD0AA",
+"2. c #FEFE85",
+"3. c #FEFE8C",
+"4. c #FEFE90",
+"5. c #C6CAD5",
+"6. c #CBCCDA",
+"7. c #CED0DA",
+"8. c #D1CED2",
+"9. c #D3D2C6",
+"0. c #DCDCC8",
+"q. c gray83",
+"w. c #D5D5D6",
+"e. c #D1D0DB",
+"r. c #DADCDE",
+"t. c #C2DAEB",
+"y. c #D6DAE1",
+"u. c #C3E2F2",
+"i. c #C5E1F1",
+"p. c #C0EBF7",
+"a. c #C2EDF3",
+"s. c #C0EDF9",
+"d. c #C3F3FB",
+"f. c #C6F5FB",
+"g. c #CFF0F2",
+"h. c #CCF7F7",
+"j. c #CBF6F9",
+"k. c #CFFDFE",
+"l. c #D6E1EB",
+"z. c #D2EDEE",
+"x. c #DCEEF1",
+"c. c #D0F7F6",
+"v. c #D6FCFB",
+"b. c #D7FCFB",
+"n. c #DEF1FC",
+"m. c #DAF9F8",
+"M. c #EDDDC5",
+"N. c #E2E1DE",
+"B. c gray89",
+"V. c #EEECE4",
+"C. c #EBE9E9",
+"Z. c #E9E9ED",
+"A. c #E2EDF2",
+"S. c #E1F9F9",
+"D. c #E4F9F8",
+"F. c #EDFDFC",
+"G. c #FBF6EC",
+"H. c #F8F7F8",
+"J. c #F9F9F9",
+"K. c #F8FEFE",
+"L. c gray99",
+"P. c #FDFDFD",
+"I. c #FCFEFE",
+"U. c #FEFEFE",
+"Y. c None",
+/* pixels */
+"Y.Y.Y.Y.Y.Y.  C Z J X.n   Y.Y.Y.",
+"Y.Y.8 N M S F L ` ] | ` # Y.Y.Y.",
+"Y.Y.< w q I R ' o.u.u.n.6 Y.Y.Y.",
+"Y.Y., P T #.O.t.l.w.N.I.v Y.Y.Y.",
+"f g h A.r. at .Q ! [ ..Z.I.w.  Y.Y.",
+"t 3.4.G. .Y %.&.=.-.+.J.I.- Y.Y.",
+"& l 3.0.W ~ p.:.f.k.a.y.J.7 Y.Y.",
+"Y.3 2.1.U &.s.j.b.m.g.( C.V   Y.",
+"Y.  a ,.W { ;.h.S.F.x.5.L.B.o Y.",
+"Y.Y.= j D } d.v.D.K.5.6.I.L.: Y.",
+"Y.Y.Y.5 9.D $.j.z./ m >.M.I.c   ",
+"Y.Y.Y.o <.e.K / _ 6.8.d s y >   ",
+"Y.Y.Y.Y.0 I.V.>.b 9 1 p 2.e + Y.",
+"Y.Y.Y.Y.* y 4 X   Y.Y.+ u 2.r % ",
+"Y.Y.Y.Y.Y.    Y.Y.Y.Y.Y.O u k 2 ",
+"Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.Y.O ; $ "
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kdvi.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kdvi.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kdvi.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kdvi[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #0A0B0C",
+"X  c #0A0A08",
+"o  c #141400",
+"O  c #1C1A01",
+"+  c #131313",
+"@  c #1B1B1B",
+"#  c #13161A",
+"$  c #2E2A07",
+"%  c #3C2005",
+"&  c #393806",
+"*  c #2F2F2F",
+"=  c #26292A",
+"-  c #2E2E30",
+";  c #3E3E3E",
+":  c #313B3E",
+">  c #333647",
+",  c #432404",
+"<  c #4C2B05",
+"1  c #6B3A05",
+"2  c #6D3E0A",
+"3  c #595710",
+"4  c #545413",
+"5  c #4D4826",
+"6  c #74430A",
+"7  c #765A37",
+"8  c #66660F",
+"9  c #75751F",
+"0  c #444444",
+"q  c #454D50",
+"w  c #525252",
+"e  c #406A7A",
+"r  c #7C784C",
+"t  c gray39",
+"y  c #646B71",
+"u  c #717171",
+"i  c #7A7381",
+"p  c #787B94",
+"a  c #5A95AB",
+"s  c #778194",
+"d  c #7F8BA4",
+"f  c #63ACC6",
+"g  c #69B1CB",
+"h  c #7EB8CF",
+"j  c #73B8D3",
+"k  c #7FBED8",
+"l  c #75BCD7",
+"z  c #8B5D28",
+"x  c #A86824",
+"c  c #DD7D04",
+"v  c #8E8418",
+"b  c #97972C",
+"n  c #B6823E",
+"m  c #B5B320",
+"M  c #B2B23A",
+"N  c #BD9360",
+"B  c #CF913D",
+"V  c #C4BF3F",
+"C  c #E4850B",
+"Z  c #E9890D",
+"A  c #EBA835",
+"S  c #F0AA36",
+"D  c #DEA944",
+"F  c #DBA359",
+"G  c #C6BF6F",
+"H  c #D7AB65",
+"J  c #E4AC42",
+"K  c #EDB442",
+"L  c #E1B577",
+"P  c #D6D633",
+"I  c #F8F821",
+"U  c #F3F322",
+"Y  c #F6CF7A",
+"T  c #E4E45B",
+"R  c #FAFA66",
+"E  c #F6F67F",
+"W  c #FEFE77",
+"Q  c #FDFC7C",
+"!  c #CECE4C",
+"~  c #88808D",
+"^  c #868688",
+"/  c #82829A",
+"(  c #8F9298",
+")  c gray60",
+"_  c #8A8BA1",
+"`  c #8791A7",
+"'  c #8E90AA",
+"]  c #9797A9",
+"[  c #9999AC",
+"{  c #9191A4",
+"}  c #9191B6",
+"|  c #8FA4AC",
+" . c #8AAABB",
+".. c #9AAFB7",
+"X. c #99A5B2",
+"o. c #97AAAA",
+"O. c #A09FAF",
+"+. c #ACAB90",
+"@. c #A1B184",
+"#. c #A7AAA7",
+"$. c #AAAAAA",
+"%. c gray63",
+"&. c #A1A0B2",
+"*. c #A0A8B9",
+"=. c #A9A9B8",
+"-. c #AAA8B6",
+";. c #AAB0BF",
+":. c #A7B5B8",
+">. c #BBB6B7",
+",. c #BAB9BC",
+"<. c #8C9EC2",
+"1. c #83B4C8",
+"2. c #81BED6",
+"3. c #8DB1D6",
+"4. c #9BB2C1",
+"5. c #9ABCCA",
+"6. c #92B8D3",
+"7. c #8FB7E4",
+"8. c #88BBEB",
+"9. c #85BDF1",
+"0. c #9EBDE1",
+"q. c #A3B9C4",
+"w. c #AAB4C4",
+"e. c #AEBDC8",
+"r. c #A2BFD2",
+"t. c #BDBDC9",
+"y. c #B5B9C6",
+"u. c #B1BFD0",
+"i. c #BABED0",
+"p. c #85C2D9",
+"a. c #8AC4DB",
+"s. c #8EC8DD",
+"d. c #93C6DC",
+"f. c #83C2F5",
+"g. c #8AC9F6",
+"h. c #89C5F5",
+"j. c #8CD0F7",
+"k. c #94CAE2",
+"l. c #9ACBE2",
+"z. c #98CCE8",
+"x. c #93CCF6",
+"c. c #9ED0EC",
+"v. c #92D1F7",
+"b. c #95D3F8",
+"n. c #9ADAF8",
+"m. c #9AD8F7",
+"M. c #A4C2CE",
+"N. c #A5C5D6",
+"B. c #AAC6E6",
+"V. c #A1C8F0",
+"C. c #A5D1E5",
+"Z. c #A3D1EA",
+"A. c #A9D4E5",
+"S. c #ABD4EB",
+"D. c #AADBEC",
+"F. c #A3D4F3",
+"G. c #A0DBF9",
+"H. c #AED6F0",
+"J. c #ABDEF9",
+"K. c #A3DCF7",
+"L. c #B8CCE2",
+"P. c #B0D5EB",
+"I. c #B3D9EB",
+"U. c #BDD9E5",
+"Y. c #B4DAF2",
+"T. c #B7DEF9",
+"R. c #BBDEF2",
+"E. c #A6E0F7",
+"W. c #A5E1FB",
+"Q. c #ACE2F5",
+"!. c #ABE2FA",
+"~. c #ACE8FD",
+"^. c #BBE1EC",
+"/. c #B5E5F3",
+"(. c #B1E5F9",
+"). c #B3E8FA",
+"_. c #BAE5F3",
+"`. c #BDEBF4",
+"'. c #BCEBFA",
+"]. c #BAF0FB",
+"[. c #C6C48C",
+"{. c #D2C6BB",
+"}. c #E1DD9C",
+"|. c #F6DA8F",
+" X c #F6DA90",
+".X c #F9DE93",
+"XX c #E8E782",
+"oX c #EBEB87",
+"OX c #E7E794",
+"+X c #FDE897",
+"@X c #F2F281",
+"#X c #FDFD84",
+"$X c #FEFE8B",
+"%X c #F2F09E",
+"&X c #E4E4B2",
+"*X c #FEF7AC",
+"=X c #FEF8AD",
+"-X c #E8E7AB",
+";X c #C4C4C4",
+":X c #C2C1CA",
+">X c #CBCACA",
+",X c #C9C6CB",
+"<X c #CECBD4",
+"1X c #CACDDE",
+"2X c #C5C6D2",
+"3X c #D0CFD3",
+"4X c #D0D0CF",
+"5X c #D6D5C2",
+"6X c #D4D3D2",
+"7X c #D4D3DB",
+"8X c #DAD9D9",
+"9X c #CBD8E5",
+"0X c #D4DCEA",
+"qX c #CBE3EE",
+"wX c #C5E2F3",
+"eX c #C9EAF7",
+"rX c #C5F1F4",
+"tX c #C5F3FB",
+"yX c #CCF1F1",
+"uX c #C9F5FC",
+"iX c #C9F8F7",
+"pX c #CCFAFD",
+"aX c #C6FBFE",
+"sX c #D7E5EB",
+"dX c #D8EDF6",
+"fX c #DBF0EE",
+"gX c #D4F2F2",
+"hX c #D7F1FE",
+"jX c #D3FBFB",
+"kX c #DDF7F7",
+"lX c #D9FCFB",
+"zX c #E8DCCE",
+"xX c #E3DEE1",
+"cX c #ECECD7",
+"vX c #E9E9C5",
+"bX c #E3E3E4",
+"nX c #E6E7EE",
+"mX c #EEE7E7",
+"MX c #E9E7EE",
+"NX c #EBE9E6",
+"BX c #EBEAEA",
+"VX c #E1E8EC",
+"CX c #E3EBF2",
+"ZX c #ECEEF2",
+"AX c #E3F2F4",
+"SX c #E3FBFB",
+"DX c #EBF1F2",
+"FX c #EBFBFC",
+"GX c #F0EEED",
+"HX c #F0EEF1",
+"JX c #F3F4F4",
+"KX c #F2F5FA",
+"LX c #F1FCFC",
+"PX c #F8F7F5",
+"IX c #FCFCFC",
+"UX c #F9F9F7",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX$.:.e.U.q YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYX} :.q.q.N.N.Z.H.wXs   YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYX) o...4.5.a.d.k.z.z.Z.S.H.T.N.X YXYXYXYXYXYXYX",
+"YXYXYXYX; X.|  . .1.h k p.k.k.k.z.P.I.Y.S.S.Y.T.= YXYXYXYXYXYXYX",
+"YXYXYXYX: j g j l j k a.l.S.C.S.I.wXR.I.Z.S.Y.hXy YXYXYXYXYXYXYX",
+"YXYXYXYX# f p.2.p.d.A.A.C.A.C.Z.C.P.R.eXdXKXIXIX,.  YXYXYXYXYXYX",
+"YXYXYXYX  a d.k p.d.a.d.l.C.P.qXCXKXbXNX8X>XNXIXPX# YXYXYXYXYXYX",
+"YXYXYXYXYXe l p.a.A.U.qXbX0X0X0X0X8X,.>X7X8XUXIXIXw YXYXYXYXYXYX",
+"YXYXYXU m @.wXCXKXmXmX9Xc.h.g.x.b.F.L.7XIXIXIXIXIX)   YXYXYXYXYX",
+"  I P R Q %XIXIX;X,XB.f.g.v.b.m.G.G.G.S.2XPXIXIXIXcXX YXYXYXYXYX",
+"8 R #X$X$XoXJXIXxXB.f.v.n.W.J.!.J.T.(.~.P.2XIXIXIXIX- YXYXYXYXYX",
+"O T $X#X$X at XcXUX1Xf.j.n.!.).~.!.).).'.].'.u.bXIXIXIXt YXYXYXYXYX",
+"YX4 #X$X#X at XvXnX0.f.m.K./.'./.D.rXtXuXuXaX^.L.IXIXIX$.  YXYXYXYX",
+"YX  M $X#X#X-X1X8.j.m.Q._.dXeXrXpXpXjXjXjXpX;.GXIXUXBX. YXYXYXYX",
+"YXYXO R $X#XOXi.9.j.n.).tXuXtXpXlXlXlXjXgXjXw.,.>X;XIX0 YXYXYXYX",
+"YXYX  9 #X$XXXw.9.b.G.J.(.'.tXjXjXlXgXgXgXjXw.:XJXUXIX^   YXYXYX",
+"YXYXYXX ! $XE #.9.b.m.Q./.`.yXyXgXSXSXFXFXSX*.bXIXIXIX>X  YXYXYX",
+"YXYXYXYX& W #X+.7.x.z.C./.rXiXjXlXFXFXKXLXfX[ HXPXJXIXPX= YXYXYX",
+"YXYXYXYX  b #X[.<.b.K.Q.`.iXjXlXSXFXLXIXIXu.=.IXJXJXPXIXt YXYXYX",
+"YXYXYXYXYXo T %X&.3.W.(.'.uXjXlXkXAXAXIXnXp t.PXKXJXJXIX$.  YXYX",
+"YXYXYXYXYXYX3 Q 4X' 6.).'.`.yXyXyXfXAXfX_ / =.IXKXPXJXJXbX+ YXYX",
+"YXYXYXYXYXYX  V cX3Xs 3.Q.'.iXjXlXSX9Xp _ &.w.{.L BXKXPXIX; YXYX",
+"YXYXYXYXYXYXYX& }.KX3X{ `  .r.M.:.` / =.y.t.>.B c F ZXDXbXw   YX",
+"YXYXYXYXYXYXYX  r JXHXBX>X-.] [ [ t.BXUXIXzXH Y A C n - X     YX",
+"YXYXYXYXYXYXYXYX@ bXBXbXBXPXUXIXIXUXbX,X( 7 A =X|.S c 1   YXYXYX",
+"YXYXYXYXYXYXYXYX  >XJXnXCXBX>X%.u 0 @       < K *X|.S Z 6   YXYX",
+"YXYXYXYXYXYXYXYX  ^ 5X&XG 5 X         YXYXYX  < K *X XS C 6   YX",
+"YXYXYXYXYXYXYXYX    $ v O   YXYXYXYXYXYXYXYXYX  , J *X XS C 1   ",
+"YXYXYXYXYXYXYXYXYXYX      YXYXYXYXYXYXYXYXYXYXYX  % J *X.XA x X ",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  % D +XN ~ . ",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  % z i >   ",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX          "
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kfax-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kfax-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kfax-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,190 @@
+/* XPM */
+static char *kfax-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 168 2",
+"   c black",
+".  c gray2",
+"X  c gray3",
+"o  c #111111",
+"O  c gray7",
+"+  c gray9",
+"@  c #191919",
+"#  c gray10",
+"$  c #202020",
+"%  c gray14",
+"&  c gray15",
+"*  c #2D292D",
+"=  c gray20",
+"-  c #373737",
+";  c #3F3F3F",
+":  c gray28",
+">  c #484848",
+",  c gray29",
+"<  c #4C4C4C",
+"1  c #4E4C4E",
+"2  c #505050",
+"3  c gray32",
+"4  c #5B5B5B",
+"5  c #5F5F5F",
+"6  c #646464",
+"7  c #676767",
+"8  c DimGray",
+"9  c #6A6A6A",
+"0  c #6C6C6C",
+"q  c #6F6F6F",
+"w  c gray44",
+"e  c gray46",
+"r  c #7EC97C",
+"t  c #7BA3D9",
+"y  c #7EA6DB",
+"u  c #7FA7DB",
+"i  c #7CA6DD",
+"p  c #7FA8DC",
+"a  c gray51",
+"s  c #898989",
+"d  c #939393",
+"f  c #959595",
+"g  c #989898",
+"h  c #A7A7A7",
+"j  c #ACACAC",
+"k  c gray68",
+"l  c gray71",
+"z  c gray72",
+"x  c #BAB8BA",
+"c  c gray73",
+"v  c #BABBBB",
+"b  c gray74",
+"n  c gray",
+"m  c #81A9DE",
+"M  c #8DADE0",
+"N  c #A1B6D7",
+"B  c #A3B8D8",
+"V  c #A4B8D9",
+"C  c #A4B9DA",
+"Z  c #A5B9DA",
+"A  c #A7BCDF",
+"S  c #AAB9DA",
+"D  c #9BD39A",
+"F  c #ADCDAF",
+"G  c #B7CDB9",
+"H  c #B4D2B8",
+"J  c #BEC1C1",
+"K  c #BEC2C1",
+"L  c #A8C4E8",
+"P  c #E19A9C",
+"I  c #E1A5A5",
+"U  c #C3BEC3",
+"Y  c #C1CBB9",
+"T  c #C0C0C0",
+"R  c gray76",
+"E  c #C3C3C3",
+"W  c gray77",
+"Q  c #C5C5C5",
+"!  c gray78",
+"~  c #C7C8C8",
+"^  c #C9C7C9",
+"/  c #CAC8C5",
+"(  c #CAC9C6",
+")  c #CCCAC7",
+"_  c #C8C8C8",
+"`  c #CACACA",
+"'  c #CBCBCB",
+"]  c #CBCDCB",
+"[  c #CDCBC9",
+"{  c #CCCBCB",
+"}  c #CFCDCA",
+"|  c gray80",
+" . c #CDCCCD",
+".. c #CDCDCD",
+"X. c #CECECE",
+"o. c #CFCECF",
+"O. c gray81",
+"+. c #C8D3C8",
+"@. c #C8D4C8",
+"#. c #DFC1C1",
+"$. c #D1D0CC",
+"%. c #D0D0D0",
+"&. c gray82",
+"*. c #D3D1D3",
+"=. c #D2D2D2",
+"-. c #D3D3D2",
+";. c gray83",
+":. c #D5D5D4",
+">. c #D5D5D5",
+",. c gray84",
+"<. c #D7D7D7",
+"1. c #DBD7D7",
+"2. c #D8D2D9",
+"3. c #D8D5D8",
+"4. c #D8D8D8",
+"5. c gray85",
+"6. c #DBD8DB",
+"7. c gray86",
+"8. c #DADDDA",
+"9. c #DCDBD9",
+"0. c #DEDFDE",
+"q. c #C7D6EE",
+"w. c #E2C6C8",
+"e. c #E0DFDF",
+"r. c #E1E0DE",
+"t. c #E2E1DE",
+"y. c #E2E2E2",
+"u. c #E4E3E3",
+"i. c gray90",
+"p. c #E6E5E5",
+"a. c #E6E6E6",
+"s. c #E7E7E7",
+"d. c #E9E9E9",
+"f. c #EAE9E9",
+"g. c #EBEAE8",
+"h. c #EBEAEA",
+"j. c gray92",
+"k. c #ECECEC",
+"l. c #ECEDED",
+"z. c gray93",
+"x. c #EDEEEE",
+"c. c #EEEDED",
+"v. c #EEEEED",
+"b. c #EEEEEE",
+"n. c #EEEFEF",
+"m. c #EFEFEF",
+"M. c #F0F0EF",
+"N. c #F1F1F1",
+"B. c #F3F2F0",
+"V. c gray95",
+"C. c #F2F3F3",
+"Z. c #F3F3F2",
+"A. c #F3F3F3",
+"S. c #F5F4F2",
+"D. c #F4F4F4",
+"F. c gray96",
+"G. c #F7F6F4",
+"H. c #F6F6F6",
+"J. c gray97",
+"K. c #F8F8F8",
+"L. c #F9F9F9",
+"P. c #FBFAF8",
+"I. c gray98",
+"U. c #FBFBFB",
+"Y. c #FDFDFD",
+"T. c #FFFFFE",
+"R. c gray100",
+"E. c None",
+/* pixels */
+"E.E.E.E.E.= z.H.V.C.V.R.d   E.E.",
+"E.E.E.E.E.5 V.P.P.R.R.R.j . E.E.",
+"E.E.E.@ > f M.v.z.V.V.P...: @ E.",
+"6 d ; q S.( ( / _ } } $.x U 9 E.",
+"=.R.=.1.q.A Z Z Z Z N S G D ] * ",
+",.H.{ z.L i m m y y t M H r 8.1 ",
+"=.j.! V.R.P.H.M.g.t.t.9.3.2.,., ",
+"_ y.E H.H.V.z.j.0.-.-.,.=...=., ",
+"Q 1.U B.C.z.j.s.3.,.%.%...{ { < ",
+"U } n M.l.i.y.e.6.+...%.{ ! ! 2 ",
+"b ! x g.I P Y F 2.%.{ ..' _ W 3 ",
+"h x ) e.U w. at .+.;.%._ _ E W g % ",
+"s 1.1.X.J J ..! E n z l k 4 o   ",
+". @ + + X e P.H.z.s.i.n.=.$ E.E.",
+"E.E.E.E.E.a R.R.R.P.P.H.i.& E.E.",
+"E.E.E.E.E.- q 8 8 7 7 q 7 o E.E."
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kfax.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kfax.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kfax.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,132 @@
+/* XPM */
+static char *kfax[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 94 2",
+"   c #000000",
+".  c gray4",
+"X  c #131313",
+"o  c #1C1C1C",
+"O  c #212121",
+"+  c gray17",
+"@  c #343434",
+"#  c #3B3B3B",
+"$  c #434343",
+"%  c #4B4B4B",
+"&  c #545454",
+"*  c #5E5E5E",
+"=  c #626262",
+"-  c gray42",
+";  c #717171",
+":  c #797979",
+">  c #286CC6",
+",  c #3474CB",
+"<  c #09C709",
+"1  c #46BA46",
+"2  c #5EBD5C",
+"3  c #62BB62",
+"4  c #74C274",
+"5  c #7FC57E",
+"6  c #79DD79",
+"7  c #568BD3",
+"8  c #DF6363",
+"9  c #DD7777",
+"0  c #E07474",
+"q  c gray52",
+"w  c #8C8C8C",
+"e  c #949494",
+"r  c #9C9C9C",
+"t  c #87BF88",
+"y  c #95BC95",
+"u  c #A09F9E",
+"i  c #A2A2A2",
+"p  c #ACABAB",
+"a  c #B4B4B4",
+"s  c #BCBCBC",
+"d  c #84A3D6",
+"f  c #92AEDD",
+"g  c #96B0DE",
+"h  c #9EBAE1",
+"j  c #9CC79B",
+"k  c #ABC5AB",
+"l  c #AECCAE",
+"z  c #BBC8BB",
+"x  c #B0C7E2",
+"c  c #B5CBE5",
+"v  c #B8C7E2",
+"b  c #BBCDE1",
+"n  c #B8CFE8",
+"m  c #BCD2EC",
+"M  c #DB8383",
+"N  c #DA8F8F",
+"B  c #DD9595",
+"V  c #DE9999",
+"C  c #DDA0A0",
+"Z  c #DCBABA",
+"A  c #C3C3C3",
+"S  c #C7CFC7",
+"D  c #CACACA",
+"F  c #CED0D3",
+"G  c #CED1D8",
+"H  c #DEC3C3",
+"J  c #D3D3D3",
+"K  c #D2D5DB",
+"L  c #D5D8DF",
+"P  c #DFD2D2",
+"I  c #D9D6D9",
+"U  c #DBDADB",
+"Y  c #D6D9E0",
+"T  c #D9DBE1",
+"R  c #DEE3E3",
+"E  c #E3DADA",
+"W  c #E4E1DD",
+"Q  c #E4E4E4",
+"!  c #E4E5EC",
+"~  c #E7E8E8",
+"^  c #E9E6E2",
+"/  c #EDE9E5",
+"(  c #EBEBEB",
+")  c #E4EDF7",
+"_  c #E8ECF3",
+"`  c #ECF2F2",
+"'  c #F2EEEB",
+"]  c #F4F1ED",
+"[  c #F2F2F2",
+"{  c #F5F7FB",
+"}  c #F9F6F2",
+"|  c #FCF9F5",
+" . c #FCFCFC",
+".. c None",
+/* pixels */
+"......................& ] ( ( ( ~ ~ ~ ( ~ ~ ^ ~ E $ ............",
+"......................&  . . . . . . . . . . . .[ @ ............",
+"......................=  .{ { {  . . . . . . . .` #   ..........",
+"....................& p ( ] } } } {  . . . . . .~ r @ ..........",
+"....................* A ~ ( ( ( ( ( ( ] ] ` [ { Q s % ..........",
+"..............# ; % : A Q Q ~ ^ ~ ~ ( ( ( ( ( ] E s = @ =   ....",
+"..% * @   ....: { [ I D ~ ^ Q ~ ( ~ ( ( _ ] ] { Q A s a r . ....",
+"+ A I D = ; - r  . .D u p p p p p p p p p p p p i r s I s @ ....",
+"e  . . .J W s ~ { _ ! Y U Y L L L K K K G G G F K D z U Q z + ..",
+"r  . . .F z a  .v d f f f f f f f f f g g f f g U 5 6 4 J Q :   ",
+"r  . .{ D s D  .h > , , , , , , , , , , , , , 7 T 2 < 1 I Q w   ",
+"r  .} [ D s I  .) m K n m m m n n c c c c c x b E L k S I I q   ",
+"r  .` ( D s I  . . . .| | | | } ] ] / / ^ ^ W W U U U I J J q   ",
+"u } ( ~ A s ~  . .{ { [ [ [ ( ( ( R J U W I J I I J F D J J w   ",
+"u ` Q ~ A s Q  .{ { [ ] ] ` ( ~ ( J F J J D I F J D U D D D w   ",
+"i ! Q E A s (  .{ [ ] ` ( ( ~ ~ Q W J J U J D J I D D D D D w   ",
+"i ~ U I s s ( { } ] ` ( ( ( Q ! Q F D I J S J D D D U A D S w . ",
+"i E I J s A ( } ` ( ` ( ~ ~ Q Q R U D J I D J J J D D A A A w   ",
+"i U J J s s ( ] ( ` ( ~ Q Q Q E W J D I J D F F D D J A A A w . ",
+"i J F D a A ( ` ( ^ ~ E Q Q U U U J J J D A I D D A P A A A w X ",
+"i F D D a A ~ ` E B E N E U y J U F S D J D A D D D A s s s w X ",
+"i D A z a s ~ ` 9 0 M 8 ! t 3 U I S J I A A U D A D U A s s w X ",
+"i D A s p A G ( V H V Z Q j l I J J D J D D D D A A A A s i ;   ",
+"= a p i s ~ A D R Q R R I U I J J D D D D A A A A A s a r ; O   ",
+"& Q F F ~ [ ( I D A I J J J J J J D D D S A Z s p u e : $ .   ..",
+"+ U ] ~ E U L J D s p p s z s s s a a p p i r i p p %       ....",
+"  X O O O O o o o o @ s (  ._ ~ R U U J T R ( _ ] D # ..........",
+"....................+ A [  . . . . . . .{ { ` ] ( F $ ..........",
+"....................+ F }  . . .{ } [ ] ] ( ( ~ ~ L $ ..........",
+"....................+ E ( ` ( ( ] ( ( ( ( ( Q Q Q ] % ..........",
+"....................o s F A D A A D D A A D D A D D @ ..........",
+"....................    .     .     .   .     .       .........."
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kghostview-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kghostview-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kghostview-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,208 @@
+/* XPM */
+static char *kghostview-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 186 2",
+"   c black",
+".  c #000205",
+"X  c #010306",
+"o  c #020306",
+"O  c #020406",
+"+  c #020407",
+"@  c #030406",
+"#  c #030407",
+"$  c #04070B",
+"%  c #07080A",
+"&  c #0D0909",
+"*  c #180A00",
+"=  c #1B0C00",
+"-  c #2D1A00",
+";  c #2A2E35",
+":  c #2E3136",
+">  c #2F3237",
+",  c #303439",
+"<  c #3B3E50",
+"1  c #6C4D22",
+"2  c #4D4B4B",
+"3  c #49515D",
+"4  c #4B535F",
+"5  c #4C535F",
+"6  c #4D5561",
+"7  c #4C5563",
+"8  c #4E5664",
+"9  c #696C8F",
+"0  c #626B97",
+"q  c #6170A1",
+"w  c #7B81A4",
+"e  c #7892C1",
+"r  c #7CABEE",
+"t  c #924F00",
+"y  c #A06928",
+"u  c #BE8A29",
+"i  c #B78B31",
+"p  c #B98D59",
+"a  c #A58269",
+"s  c #C5922C",
+"d  c #F1B33C",
+"f  c #C99351",
+"g  c #F5BB46",
+"h  c #F7BA45",
+"j  c #E8BE68",
+"k  c #FFDC7A",
+"l  c #82819C",
+"z  c #968481",
+"x  c #8487A2",
+"c  c #898AA3",
+"v  c #9295AE",
+"b  c #999CB4",
+"n  c #92A3BF",
+"m  c #9AA1BA",
+"M  c #AAA8B9",
+"N  c #B0AEBD",
+"B  c #8C9FC1",
+"V  c #9FB5DA",
+"C  c #84ADEA",
+"Z  c #93BEED",
+"A  c #95BEEF",
+"S  c #A0A5C4",
+"D  c #A3ACC2",
+"F  c #A9ADC4",
+"G  c #A9AFC8",
+"H  c #A9B4CB",
+"J  c #AEB8C8",
+"K  c #AFB9C9",
+"L  c #ACB9CE",
+"P  c #B5B5C5",
+"I  c #B1BACA",
+"U  c #B0BBCF",
+"Y  c #B5BECD",
+"T  c #B6BFCD",
+"R  c #A0BDE4",
+"E  c #9CCAF4",
+"W  c #B7C0CE",
+"Q  c #BBC2CE",
+"!  c #B5C5DE",
+"~  c #B8C2D1",
+"^  c #B9C2D5",
+"/  c #BEC1D2",
+"(  c #BFCADC",
+")  c #A3C4EF",
+"_  c #A9C8EC",
+"`  c #AECBEA",
+"'  c #AFCDEC",
+"]  c #A1C9F5",
+"[  c #A6CCF1",
+"{  c #ABD0F1",
+"}  c #ABD2F3",
+"|  c #B4D1EC",
+" . c #B2DCF4",
+".. c #BCE4FB",
+"X. c #D9CBBF",
+"o. c #FFF799",
+"O. c #FFF89A",
+"+. c #C6C6CF",
+"@. c #C1C1D1",
+"#. c #C3C7D3",
+"$. c #C3C5D5",
+"%. c #C4C7D7",
+"&. c #CACCD4",
+"*. c #C8CFDC",
+"=. c #C3D1DE",
+"-. c #CBD2DF",
+";. c #D7D4DA",
+":. c #C0CFE8",
+">. c #C7DEED",
+",. c #C8D4E5",
+"<. c #CED3E6",
+"1. c #CED6E4",
+"2. c #CAD5EA",
+"3. c #CCDBE8",
+"4. c #D0D3E4",
+"5. c #D0D5E1",
+"6. c #D0D4E6",
+"7. c #D0D8E5",
+"8. c #D2D9E5",
+"9. c #D2DAE7",
+"0. c #D3DFE7",
+"q. c #D2DAE9",
+"w. c #D6DDEB",
+"e. c #D4DFEF",
+"r. c #DFDDE2",
+"t. c #D6DFF4",
+"y. c #C2E5F3",
+"u. c #C0E0F8",
+"i. c #C3EAF9",
+"p. c #C7EAF8",
+"a. c #CCE5F2",
+"s. c #C9E9F5",
+"d. c #D7E0EF",
+"f. c #D8E0EE",
+"g. c #DCE2EB",
+"h. c #DCE3EE",
+"j. c #DDE4ED",
+"k. c #D3E9F2",
+"l. c #DEE4F0",
+"z. c #DEE5F0",
+"x. c #DFE4F0",
+"c. c #DFE5F0",
+"v. c #DFE6F1",
+"b. c #D8EAF0",
+"n. c #DDF7FD",
+"m. c #DEFAFE",
+"M. c #E5E5E6",
+"N. c #E7E7E7",
+"B. c #E2E6EC",
+"V. c #E3E7EC",
+"C. c #E3E7ED",
+"Z. c #E3E7EE",
+"A. c #E9E8E8",
+"S. c #EBE9ED",
+"D. c #EAEDEE",
+"F. c #EDEDEB",
+"G. c #EFEFED",
+"H. c #E0E6F1",
+"J. c #E2E5F1",
+"K. c #E3E8F0",
+"L. c #E2E8F3",
+"P. c #E3E9F2",
+"I. c #E3EAF4",
+"U. c #E4E9F2",
+"Y. c #E5EAF2",
+"T. c #E4EBF5",
+"R. c #E4EBF6",
+"E. c #E6EBF4",
+"W. c #E7ECF5",
+"Q. c #ECF2FA",
+"!. c #EDF4FE",
+"~. c #EFF4FC",
+"^. c #E8FBFF",
+"/. c #F3F3F3",
+"(. c #F3F5F5",
+"). c #F0F3F9",
+"_. c #F3F6FD",
+"`. c #F2F7FF",
+"'. c #FAF9FA",
+"]. c #FAFEFF",
+"[. c #FCFFFF",
+"{. c #FEFEFE",
+"}. c #FEFFFF",
+"|. c #FFFFFE",
+" X c gray100",
+".X c None",
+/* pixels */
+".Xq.K.U.U.K.g.f.( > .X.X.X.X.X.X",
+".XH. XG.F.G.`.W.d.1.: .X.X.X.X.X",
+".Xh. X/./.(.).T.w.].q., .X.X.X.X",
+".Xh. XA.N.+.P @.%.*.,.L ; .X.X.X",
+".Xh. XM.M H 3.g.8./ ^ :.8   .X.X",
+".XH. XN B i.m.^.n.>.$.2.3   .X.X",
+".XL.S.w Z ..p.s.y. .! <.3   .X.X",
+".XT.;.q r ] } } [ E R 6.6   .X.X",
+".XI.;.9 C ) ' | _ A V 4.6   .X.X",
+".Xv. Xw w u.k.b.a.` G t.6   .X.X",
+".Xj. X&.q S 0.V.=.m S X.2   .X.X",
+".Xh.{.V.( c x v b F z j i * .X.X",
+".Xh. XC.C.g.5.-.8.t.p d o.u = .X",
+".XW. X X]. X!.Q.`.!.H.f h O.s - ",
+".X~ Q W T T K J K J U D y h k 1 ",
+".X$ @ @ @ + + + + + + $ & t a < "
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kghostview.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kghostview.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kghostview.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,248 @@
+/* XPM */
+static char *kghostview[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 210 2",
+"   c black",
+".  c #381E06",
+"X  c #5E3A07",
+"o  c #5D5B7F",
+"O  c #5F5E80",
+"+  c #5E658F",
+"@  c #4E6BAE",
+"#  c #5167A2",
+"$  c #536CAC",
+"%  c #626285",
+"&  c #61678E",
+"*  c #66698B",
+"=  c #6F6E8E",
+"-  c #6E7293",
+";  c #6C759D",
+":  c #706F8E",
+">  c #757593",
+",  c #797793",
+"<  c #7A7A94",
+"1  c #7D7D9A",
+"2  c #6A76A4",
+"3  c #7F819E",
+"4  c #6A88C1",
+"5  c #6698E4",
+"6  c #739EE0",
+"7  c #83460C",
+"8  c #924F08",
+"9  c #965208",
+"0  c #965D22",
+"q  c #8E6035",
+"w  c #BB6F08",
+"e  c #BF780E",
+"r  c #A46B2D",
+"t  c #A36A30",
+"y  c #B4792D",
+"u  c #866045",
+"i  c #C67A0F",
+"p  c #C67C11",
+"a  c #D07D02",
+"s  c #9F8163",
+"d  c #B08350",
+"f  c #DC8501",
+"g  c #DA890F",
+"h  c #DF8F10",
+"j  c #DF921A",
+"k  c #DA9A31",
+"l  c #E09114",
+"z  c #ECAD37",
+"x  c #FFB935",
+"c  c #FFBB39",
+"v  c #C69C6C",
+"b  c #D6A45B",
+"n  c #EBB85D",
+"m  c #E0B474",
+"M  c #F4C44E",
+"N  c #F9CF5C",
+"B  c #F9D05C",
+"V  c #F6CC72",
+"C  c #81819C",
+"Z  c #918C9F",
+"A  c #9D9A98",
+"S  c #8485A1",
+"D  c #8B8CA5",
+"F  c #848DB4",
+"G  c #8D91A0",
+"H  c #8C91AB",
+"J  c #8390B4",
+"K  c #8D9CB5",
+"L  c #9494AD",
+"P  c #9896AE",
+"I  c #9A9AAF",
+"U  c #9599B1",
+"Y  c #9A9CB3",
+"T  c #9FABBE",
+"R  c #A38C81",
+"E  c #A59899",
+"W  c #A09FB6",
+"Q  c #A3A5BC",
+"!  c #A4ADBE",
+"~  c #A8A9BF",
+"^  c #91A3C3",
+"/  c #9EADC5",
+"(  c #9EB0D0",
+")  c #9FBBDC",
+"_  c #83ACE3",
+"`  c #8AADE0",
+"'  c #84B2EB",
+"]  c #8CB1E1",
+"[  c #83B0F5",
+"{  c #87BCFA",
+"}  c #92B4E0",
+"|  c #95B9E3",
+" . c #93BCE8",
+".. c #9BBBE0",
+"X. c #9DBFEC",
+"o. c #A2ADC1",
+"O. c #A1A9CD",
+"+. c #ABABC0",
+"@. c #A4B0C6",
+"#. c #A7B3D1",
+"$. c #A9BADC",
+"%. c #B0AFC0",
+"&. c #B2B3C3",
+"*. c #B4B6C9",
+"=. c #B4B9CC",
+"-. c #B8B7C9",
+";. c #BBBCC7",
+":. c #BCBDCD",
+">. c #A0BFE0",
+",. c #9CC2EE",
+"<. c #9DCBEF",
+"1. c #98C2F4",
+"2. c #9AC2FC",
+"3. c #9FCCFA",
+"4. c #ABC0DA",
+"5. c #B7C1CF",
+"6. c #B3C0D9",
+"7. c #BAC2D4",
+"8. c #B9C6DB",
+"9. c #BBC8D6",
+"0. c #BECADC",
+"q. c #A2C2E4",
+"w. c #AEC6E4",
+"e. c #ADCBE4",
+"r. c #A8CEEB",
+"t. c #A5C8F7",
+"y. c #A2CAFA",
+"u. c #ACCDF0",
+"i. c #A9CDFA",
+"p. c #A6D0EF",
+"a. c #AAD2ED",
+"s. c #A6D2F4",
+"d. c #ABD3F1",
+"f. c #ACD2FA",
+"g. c #B2C9E8",
+"h. c #B7D2E4",
+"j. c #B0D7EF",
+"k. c #B6DBED",
+"l. c #BCD5E3",
+"z. c #BFD8E4",
+"x. c #BCDFED",
+"c. c #B1D1F7",
+"v. c #B2D3FC",
+"b. c #B2D8F2",
+"n. c #B2DCFD",
+"m. c #BCDAF9",
+"M. c #BCE0F2",
+"N. c #BBE2FA",
+"B. c #C6B8AA",
+"V. c #C0BECE",
+"C. c #FFE696",
+"Z. c #FFE897",
+"A. c #FFE99C",
+"S. c #FFFDB3",
+"D. c #FFFEB8",
+"F. c #C4C3CC",
+"G. c #C6CACF",
+"H. c #CECECF",
+"J. c #C2C3D2",
+"K. c #C1C6D8",
+"L. c #C2C9D3",
+"P. c #C2CCDB",
+"I. c #CBCCD2",
+"U. c #CACCDA",
+"Y. c #CED0DE",
+"T. c #D0C9C7",
+"R. c #D2D1D6",
+"E. c #D3D3DB",
+"W. c #D8D5D5",
+"Q. c #C2CDE0",
+"!. c #C5D0E1",
+"~. c #C1D9E3",
+"^. c #CBD1E2",
+"/. c #CCDCE4",
+"(. c #CED8EA",
+"). c #D3D6E2",
+"_. c #D5DAE4",
+"`. c #D4DCEB",
+"'. c #DADEE4",
+"]. c #D9DEEA",
+"[. c #C4E2EE",
+"{. c #C4E3F3",
+"}. c #C4E2F9",
+"|. c #C5EBFF",
+" X c #C9E6F0",
+".X c #CCE5F9",
+"XX c #CBEAF5",
+"oX c #CAEDFB",
+"OX c #D7E2EB",
+"+X c #DBE2EE",
+"@X c #D1ECF2",
+"#X c #D3ECFA",
+"$X c #DCE3F1",
+"%X c #D8E8F6",
+"&X c #D2F1FC",
+"*X c #DCF4FC",
+"=X c #E0E6F1",
+"-X c #E4E9F3",
+";X c #E6EEFA",
+":X c #E9EDF5",
+">X c #EAEFF8",
+",X c #E3F6FC",
+"<X c #E4F9FE",
+"1X c #ECF1F9",
+"2X c #EBF8FD",
+"3X c #F1F1F4",
+"4X c #F1F5FB",
+"5X c #F4F8FE",
+"6X c #FEFEFE",
+"7X c None",
+/* pixels */
+"7X7X!.!.!.!.!.!.P.!.!.!.!.!.!.!.!.o.7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X!.5X6X6X6X6X6X6X6X6X5X1X:X=X].!.o.7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X!.5X6X6X6X6X6X6X6X5X4X1X-X$X].Q.;X! 7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X!.5X6X6XH.H.H.H.G.G.5X1X:X=X].Q.>X$X! 7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X!.5X6X6X6X6X6X6X6X5X5X4X>X-X+XQ.5X-X$Xo.7X7X7X7X7X7X7X7X7X7X",
+"7X7X!.5X6X6X6X6X6X6X6X6X5X4X1X:X$X!.6X5X-X$Xo.7X7X7X7X7X7X7X7X7X",
+"7X7XU.5X6X6XH.H.H.H.H.G.;.&.&.Y._.0.:X:X$X`.`.T 7X7X7X7X7X7X7X7X",
+"7X7XP.4X6X6X6X6X6X6XE.~ &.;.:.J.:.:. at ./ o./ / / / 7X7X7X7X7X7X7X",
+"7X7X!.5X6X6XH.H.F.P I ~ =.0.^.Y.U.K.V.K.Q.:.8.:.K   7X7X7X7X7X7X",
+"7X7X!.5X6X6X6X3XL P o. X*X<X2X2X>X%XU.F.:.h.8.g.K   7X7X7X7X7X7X",
+"7X7X!.5X6X6XH.Z H ^ m.XX at X<X2X2X<X*X#XP.K.K.Q.Q.K   7X7X7X7X7X7X",
+"7X7X!.5X6X6XU.C 4 f.|.&X*X*X*X<X*X#X.X}.P.V.Q.Q.K   7X7X7X7X7X7X",
+"7X7X!.5X6X:X1 C ) p.b.m.{. X X[.[.x.k.a.w.F.K.(.K   7X7X7X7X7X7X",
+"7X7X!.5X6XI.1 2 { n.N.N.|.oXoXoXoXN.m.n.i.:.V.(.K   7X7X7X7X7X7X",
+"7X7X!.5X6X~ < $ 5 ' ,.s.j.j.a.p.p.p.p.<. .>.L.(.K   7X7X7X7X7X7X",
+"7X7X!.5X6X&., $ [ 2.3.y.i.f.f.f.u.y.s.3.X.$.F.`.K   7X7X7X7X7X7X",
+"7X7X!.5X6X&.= # 6 _ ` } ) ,.>.>...) _ 6 _ #.V.].K   7X7X7X7X7X7X",
+"7X7X!.4X6XE.= + [ i.v.m.{..XXXoX}.m.c.i.X.*.=.$XK   7X7X7X7X7X7X",
+"7X7X!.5X6X3X< % 4 | q.w.h.l.P.z.l.e.q...( +.7.$XK   7X7X7X7X7X7X",
+"7X7X!.5X6X6XE.% & X.}.#X*X*X1X,X*X&X}.g.+.+.).$XK   7X7X7X7X7X7X",
+"7X7X!.5X6X6XH.C o ; ) l./._.'._._.z.4.! Q O.W.$XK   7X7X7X7X7X7X",
+"7X7X!.5X6X6X6X4XS o - / /.=X:X-XOX=.U L Y O.B.m A   7X7X7X7X7X7X",
+"7X7X!.5X6X6XG.L.J.D % % > H T U D D D 3 F Z d z k X 7X7X7X7X7X7X",
+"7X7X!.5X6X6X5X4X4X4X_.Y C 1 1 S L &.`.=XE q n S.B h p 7X7X7X7X7X",
+"7X7X!.5X6X6XL.L.L.L.J.L.L.5.5.5.9.9.9.9.s w c A.D.B h e 7X7X7X7X",
+"7X7X!.5X6X6X5X4X4X4X1X1X>X>X>X:X:X:X=X-XT.r f x C.D.N l p 7X7X7X",
+"7X7X!.5X6X5X4X4X4X1X1X1X1X1X>X:X-X-X=X=X$XE.r f c C.D.N l e 7X7X",
+"7X7X!.5X6X6X4X4X5X4X1X1X1X9.9.1X:X-X-X=X+X=XR.t f c C.D.B l g 7X",
+"7X7X!.2X6X5X4X4X4X4X1X1X1X>X>X:X-X-X$X-X$X$X$XE.0 f c Z.D.M j   ",
+"7X7X!.K K K K U K K K K K K K K K K K K K K U K G 8 f c V b v   ",
+"7X7X7X                                            . 9 a y R L   ",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7 9 u , *   "
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kiconedit-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kiconedit-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kiconedit-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,42 @@
+/* XPM */
+static char *kiconedit-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 20 1",
+"  c black",
+". c navy",
+"X c #0000C0",
+"o c blue",
+"O c #008000",
+"+ c #00C000",
+"@ c green",
+"# c red",
+"$ c #C05800",
+"% c #808000",
+"& c #FF8000",
+"* c #FFA858",
+"= c #C0C000",
+"- c yellow",
+"; c #FFDCA8",
+": c #C0C0FF",
+"> c #C0FFC0",
+", c #FFC0C0",
+"< c #FFFFC0",
+"1 c None",
+/* pixels */
+"111111111111   1",
+"11111111111 $** ",
+"1111111111 ;*$* ",
+"111111111 ;*&& 1",
+"      11 ;*&& 11",
+" ,,## 11 $&& 111",
+" ,,##       1111",
+" ;;&*&& 11111111",
+" &&&*&&   111111",
+" <<=-==%% 111111",
+" ===-==%%   1111",
+" >>+ at ++OOOO 1111",
+" +++ at ++OOOO 1111",
+" ::XoXX.X.. 1111",
+" ::XoXX.X.. 1111",
+"            1111"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kiconedit.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kiconedit.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kiconedit.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,280 @@
+/* XPM */
+static char *kiconedit[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 242 2",
+"   c #000000",
+".  c #01010B",
+"X  c #000B00",
+"o  c #0C0500",
+"O  c #0D0B00",
+"+  c #090C09",
+"@  c #000013",
+"#  c #00001B",
+"$  c #001400",
+"%  c #001C00",
+"&  c #130C06",
+"*  c #140E0A",
+"=  c #1A0000",
+"-  c #191007",
+";  c #1D140E",
+":  c #101016",
+">  c #1C1611",
+",  c #1B1812",
+"<  c #000023",
+"1  c #000033",
+"2  c #111120",
+"3  c #1A1A23",
+"4  c #1C1A31",
+"5  c #1E1B39",
+"6  c #002400",
+"7  c #002B00",
+"8  c #003400",
+"9  c #003D00",
+"0  c #1B231B",
+"q  c #290000",
+"w  c #2B0909",
+"e  c #221D16",
+"r  c #2A2405",
+"t  c #2F290F",
+"y  c #22221A",
+"u  c #29271D",
+"i  c #2A281E",
+"p  c #3D2900",
+"a  c #3D2A17",
+"s  c #3B3A00",
+"d  c #273328",
+"f  c #2F3D2E",
+"g  c #3D3A2C",
+"h  c #00004B",
+"j  c #000054",
+"k  c #00005A",
+"l  c #000061",
+"z  c #00006E",
+"x  c #000072",
+"c  c #00007C",
+"v  c #2C2C4C",
+"b  c #2D2D56",
+"n  c #2F2F59",
+"m  c #004D00",
+"M  c #005400",
+"N  c #005F00",
+"B  c #006300",
+"V  c #007700",
+"C  c #007D00",
+"Z  c #3C523E",
+"A  c #460000",
+"S  c #480000",
+"D  c #411A00",
+"F  c #580000",
+"G  c #472F17",
+"H  c #4C331C",
+"J  c #552602",
+"K  c #582702",
+"L  c #592802",
+"P  c #52371E",
+"I  c #52381F",
+"U  c #59391C",
+"Y  c #48362C",
+"T  c #670000",
+"R  c #660909",
+"E  c #770000",
+"W  c #750B0B",
+"Q  c #7B0000",
+"!  c #62320F",
+"~  c #663C17",
+"^  c #603E1F",
+"/  c #454200",
+"(  c #484800",
+")  c #49451E",
+"_  c #5A4806",
+"`  c #575705",
+"'  c #565800",
+"]  c #595600",
+"[  c #5B5A00",
+"{  c #484234",
+"}  c #654014",
+"|  c #7A462F",
+" . c #616100",
+".. c #686900",
+"X. c #737500",
+"o. c #777900",
+"O. c #7A7C00",
+"+. c #707012",
+"@. c #7C7C26",
+"#. c #4B4A64",
+"$. c #476045",
+"%. c #486246",
+"&. c #4A6448",
+"*. c #6D6C55",
+"=. c #796A51",
+"-. c #000083",
+";. c #00008B",
+":. c #000094",
+">. c #000099",
+",. c #0000B5",
+"<. c #0000BB",
+"1. c #0000C2",
+"2. c #0000C8",
+"3. c #544C9B",
+"4. c #76759D",
+"5. c #7B7B9F",
+"6. c #7775A0",
+"7. c #7A78A4",
+"8. c #7C7CE5",
+"9. c #7F7FE9",
+"0. c #008400",
+"q. c #008800",
+"w. c #00BC00",
+"e. c #00C400",
+"r. c #00CA00",
+"t. c green",
+"y. c #7D9E7D",
+"u. c #854200",
+"i. c #964403",
+"p. c #9B4704",
+"a. c #8C4C27",
+"s. c #8E553A",
+"d. c #9F6B3C",
+"f. c #A14B03",
+"g. c #A65300",
+"h. c #AE5700",
+"j. c #A86F3C",
+"k. c #9E5E45",
+"l. c #8F675A",
+"z. c #9C6441",
+"x. c #936B58",
+"c. c #AD6D4F",
+"v. c #AC7645",
+"b. c #AC7E4F",
+"n. c #B37F4C",
+"m. c #FF0202",
+"M. c #FF0B0B",
+"N. c #C35C07",
+"B. c #C76300",
+"V. c #CA6516",
+"C. c #C37A32",
+"Z. c #DF7F3B",
+"A. c #E16E00",
+"S. c #E57100",
+"D. c #F57A0F",
+"F. c #FB7F0F",
+"G. c #F97D13",
+"H. c #858300",
+"J. c #8A8500",
+"K. c #898932",
+"L. c #9FA001",
+"P. c #B5AE00",
+"I. c #BAB400",
+"U. c #ACAC3E",
+"Y. c #909040",
+"T. c #898372",
+"R. c #948163",
+"E. c #9F8567",
+"W. c #9E8B6B",
+"Q. c #9C9C7C",
+"!. c #AA835E",
+"~. c #BD8043",
+"^. c #BE8D5D",
+"/. c #AF8660",
+"(. c #AAAA5C",
+"). c #AEAC77",
+"_. c #BFA57E",
+"`. c #B2B379",
+"'. c #FF8500",
+"]. c #FE8612",
+"[. c #FF8B12",
+"{. c #FF9C34",
+"}. c #C38445",
+"|. c #CC8863",
+" X c #C09273",
+".X c #D6997A",
+"XX c #D89D7D",
+"oX c #ED9C52",
+"OX c #F59241",
+"+X c #FA9D41",
+"@X c #F89C50",
+"#X c #FFA344",
+"$X c #F5A154",
+"%X c #FDAB5B",
+"&X c #FFB05C",
+"*X c #E3B07F",
+"=X c #FBAE60",
+"-X c #FEB362",
+";X c #F5B67A",
+":X c #FDB874",
+">X c #FCBD7D",
+",X c #F5F500",
+"<X c #FEFE00",
+"1X c #D6D67B",
+"2X c #819E81",
+"3X c #ADAB81",
+"4X c #B0AE83",
+"5X c #B4B386",
+"6X c #8181ED",
+"7X c #8484F3",
+"8X c #B9B9F6",
+"9X c #BCBCFA",
+"0X c #BCFABC",
+"qX c #C3A880",
+"wX c #CCA086",
+"eX c #C8AC83",
+"rX c #D3A182",
+"tX c #DCAE8D",
+"yX c #D8BBAB",
+"uX c #F4BD8E",
+"iX c #EBCB9B",
+"pX c #FFCF8F",
+"aX c #F3C094",
+"sX c #F6C09A",
+"dX c #FCCE91",
+"fX c #FED49B",
+"gX c #F1CCB6",
+"hX c #F1CEBB",
+"jX c #F3D2A0",
+"kX c #FADAA6",
+"lX c #FFDDA9",
+"zX c #FFE3AD",
+"xX c #F0F0B5",
+"cX c #F5F5B8",
+"vX c #FBFBBC",
+"bX c #C2C2FE",
+"nX c #C9C9FF",
+"mX c #C4FDC4",
+"MX c #CBFFCB",
+"NX c #FDFDC2",
+"BX c #FFFFC8",
+"VX c None",
+/* pixels */
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX        VXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & , > o   VX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  & d.*XtXY     ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  - v.>X at XuXrX>   ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; b.dX=XG.V.z.*   ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX  ; !.fX-X].S.f.D o   ",
+"                        VXVXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VX",
+"            w W Q Q q   VXVXVXVXVXVXVX  ; !.fX-X[.S.f.J o   VXVX",
+"      VXVX  R M.m.m.F   VXVXVXVXVXVX  ; /.fX-X[.S.f.J o   VXVXVX",
+"      VXVX  T m.M.m.F   VXVXVXVXVX  ; !.fX-X[.A.f.J o   VXVXVXVX",
+"      VXVX  T m.m.m.F   VXVXVXVX  & b.fX-X].S.f.J o   VXVXVXVXVX",
+"            = A A A =           & v.dX-X].S.f.J o   VXVXVXVXVXVX",
+"  > _.qXeX=.G }.n.}.a u.B.C.^.! j.>X%XG.S.f.J o   VXVXVXVXVXVXVX",
+"  e kXlXzXW.} &X%X&XP h.'.#X>X XaXOXD.A.p.J o   VXVXVXVXVXVXVXVX",
+"  e kXlXzXW.U &X%X%XP h.{.:X|.hXuXZ.N.i.J o   VXVXVXVXVXVXVXVXVX",
+"  e iXiXjXR.U $XoX at XH g.+X;XwXgXXXc.a.K o   VXVXVXVXVXVXVXVXVXVX",
+"  . u u u , O r r r o { T.l.yXXXk.| ~ p o VXVXVXVXVXVXVXVXVXVXVX",
+"  0 xXxXvXQ.[ <X,X<X` Y.1XE.x.s.~ _ ..'   VXVXVXVXVXVXVXVXVXVXVX",
+"  y cXNXNXQ. .<X<X<XK.`.).g ) t  .X.o.[   VXVXVXVXVXVXVXVXVXVXVX",
+"  y NXNXBX3X .<X<X<X at .(.U.+.L.( X.O.J. .  VXVXVXVXVXVXVXVXVXVXVX",
+"  , 3X4X5X*./ I.P.I.s [ J.J.H.s ' [ ] /             VXVXVXVXVXVX",
+"  + Z Z Z d % M m M % 7 9 9 9 X 6 7 7 % X 7 7 7 $   VXVXVXVXVXVX",
+"  0 mXmXMX2XB t.t.t.M 0.r.r.w.% C 0.0.B 6 0.0.q.9   VXVXVXVXVXVX",
+"  0 0X0XmXy.N t.t.t.m 0.e.w.w.% V C 0.N 6 0.C 0.9   VXVXVXVXVXVX",
+"  0 mXmXMX2XN t.t.t.M 0.r.e.w.% C 0.0.B 6 q.0.q.9   VXVXVXVXVXVX",
+"  + &.&.%.f 6 B B B 6 8 m m m X 7 8 8 7 X 8 8 8 %   VXVXVXVXVXVX",
+"  : 4.6.7.#.5 3.3.3.4 j -.c c @ k l l h @ k j j 1   VXVXVXVXVXVX",
+"  3 bXbXnX5.n 7X7X7Xv -.2.1.<.# ;.>.>.x < -.-.-.j . VXVXVXVXVXVX",
+"  3 9XbXnX5.b 7X6X6Xv -.1.<.<.< ;.:.:.x < -.-.-.h . VXVXVXVXVXVX",
+"  3 8X9XbX5.b 9.8.6Xv c 1.<.,.# ;.:.:.z < -.c -.h . VXVXVXVXVXVX",
+"    3 3 3 : . 2 2 2 . @ # # #   @ @ @ .   @ @ @ .   VXVXVXVXVXVX",
+"                                                    VXVXVXVXVXVX"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kolourpaint-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kolourpaint-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kolourpaint-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,219 @@
+/* XPM */
+static char *kolourpaint-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 197 2",
+"   c black",
+".  c #060000",
+"X  c #080000",
+"o  c #0D0400",
+"O  c #0E0700",
+"+  c #130606",
+"@  c #140600",
+"#  c #150C00",
+"$  c #190C00",
+"%  c #1B0D03",
+"&  c #111100",
+"*  c #211607",
+"=  c #241302",
+"-  c #271906",
+";  c #2E1E06",
+":  c #35210B",
+">  c #36250D",
+",  c #35280F",
+"<  c #382509",
+"1  c #3A2414",
+"2  c #4C1919",
+"3  c #432D0B",
+"4  c #44290B",
+"5  c #4B2512",
+"6  c #4D2F1A",
+"7  c #4F3B19",
+"8  c #553711",
+"9  c #573C1C",
+"0  c #5F4429",
+"q  c #62471A",
+"w  c #664816",
+"e  c #674C1E",
+"r  c #694919",
+"t  c #744D1D",
+"y  c #674D2C",
+"u  c #6B5123",
+"i  c #734425",
+"p  c #316AFF",
+"a  c #3F6FF9",
+"s  c #4772F3",
+"d  c #009B00",
+"f  c #009C01",
+"g  c #3DBB4B",
+"h  c #76BA3E",
+"j  c #52BF57",
+"k  c #804A2A",
+"l  c #975C23",
+"z  c #8F6019",
+"x  c #94631B",
+"c  c #986615",
+"v  c #956631",
+"b  c #91653B",
+"n  c #957234",
+"m  c #AF7E2E",
+"M  c #A57431",
+"N  c #A27C37",
+"B  c #B47E26",
+"V  c #876546",
+"C  c #8D714F",
+"Z  c #9D7E52",
+"A  c #FC0000",
+"S  c #FD370F",
+"D  c #FA3A3D",
+"F  c #CC651D",
+"G  c #F04415",
+"H  c #FF4D2C",
+"J  c #FC6216",
+"K  c #EF6021",
+"L  c #FF454E",
+"P  c #9CB73D",
+"I  c #BB8731",
+"U  c #B0BC3F",
+"Y  c #89B943",
+"T  c #8CBF5D",
+"R  c #A6804D",
+"E  c #AB8743",
+"W  c #AD8751",
+"Q  c #B88946",
+"!  c #BF9B59",
+"~  c #A0BD4D",
+"^  c #A8BC47",
+"/  c #AFB75F",
+"(  c #BEB64D",
+")  c #ACD46F",
+"_  c #B3CE70",
+"`  c #C18F37",
+"'  c #DB9728",
+"]  c #D39C31",
+"[  c #C5AA3D",
+"{  c #F28F31",
+"}  c #FA9621",
+"|  c #E1A031",
+" . c #E1A53A",
+".. c #FDA726",
+"X. c #F9AF32",
+"o. c #FFB220",
+"O. c #FFB425",
+"+. c #FFB525",
+"@. c #FFB922",
+"#. c #FFB825",
+"$. c #FFBB32",
+"%. c #FFBC31",
+"&. c #C4994B",
+"*. c #D5A84E",
+"=. c #D8A751",
+"-. c #FF9053",
+";. c #FC9D71",
+":. c #EBB347",
+">. c #F4A248",
+",. c #FDA44B",
+"<. c #FABB45",
+"1. c #FABC44",
+"2. c #FFBD43",
+"3. c #FFC228",
+"4. c #FFC643",
+"5. c #FBC651",
+"6. c #FFCA53",
+"7. c #FFCA56",
+"8. c #FECD50",
+"9. c #FFCC51",
+"0. c #FFCB58",
+"q. c #FFCB59",
+"w. c #FFCB5A",
+"e. c #FFCE5E",
+"r. c #FFD455",
+"t. c #FFD45F",
+"y. c #F4C865",
+"u. c #F5CC6A",
+"i. c #FFCF62",
+"p. c #FFD265",
+"a. c #FFD661",
+"s. c #FFD767",
+"d. c #FFD368",
+"f. c #FFD66D",
+"g. c #FFD86B",
+"h. c #FFDE6E",
+"j. c #F7D374",
+"k. c #FFD770",
+"l. c #FFD871",
+"z. c #FFDA74",
+"x. c #FFDD77",
+"c. c #FFDC79",
+"v. c #FFDD7B",
+"b. c #FFDD7C",
+"n. c #FFDF7F",
+"m. c #FFE06A",
+"M. c #8FA1D2",
+"N. c #9EA7C2",
+"B. c #83A5FB",
+"V. c #84A8FF",
+"C. c #A9B5DB",
+"Z. c #B5B6CA",
+"A. c #9AD792",
+"S. c #BBC1B6",
+"D. c #BBCAD0",
+"F. c #E6D18C",
+"G. c #E8DE84",
+"H. c #E8DB9F",
+"J. c #F4DF84",
+"K. c #F9E284",
+"L. c #FFE080",
+"P. c #FFE082",
+"I. c #FFE284",
+"U. c #FFE286",
+"Y. c #FFE387",
+"T. c #FFE482",
+"R. c #FFE48A",
+"E. c #FFE78E",
+"W. c #FFE884",
+"Q. c #FFE88E",
+"!. c #FFE98F",
+"~. c #FFEC8E",
+"^. c #FBE391",
+"/. c #FFE790",
+"(. c #FFE993",
+"). c #FFEB96",
+"_. c #FFEF99",
+"`. c #FFEF9E",
+"'. c #FFF098",
+"]. c #FFF59C",
+"[. c #EBECBE",
+"{. c #F4E5A1",
+"}. c #F4EDA6",
+"|. c #FFF0A1",
+" X c #FFF3A0",
+".X c #FFF4A4",
+"XX c #FDF3AF",
+"oX c #FDFAB6",
+"OX c #FFFDB1",
+"+X c #FFFCB4",
+"@X c #FFFFB5",
+"#X c #FFFFB6",
+"$X c #FFFDBA",
+"%X c #FFFDBB",
+"&X c #CFD2CC",
+"*X c #C3CEF1",
+"=X c None",
+/* pixels */
+"=X=X=X=X=X=X5 k b R W V 6 X =X=X",
+"=X=X=X=X2 i Q / J._.&X*XZ.C % =X",
+"=X=X=X+ v ( ) A._ G.C.V.B.[.Z . ",
+"=X=XO M 6.h g j T K.M.p a D.{.1 ",
+"=X  l 2.r.U f d Y !.N.s S.oX%X0 ",
+"=Xw ,.;.-.[ P ^ ~ U.!.H.}.#X%Xy ",
+"& F H L D >.s.l.v.J.E._..X+XXX9 ",
+"8 ..S A K 5.e.d.l.n.R.).].#XF.: ",
+"x 3.J G { 9.0.p.l.n.U.(.`.#X! o ",
+"B #.} X.4.9.7.i.f.x.U.E.].^.t   ",
+"I +.+.$. .*.0.e.g.x.n.!.].&.$ =X",
+"N %.o.' - * :.t.y.j.W.T.=.4 =X=X",
+"7 0. at .c =X3 <.` > , u r =   =X=X",
+"  E m.] z | 1.< =X=X=X=X=X=X=X=X",
+"=X@ n u.h.a.m   =X=X=X=X=X=X=X=X",
+"=X=X  ; e q # =X=X=X=X=X=X=X=X=X"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kolourpaint.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kolourpaint.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kolourpaint.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kolourpaint[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #0A0300",
+"X  c #0C0800",
+"o  c #110505",
+"O  c #150A02",
+"+  c #1D0E05",
+"@  c #1F0A0A",
+"#  c #1C1104",
+"$  c #220F04",
+"%  c #251305",
+"&  c #2D1C09",
+"*  c #281407",
+"=  c #311D0A",
+"-  c #341D03",
+";  c #3D2010",
+":  c #452C0D",
+">  c #482400",
+",  c #482B15",
+"<  c #4C300E",
+"1  c #4F3112",
+"2  c #502E0E",
+"3  c #562C16",
+"4  c #52340C",
+"5  c #56380D",
+"6  c #583615",
+"7  c #633B1D",
+"8  c #693A1C",
+"9  c #64361C",
+"0  c #703D1F",
+"q  c #6C3C21",
+"w  c #69440F",
+"e  c #664213",
+"r  c #734B13",
+"t  c #74471B",
+"y  c #6C4023",
+"u  c #724224",
+"i  c #794A26",
+"p  c #346BFF",
+"a  c #3B68F7",
+"s  c #396EFF",
+"d  c #3E71FF",
+"f  c #4371F9",
+"g  c #5778E7",
+"h  c #577EF2",
+"j  c #009B00",
+"k  c #089F06",
+"l  c #19970A",
+"z  c #0AA40C",
+"x  c #26A213",
+"c  c #24AF38",
+"v  c #2BB02F",
+"b  c #3BB63C",
+"n  c #4AA728",
+"m  c #47A420",
+"M  c #61B749",
+"N  c #64BA54",
+"B  c #7BB045",
+"V  c #66C76F",
+"C  c #6CC96E",
+"Z  c #76CC79",
+"A  c #5C81EB",
+"S  c #5F87FB",
+"D  c #7E8FCD",
+"F  c #6A87D7",
+"G  c #6486E1",
+"H  c #648DFE",
+"J  c #8B5C1A",
+"K  c #915B1E",
+"L  c #8B5C25",
+"P  c #86542F",
+"I  c #8C5F3B",
+"U  c #966216",
+"Y  c #8C6428",
+"T  c #946728",
+"R  c #956C2E",
+"E  c #996922",
+"W  c #926439",
+"Q  c #976939",
+"!  c #A9721C",
+"~  c #AA6E22",
+"^  c #A16926",
+"/  c #B36A24",
+"(  c #B77C26",
+")  c #BC7E23",
+"_  c #B07835",
+"`  c #9D7244",
+"'  c #A37A49",
+"]  c #A47742",
+"[  c red",
+"{  c #F80801",
+"}  c #FF0B15",
+"|  c #F51D0A",
+" . c #FF1C1D",
+".. c #FD1E12",
+"X. c #F2240B",
+"o. c #EA591F",
+"O. c #FF5213",
+"+. c #EB4716",
+"@. c #EC4C24",
+"#. c #F8781C",
+"$. c #EE6419",
+"%. c #EC672B",
+"&. c #FC732A",
+"*. c #FD5656",
+"=. c #FE6969",
+"-. c #FF6972",
+";. c #FC7563",
+":. c #FC7A73",
+">. c #FF7C80",
+",. c #81A934",
+"<. c #87B130",
+"1. c #8EB331",
+"2. c #BD812B",
+"3. c #AEBC3F",
+"4. c #8CBD40",
+"5. c #85B454",
+"6. c #9EB648",
+"7. c #AD8C5F",
+"8. c #B38041",
+"9. c #B9965A",
+"0. c #B39561",
+"q. c #87CB7E",
+"w. c #96C96F",
+"e. c #A4C24F",
+"r. c #ADD264",
+"t. c #C18225",
+"y. c #C8882C",
+"u. c #C98F38",
+"i. c #C38030",
+"p. c #D28B24",
+"a. c #D28F2A",
+"s. c #DB9521",
+"d. c #D49737",
+"f. c #D8A13C",
+"g. c #E78422",
+"h. c #EE8932",
+"j. c #E69E2C",
+"k. c #E19621",
+"l. c #FF8026",
+"z. c #FF9027",
+"x. c #F39530",
+"c. c #EB9835",
+"v. c #FFAC1C",
+"b. c #E9A42B",
+"n. c #E9A738",
+"m. c #E8A537",
+"M. c #FFAE21",
+"N. c #F9AD2B",
+"B. c #FAA937",
+"V. c #FEB324",
+"C. c #FEB42B",
+"Z. c #FDBB2A",
+"A. c #FFB732",
+"S. c #FCB439",
+"D. c #FDB832",
+"F. c #FFBD3A",
+"G. c #F5B036",
+"H. c #C99848",
+"J. c #C69D55",
+"K. c #D19A43",
+"L. c #CEBE4B",
+"P. c #DDA442",
+"I. c #DEA648",
+"U. c #D7A956",
+"Y. c #CCAD6C",
+"T. c #D0B670",
+"R. c #D7BC79",
+"E. c #C5AB78",
+"W. c #ED9D42",
+"Q. c #FB847A",
+"!. c #EBA743",
+"~. c #EEBC44",
+"^. c #E6B854",
+"/. c #FCBC43",
+"(. c #F0B955",
+"). c #E5BB65",
+"_. c #FDC02C",
+"`. c #FFC23D",
+"'. c #DAC04D",
+"]. c #C5C260",
+"[. c #D9C07C",
+"{. c #D9D176",
+"}. c #EFCC56",
+"|. c #FEC245",
+" X c #FFC54B",
+".X c #FECA4B",
+"XX c #FEC752",
+"oX c #FEC758",
+"OX c #FFCA53",
+"+X c #FFCC5B",
+"@X c #FDD25B",
+"#X c #F0D059",
+"$X c #E7C668",
+"%X c #E3C87F",
+"&X c #E5D276",
+"*X c #FECE61",
+"=X c #F8CC6C",
+"-X c #F4C666",
+";X c #FED164",
+":X c #FFD46B",
+">X c #FFD96D",
+",X c #F1D764",
+"<X c #FDD572",
+"1X c #FFD973",
+"2X c #FEDC7B",
+"3X c #F5D67F",
+"4X c #FFE07C",
+"5X c #A9A094",
+"6X c #B3B8BD",
+"7X c #85A1FF",
+"8X c #9AB3FE",
+"9X c #96A6E4",
+"0X c #A6B2DA",
+"qX c #A3BCFF",
+"wX c #A3DDA8",
+"eX c #B7D6A3",
+"rX c #A8E1AC",
+"tX c #B8C2C7",
+"yX c #BEC7D2",
+"uX c #A7C0FF",
+"iX c #B0C0EA",
+"pX c #B5C6FF",
+"aX c #FF8084",
+"sX c #FEB2B0",
+"dX c #C5CAB9",
+"fX c #D6CDA1",
+"gX c #DAD2A4",
+"hX c #CBC7A6",
+"jX c #DFE3BA",
+"kX c #EBCF82",
+"lX c #EADC9C",
+"zX c #E9D894",
+"xX c #F0DA83",
+"cX c #FFE183",
+"vX c #FEE58A",
+"bX c #FEE98C",
+"nX c #F6E385",
+"mX c #FCE591",
+"MX c #FEEA93",
+"NX c #FEEE9B",
+"BX c #F1E39C",
+"VX c #FFF28F",
+"CX c #FFF29C",
+"ZX c #FFF498",
+"AX c #ECE5A6",
+"SX c #F9EFA7",
+"DX c #F8EFA8",
+"FX c #FEF2A3",
+"GX c #FEF5AA",
+"HX c #FFF8AD",
+"JX c #FEFBB3",
+"KX c #FEFEBC",
+"LX c #F7F3B3",
+"PX c #CFDCFF",
+"IX c #D6E1FF",
+"UX c #FFFFC2",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX8 8 8 q u y 8 6 , $ YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX  q u P ` 9.Y.R.[.T.0.Q u ;   YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYX6 q W 9.].vXVXZXZXGXyXiX0X5X` 3 O YXYXYXYX",
+"YXYXYXYXYXYXYXYXYX, 3 P U.2Xr.N &XMXMXBX9XpXIXPX8XdX0.q o YXYXYX",
+"YXYXYXYXYXYXYXYX; u 8.;X#X6.wXeX$XnXbXgX7XuX8XuX8X0XKX7.3   YXYX",
+"YXYXYXYXYXYXYXo y H.#X4.M C wXwXw.M {.VX6XS H H H dXUXLXI * YXYX",
+"YXYXYXYXYXYXo u I. at X1.c C C C Z V 5.xXVXgXd d d a A jXUXE.3   YX",
+"YXYXYXYXYX$ i P..XOX'.n v b b b B 3XbXlXA s d d f g dXUXAXi . YX",
+"YXYXYXYX  q P..X.XXX+XL.k z z z 6.cXbXzXg p s G gXAXJXKXKXW + YX",
+"YXYXYXYX3 ) &.F..X}.+X3.j j j j x &XbXbXzXD a F ZXHXKXUXKX` + YX",
+"YXYXYX+ E B.:.W.S.B.oX<.l B 6.m l ].vXvXMXbXfXhXGXHXJXKXKX' $ YX",
+"YXYXYX7 b.S.sXQ.;.*.%.}.^.;X<X:X$X3XcXvXMXMXZXFXGXHXJXKXKX] % YX",
+"YXYX# / z.&.=.aXaX-. at .+X@X;X:X<X4X4XcXcXvXMXNXFXGXHXJXKXLXQ $ YX",
+"YXYX6 g... . . . .} %. at X+X;X:X>X1X4XcXcXvXMXNXNXFXHXHXKXlXL . YX",
+"YX  ^ V.#.{ { [ X.o.!.OX+X+X:X:X<X2X4XcXvXMXMXNXSXGXHXUXR.t   YX",
+"YX& p.V._.$.[ [ | ~.OXXXoX;X;X:X<X2X4XcXvXbXMXNXSXFXHXJXJ.2   YX",
+"YX1 b.V.V.#.{ +.X.h..XXX+X+X;X:X>X1X2XcXvXvXMXNXNXGXHXDX_ = YXYX",
+"YXr N.M.Z.O.{ n.x.c..XXXXX+X+X:X>X1X2XcXcXvXMXNXNXSXHXkXL . YXYX",
+"YXL C.M.V.#.o.D.`.|.|. XXX+X+X:X>X1X2X2XcXvXmXNXNXFXGXH.6   YXYX",
+"YXT D.M.M.V.Z.A.F.F.|. XOX+X+X;X:X<X1X2XcXvXvXMXNXGXkX~ # YXYXYX",
+"YXR F.v.M.M.A.A.F. X;X>XOXOX+X;X:X>X1X4X4XvXvXMXNXNXK.e   YXYXYX",
+"YXR |.v.M.M.C.A.G.u.T H.:XOX+X;X;X:X<X2X4XcXvXMXCX).~ # YXYXYXYX",
+"YXY +XM.M.M.C.A.( =   * P.OX+X*X<X4X1X4X4XcXbXMX$Xy.<   YXYXYXYX",
+"YXe =XD.v.M.V.j.:   YX  2.XX+X;X-X-X<XvXvXvX2X^.) 6   YXYXYXYXYX",
+"YX% U.:Xv.v.V.)   YXYXO d..XoXd.r : 6 Y H.K.) J =   YXYXYXYXYXYX",
+"YX  E cX|.v.V.!   YXYXr G..Xm.5         . # X     YXYXYXYXYXYXYX",
+"YXYX- I.MX|.v.s.& > ~ a. X/.J   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYX  w (.NX:XC.s.p.j.S.|.m.& YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYX  r !.MXNX1X+X.X+X+X2.  YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYX  4 2.(.2XMXmX=Xn.5   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXX 5 U t.a.! 6   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYX    . X     YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kooka-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kooka-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kooka-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,190 @@
+/* XPM */
+static char *kooka-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 168 2",
+"   c black",
+".  c #040404",
+"X  c #0F0F00",
+"o  c gray5",
+"O  c #111111",
+"+  c #171713",
+"@  c gray8",
+"#  c #181818",
+"$  c #353531",
+"%  c gray23",
+"&  c #474547",
+"*  c #494949",
+"=  c #4B494B",
+"-  c gray29",
+";  c #4B4B4B",
+":  c #4F4D4B",
+">  c #4C4C4C",
+",  c #535353",
+"<  c #555355",
+"1  c #565452",
+"2  c #555555",
+"3  c gray34",
+"4  c #5D575D",
+"5  c #585858",
+"6  c gray35",
+"7  c #5E5C59",
+"8  c #666166",
+"9  c #646464",
+"0  c #6E6A68",
+"q  c #747373",
+"w  c #747474",
+"e  c #6FCE6C",
+"r  c #898888",
+"t  c #8B8A8A",
+"y  c #8D8B88",
+"u  c #8C8B8B",
+"i  c #8E8E8E",
+"p  c #939393",
+"a  c #9B9B9B",
+"s  c #9F9C9B",
+"d  c #9F9F9F",
+"f  c #A2A2A2",
+"g  c #A7A4A3",
+"h  c #A5A4A5",
+"j  c #A6A5A5",
+"k  c gray65",
+"l  c #A7A6A6",
+"z  c #A7A7A7",
+"x  c gray66",
+"c  c #A9A9A9",
+"v  c #AAAAAA",
+"b  c gray67",
+"n  c #AEAEAE",
+"m  c #B1B1B1",
+"M  c #B4B2B2",
+"N  c #B5B3B4",
+"B  c gray72",
+"V  c #BEBDBC",
+"C  c #8CBCE7",
+"Z  c #8CBDEA",
+"A  c #9CBDE5",
+"S  c #A5D2A5",
+"D  c #BBDCBB",
+"F  c #8CC0EE",
+"G  c #8CC2EC",
+"H  c #86C5F3",
+"J  c #9FC5ED",
+"K  c #9EC8EE",
+"L  c #90C8F2",
+"P  c #97CFF6",
+"I  c #9DD1F4",
+"U  c #9AD3F8",
+"Y  c #A0C6ED",
+"T  c #ABC4E4",
+"R  c #A2D7F7",
+"E  c #A5D3F6",
+"W  c #A5D6F5",
+"Q  c #AEDCF6",
+"!  c #ABDEFA",
+"~  c #B1C7E5",
+"^  c #B6CCE7",
+"/  c #B0CBEE",
+"(  c #B7CFEE",
+")  c #B8CDE7",
+"_  c #B9CEE7",
+"`  c #BACEE7",
+"'  c #B4D7F6",
+"]  c #B5DDF8",
+"[  c #B3E0FA",
+"{  c #B6E1FB",
+"}  c #B7E2F8",
+"|  c #B8E7FD",
+" . c #BCE6F9",
+".. c #BFEDFF",
+"X. c #CACACA",
+"o. c #C8CACD",
+"O. c #C8CACE",
+"+. c #CFCDCB",
+"@. c #CAD8CA",
+"#. c #D0D0D0",
+"$. c #D2D2D2",
+"%. c #D0D3DA",
+"&. c #D7DED3",
+"*. c gray85",
+"=. c #D8DAD8",
+"-. c gainsboro",
+";. c #DDDCDD",
+":. c #DDDDDD",
+">. c gray87",
+",. c #DFDFDF",
+"<. c #CCD4E3",
+"1. c #CED7E5",
+"2. c #CFD6E5",
+"3. c #CAD5E9",
+"4. c #C2D7F1",
+"5. c #C4D7F0",
+"6. c #D0D8E6",
+"7. c #D2DAE8",
+"8. c #D7DEEB",
+"9. c #D5DEEC",
+"0. c #D8DEEB",
+"q. c #D9DEEB",
+"w. c #D8DFEC",
+"e. c #DDDEED",
+"r. c #C4E4FC",
+"t. c #C6E6FC",
+"y. c #C4E9F9",
+"u. c #C7EBFE",
+"i. c #C8E4FB",
+"p. c #C9E5FB",
+"a. c #C9E6FB",
+"s. c #C9E7FB",
+"d. c #CAE5FB",
+"f. c #CAE6FB",
+"g. c #CAE5FC",
+"h. c #CCE7FB",
+"j. c #CAE8FC",
+"k. c #CBEBFC",
+"l. c #CCEBF9",
+"z. c #CFE9FB",
+"x. c #C5F0FF",
+"c. c #CDF1FF",
+"v. c #D1EDF9",
+"b. c #D0ECFC",
+"n. c #E2E2E2",
+"m. c #E4E2E0",
+"M. c #E5E3E1",
+"N. c #E4E4E4",
+"B. c #E6E6E6",
+"V. c #E7E7E7",
+"C. c #E9E6E5",
+"Z. c #E8E8E7",
+"A. c #EBEAE8",
+"S. c #ECECEC",
+"D. c #EEEEEE",
+"F. c #E0E5F1",
+"G. c #F3F3F3",
+"H. c #F4F4F4",
+"J. c #F7F6F4",
+"K. c gray97",
+"L. c #F8F8F8",
+"P. c gray98",
+"I. c #F8FAFD",
+"U. c #FCFAF9",
+"Y. c #FFFFFD",
+"T. c #FFFFFE",
+"R. c gray100",
+"E. c None",
+/* pixels */
+"E.  p i w z n.=.=.X.; * * o E.E.",
+"E.> G.D.V.G.L.K.P.P.D.n.P.d   E.",
+"E.% H.n v v x x l v v j =.n   E.",
+"E.  m B s d d d d d d a #.* E.E.",
+"E.E.5 #.t t u u u t t z B . E.E.",
+"E.E.O V M j l x l j h +.q   E.E.",
+"E.E.7 9.T ) ) ` ` ` ^ ~ O.@ E.E.",
+"E.E.s / ' i.i.i.i.g.g.J 3.1 E.E.",
+"E.X O.A r.s.z.z.s.] E F ( u E.E.",
+"E.$ 6.K r.h.k.k.[ R P H J N   E.",
+"E.0 5.L { u.c.x...| ! U Z %.+ E.",
+"E.g 5.G W } y.v.l. .Q I C F.: E.",
+"E.m I.6.<.6.w.q.8.8.6.<.e.R.9 E.",
+"E.f Z.M.M.A.U.R.R.J.C.&.e D 8 E.",
+"E.i n.n.;.;.;.,.,.-.;.=.S @.* E.",
+"E.# 5 5 5 3 2 2 2 , < < 4 &   E."
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kooka.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kooka.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kooka.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,158 @@
+/* XPM */
+static char *kooka[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 120 2",
+"   c #000000",
+".  c #090909",
+"X  c #151515",
+"o  c #181818",
+"O  c #202020",
+"+  c #2A2A2B",
+"@  c #323232",
+"#  c gray24",
+"$  c #404040",
+"%  c #4C4C4C",
+"&  c #535353",
+"*  c #5D5D5D",
+"=  c #656565",
+"-  c #6B6B6B",
+";  c #727272",
+":  c gray47",
+">  c #24B924",
+",  c #23D623",
+"<  c #5ABD5A",
+"1  c #69C069",
+"2  c #6386BD",
+"3  c #6790C5",
+"4  c #6B94CB",
+"5  c #699AD5",
+"6  c #7693C2",
+"7  c #779BCD",
+"8  c #709BD0",
+"9  c #75AADC",
+"0  c #79A1D0",
+"q  c #7AA9DB",
+"w  c #70ACE3",
+"e  c #7BACE0",
+"r  c #7FB7E7",
+"t  c #7DBBEE",
+"y  c #828282",
+"u  c #898989",
+"i  c #939393",
+"p  c #9B9B9B",
+"a  c #A09F9F",
+"s  c #A2A2A2",
+"d  c #ABABAB",
+"f  c #B4B3B4",
+"g  c #BBBBBA",
+"h  c #8CA4CC",
+"j  c #85A6D2",
+"k  c #8FABD3",
+"l  c #9AB1D5",
+"z  c #80B5E6",
+"x  c #81BDED",
+"c  c #8AB6E5",
+"v  c #A4B5D4",
+"b  c #ADB9D4",
+"n  c #ABBAD8",
+"m  c #B0BBD4",
+"M  c #88C188",
+"N  c #9ED09E",
+"B  c #A5CBA5",
+"V  c #ADC9AD",
+"C  c #BAD0BA",
+"Z  c #89C0EB",
+"A  c #86C3F3",
+"S  c #8AC5F2",
+"D  c #8BC8F5",
+"F  c #92C3EB",
+"G  c #9EC1E8",
+"H  c #9CCCEE",
+"J  c #92CBF4",
+"K  c #98CEF5",
+"L  c #9CD2F6",
+"P  c #99D2F8",
+"I  c #B7C2DB",
+"U  c #B9C3DA",
+"Y  c #A1C4E9",
+"T  c #A3D4F2",
+"R  c #A1D6F8",
+"E  c #A6D9F8",
+"W  c #AAD2F5",
+"Q  c #ADDAF2",
+"!  c #AADBF9",
+"~  c #B4DCF3",
+"^  c #B6DCF9",
+"/  c #B9DEF9",
+"(  c #AEE0FB",
+")  c #B3E4FC",
+"_  c #BEE1F2",
+"`  c #BDE2FB",
+"'  c #BDEBFE",
+"]  c #C4C4C4",
+"[  c #CCCAC7",
+"{  c #CCCBC9",
+"}  c #D5D5D4",
+"|  c #D4DAD4",
+" . c #DBDADB",
+".. c #C3CAE0",
+"X. c #CED4E6",
+"o. c #D4DAE8",
+"O. c #D9DCE6",
+"+. c #DADEEC",
+"@. c #C0E1F2",
+"#. c #C3E4FA",
+"$. c #C3EBFD",
+"%. c #CBE3F2",
+"&. c #CAE5FA",
+"*. c #CCEAFC",
+"=. c #C6F1FF",
+"-. c #CBF3FF",
+";. c #D0E7FB",
+":. c #D2EAFB",
+">. c #D4F5FE",
+",. c #E1DAE1",
+"<. c #E2E1DE",
+"1. c #E2E2E2",
+"2. c #EAEAEA",
+"3. c #ECEDF5",
+"4. c #F5F5F4",
+"5. c #F5F6FA",
+"6. c #F8F6F5",
+"7. c #F8F7F8",
+"8. c #FEFEFD",
+"9. c None",
+/* pixels */
+"9.9.9.9.9.9.9.9.9.9.$ u f d s s s p s =   9.9.9.9.9.9.9.9.9.9.9.",
+"9.9.9.9.9.i u y 1 : : 3.8.8.8.8.8.8.8.7.* @ & % % +   9.9.9.9.9.",
+"9.9.9.9.-  .7.7.6.6.7.8.8.8.8.8.8.8.8.8.8.4.4.4.4.2.*   9.9.9.9.",
+"9.9.9.  d 8.8.4.2.2.2.2.,.2.2.2.2.1.2.2.2.2.2.4.8.8.{ . 9.9.9.9.",
+"9.9.9.  u 8.2.s s s s s s s s s s s s s s s s s 1.8.f   9.9.9.9.",
+"9.9.9.9.# 7.} p d d d d d d d d d d d d d d d s [ 8.=   9.9.9.9.",
+"9.9.9.9.. g 4.i a a a a s s a s s s p s s s s p 1.2.O   9.9.9.9.",
+"9.9.9.9.9.; 8.m i p p p p p p p p p p p p i i s 8.s   9.9.9.9.9.",
+"9.9.9.9.9.+ <.1.u i i i i i i i i i i i i i u ] 7.&   9.9.9.9.9.",
+"9.9.9.9.9.  s 4.s y u u u u u y u y u u u y i 1.[ X 9.9.9.9.9.9.",
+"9.9.9.9.9.9.* 2.} i i i i i i i i i i i i i ] 2.-   9.9.9.9.9.9.",
+"9.9.9.9.9.9.O s } [ [ [ [ [ [ [ [ [ [ [ [ [ } g +   9.9.9.9.9.9.",
+"9.9.9.9.9.  f 7.o.b n n n I m m m m m m n n U 6. .$ 9.9.9.9.9.9.",
+"9.9.9.9.9.@ 6.3.3 c n Y G G Y Y Y Y Y Y F n 5 n 8.s   9.9.9.9.9.",
+"9.9.9.9.9.& 8.I q ;.;.&.:.:.:.:.:.:.&.;.&.;.W 7 8.]   9.9.9.9.9.",
+"9.9.9.9.9.u 8.h F &.&.&.&.&.&.;.;.&.&.%.&.&.#.5 4.2.O 9.9.9.9.9.",
+"9.9.9.9.  g 5.2 W &.#.&.&.&.&.&.&.;.&.#.` ~ ^ q X.8.$ 9.9.9.9.9.",
+"9.9.9.9.o 1.X.4 / #.#.&.&.&.*.*.:.#.! K D Z A w n 8.;   9.9.9.9.",
+"9.9.9.9.# 8.n r / #.#.&.*.*.*.:.` E R L K J D t 6 8.s   9.9.9.9.",
+"9.9.9.9.- 8.k J #.#.$.*.*.>.:.$.( ^ ! E R L J D 3 +.} . 9.9.9.9.",
+"9.9.9.9.s 7.0 J ! / &.>.>.:.=.' ' ' ) ( E R K D 9 I 8.+ 9.9.9.9.",
+"9.9.9.. } +.q P L ! ` $.=.=.=.=.=.=.=.) ) E L K x l 8.& 9.9.9.9.",
+"9.9.9.+ 6.I r P R ! ) ' =.-.>.>.>.-.=.' ) ( E L D j 8.u   9.9.9.",
+"9.9.9.& 8.+.0 Z F H T Q _ @.%.%.%._ ~ Q T H F Z q v 8.g   9.9.9.",
+"9.9.9.& 8.8.o.b b b b b b b b b b b b b b b b b U 7.8.] . 9.9.9.",
+"9.9.9.& 4.4.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.8.4.7.4.g . 9.9.9.",
+"9.9.9.% 2.1. . .1.<. .3.8.8.8.8.8.8.8.7.1. .,.C N B 1.g . 9.9.9.",
+"9.9.9.&  . . . . . . . .1.2.7.7.7.4.2. . . .,.1 , > | f . 9.9.9.",
+"9.9.9.% 1.} }  .} }  .} } } } }  .} } }  .}  .V < M  .f . 9.9.9.",
+"9.9.9.@ }  .}  . . .}  .}  . . .}  . . . . . .,.,.,.1.y   9.9.9.",
+"9.9.9.  & d d s d s s d s s s s s a p p p p p p s s y X   9.9.9.",
+"9.9.9.9.                                                9.9.9.9."
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpdf-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpdf-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpdf-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,179 @@
+/* XPM */
+static char *kpdf-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 157 2",
+"   c #0F0000",
+".  c #190000",
+"X  c #1D0000",
+"o  c #200000",
+"O  c #883737",
+"+  c #883D3D",
+"@  c #982F2F",
+"#  c #9F2E2E",
+"$  c #913030",
+"%  c #A60000",
+"&  c #A80000",
+"*  c #A90000",
+"=  c #AB0000",
+"-  c #AC0000",
+";  c #AF0000",
+":  c #B20000",
+">  c #B40000",
+",  c #B70000",
+"<  c #BA0000",
+"1  c #BB0000",
+"2  c #BC0000",
+"3  c #BE0000",
+"4  c #B80A0A",
+"5  c #BC0C0C",
+"6  c #B91010",
+"7  c #824242",
+"8  c #824343",
+"9  c #BF5151",
+"0  c #A06C6C",
+"q  c #AB6363",
+"w  c #A07171",
+"e  c #AA7474",
+"r  c #C10000",
+"t  c #C30000",
+"y  c #C60000",
+"u  c #C70000",
+"i  c #C60505",
+"p  c #C80000",
+"a  c #CA0000",
+"s  c #CC0000",
+"d  c #D10000",
+"f  c #D20000",
+"g  c #D50000",
+"h  c #D70000",
+"j  c #D00808",
+"k  c #DC0000",
+"l  c #D21010",
+"z  c #D31B1B",
+"x  c #D92727",
+"c  c #DB3131",
+"v  c #DB3D3D",
+"b  c #DF3B3B",
+"n  c #E20000",
+"m  c #E60000",
+"M  c #E90000",
+"N  c #EC0000",
+"B  c #ED0000",
+"V  c #E91414",
+"C  c #ED1212",
+"Z  c #F10000",
+"A  c #F20000",
+"S  c #F30000",
+"D  c #F20505",
+"F  c #F40000",
+"G  c #F60000",
+"H  c #F20E0E",
+"J  c #F90000",
+"K  c #FC0000",
+"L  c #FD0000",
+"P  c #FE0000",
+"I  c red",
+"U  c #FE0303",
+"Y  c #F01212",
+"T  c #FD1414",
+"R  c #FE1515",
+"E  c #FE1818",
+"W  c #E42E2E",
+"Q  c #E92A2A",
+"!  c #EB2828",
+"~  c #EF3131",
+"^  c #F52020",
+"/  c #FC3333",
+"(  c #DC5050",
+")  c #EA5454",
+"_  c #FD4141",
+"`  c #F84A4A",
+"'  c #F57878",
+"]  c #888C8C",
+"[  c #899595",
+"{  c #919696",
+"}  c #949C9C",
+"|  c #98A3A3",
+" . c #9BA3A3",
+".. c #9DA5A5",
+"X. c #9EA6A6",
+"o. c #A68F8F",
+"O. c #AC8F8F",
+"+. c #A9A8A8",
+"@. c #AAABAB",
+"#. c #A7B4B4",
+"$. c #AFB8B8",
+"%. c #B2A3A3",
+"&. c #B9A2A2",
+"*. c #B4BCBC",
+"=. c #BABEBE",
+"-. c #AFC1C1",
+";. c #B0C0C0",
+":. c #B2C5C5",
+">. c #B3C6C6",
+",. c #B8C9C9",
+"<. c #C09999",
+"1. c #E28989",
+"2. c #E79B9B",
+"3. c LightCoral",
+"4. c #F08484",
+"5. c #EEBEBE",
+"6. c #C1CFCF",
+"7. c #D3D7D7",
+"8. c #D6D4D4",
+"9. c #D2DBDB",
+"0. c #D4DBDB",
+"q. c #D6DBDB",
+"w. c #D6DDDD",
+"e. c #D8D9D9",
+"r. c #DADCDC",
+"t. c #DCDDDD",
+"y. c gray87",
+"u. c #DEDFDF",
+"i. c #CEE1E1",
+"p. c #D8E0E0",
+"a. c #DAE2E2",
+"s. c #DDE2E2",
+"d. c #DFE4E4",
+"f. c gray89",
+"g. c #E2E5E5",
+"h. c #E2E7E7",
+"j. c #E1EAEA",
+"k. c #E3EFEF",
+"l. c #E5EDED",
+"z. c #E9ECEC",
+"x. c #EAECEC",
+"c. c #EBEEEE",
+"v. c #EDEFEF",
+"b. c #E5F0F0",
+"n. c #E9F5F5",
+"m. c #F5E8E8",
+"M. c gray95",
+"N. c #F3F4F4",
+"B. c gray97",
+"V. c azure",
+"C. c #F4FCFC",
+"Z. c #FBFBFB",
+"A. c #FBFDFD",
+"S. c #FDFDFD",
+"D. c #FEFFFF",
+"F. c gray100",
+"G. c None",
+/* pixels */
+"G.G.G.G.G.G.I ` _ G.G.G.G.G.G.R ",
+"G.G.G.G.G.G.I D S I G.G.G.G.I Y ",
+"G.G.G.G.G.G.G.S H J G.G.G.I S   ",
+"G.G.G.G.G.G.G.I M S G.G.E S . G.",
+"G.G.G.G.G.G.G.G.B M I / B X G.G.",
+"G.- e O.&.0 + %.) M W C X G.G.G.",
+"G.w F.F.F.F.a.F.' ( ^ % G.G.G.G.",
+"m o.F.Z.B.F.7.m.~ b <.m f G.G.G.",
+"k +.A.M.n.V.i.' Q *.V.4 n y G.G.",
+"h $.N.x.l.5.V J q l.n.# k h 3 G.",
+"f -.c.l.4.! x z 6.x.j.@ * s a G.",
+"f >.h.2.R 1.c +.h.f.a.$ G.G.j l ",
+"i >.w.8.v 9 | d.y.y.0.O G.G.G., ",
+"5 ,.q.q.9.a.=.y.y.a.0.7 3 G.G.G.",
+"5 [ { ] { ..} .. .#.-.7 1 G.G.G.",
+"y y r 3 : : * * : 3 r r 3 G.G.G."
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpdf.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpdf.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpdf.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,216 @@
+/* XPM */
+static char *kpdf[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 178 2",
+"   c black",
+".  c #0E0000",
+"X  c #150000",
+"o  c #1A0000",
+"O  c #161717",
+"+  c gray12",
+"@  c #230000",
+"#  c #2B0000",
+"$  c #330000",
+"%  c #3D0000",
+"&  c #242424",
+"*  c #212E2E",
+"=  c #292929",
+"-  c #410000",
+";  c #490000",
+":  c #540000",
+">  c #5C0000",
+",  c #650000",
+"<  c #760000",
+"1  c #7C0000",
+"2  c #6F3F3F",
+"3  c #7E2F2F",
+"4  c #743535",
+"5  c #743B3B",
+"6  c #793232",
+"7  c #6C4242",
+"8  c #655353",
+"9  c #6F5050",
+"0  c #754747",
+"q  c #7E4444",
+"w  c #7C5858",
+"e  c #657979",
+"r  c #697C7C",
+"t  c #746464",
+"y  c #7D6565",
+"u  c #747272",
+"i  c #747D7D",
+"p  c #7E7171",
+"a  c #7B7878",
+"s  c #6E8080",
+"d  c #7A8D8D",
+"f  c #840000",
+"g  c #8A0101",
+"h  c #861919",
+"j  c #940000",
+"k  c #9C0000",
+"l  c #812E2E",
+"z  c #833131",
+"x  c #9A2121",
+"c  c #943232",
+"v  c #A20000",
+"b  c #AB0000",
+"n  c #AA0E0E",
+"m  c #B20000",
+"M  c #BB0000",
+"N  c #B61010",
+"B  c #BB1111",
+"V  c #BE2727",
+"C  c #804C4C",
+"Z  c #8F4545",
+"A  c #894B4B",
+"S  c #885757",
+"D  c #856363",
+"F  c #826B6B",
+"G  c #887979",
+"H  c #AB4A4A",
+"J  c #AF5E5E",
+"K  c #AA6E6E",
+"L  c #A47373",
+"P  c #A57A7A",
+"I  c #C40202",
+"U  c #CB0000",
+"Y  c #CD1E1E",
+"T  c #D20000",
+"R  c #DA0303",
+"E  c #C02C2C",
+"W  c #CD2D2D",
+"Q  c #C63333",
+"!  c #CB3737",
+"~  c #D92D2D",
+"^  c #D03B3B",
+"/  c #E40000",
+"(  c #E30909",
+")  c #EB0000",
+"_  c #E90D0D",
+"`  c #F30000",
+"'  c #F40A0A",
+"]  c #FB0000",
+"[  c #F80909",
+"{  c #FC1212",
+"}  c #E13131",
+"|  c #E73B3B",
+" . c #F02424",
+".. c #FB2525",
+"X. c #FE2D2D",
+"o. c #F33535",
+"O. c #FB3D3D",
+"+. c #CD4040",
+"@. c #D24B4B",
+"#. c #CB7171",
+"$. c #EC4D4D",
+"%. c #ED5151",
+"&. c #F74D4D",
+"*. c #FA4646",
+"=. c #F75454",
+"-. c #F65D5D",
+";. c #FC5353",
+":. c #E26E6E",
+">. c #EB6E6E",
+",. c #E17676",
+"<. c #EE7979",
+"1. c #F56161",
+"2. c #FB7575",
+"3. c #FC7A7A",
+"4. c #808686",
+"5. c #8D8181",
+"6. c #869898",
+"7. c #8F9D9D",
+"8. c #979797",
+"9. c #9B9D9D",
+"0. c #8BA3A3",
+"q. c #96A5A5",
+"w. c #9BA5A5",
+"e. c #9FADAD",
+"r. c #A08383",
+"t. c #AD8282",
+"y. c #A98A8A",
+"u. c #AE9595",
+"i. c #B98B8B",
+"p. c #A3ACAC",
+"a. c #A6B9B9",
+"s. c #A8B2B2",
+"d. c #AFBEBE",
+"f. c #B7B7B7",
+"g. c #B3B9B9",
+"h. c #BBBCBC",
+"j. c #BDC4C4",
+"k. c #C08282",
+"l. c #D98C8C",
+"z. c #D9AEAE",
+"x. c #EF8484",
+"c. c #F58282",
+"v. c #F08E8E",
+"b. c #FA8F8F",
+"n. c #F69191",
+"m. c #FB9292",
+"M. c #FB9B9B",
+"N. c #EDA6A6",
+"B. c #F6A1A1",
+"V. c #FCA5A5",
+"C. c #F8A9A9",
+"Z. c #FAB1B1",
+"A. c #C1C2C2",
+"S. c #C6CBCB",
+"D. c #CCCCCC",
+"F. c #C7D0D0",
+"G. c #C4D9D9",
+"H. c #CCD1D1",
+"J. c #D3D4D4",
+"K. c #D4DBDB",
+"L. c #DBDCDC",
+"P. c #D2E2E2",
+"I. c #DBE1E1",
+"U. c #DDE9E9",
+"Y. c #E5C5C5",
+"T. c #EFCACA",
+"R. c #FFDEDE",
+"E. c #E3E3E3",
+"W. c #E4E9E9",
+"Q. c #EBEBEB",
+"!. c #E5F0F0",
+"~. c #E8F6F6",
+"^. c #EFFBFB",
+"/. c #FEECEC",
+"(. c #F3F3F3",
+"). c #F5FCFC",
+"_. c #FBFCFC",
+"`. c None",
+/* pixels */
+"`.`.`.`.`.`.`.`.`.`.`.`.`.] ] ../ g     `.`.`.`.`.`.`.`.`.`.`.`.",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.) 2./.m.' $     `.`.`.`.`.`.`.`.`.`  .",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.v =.M.) ] U     `.`.`.`.`.`.`.`.] V.>.",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.  / ) ) ` `       `.`.`.`.`.  ` M.` # ",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.  1 ) ) o.] @     `.`.`.`.  ] X.` -   ",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.`.  / / 3.' ;     `.`.`.  ] [ ` -     ",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.`.  g ) c.` ,     `.`.  ] { ` ;       ",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.  / / ) >     `.  [ ..] ;         ",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.  b / ) g       ' O.` :         `.",
+"`.`.`.`.`.`.`.`.`.    `.`.`.`.  v  ./ / $   ( ;.) >         `.`.",
+"`.`.`.    + = & = = = O   + = * k 1.) ) T N 1.) >         `.`.`.",
+"`.`.T Z A.J.(._._._._.J.D D.~._.N.M.R ) ) n.) >         `.`.`.`.",
+"`.  I G._._._._._._._._.S._._.).c.R.! #.M.) g         `.`.`.`.`.",
+"`.k b P._._._._.(.(._._.z._._.).$.Z.Q M./ ] T $     `.`.`.`.`.`.",
+"`.U k U._.(.(.(.(.(.(._.j.).~.).%.o.B.( u.Y ] m       `.`.`.`.`.",
+"`.T g !._.(.(.(.(.(.(.(.g.)._.T.$.C.( y.d.L.T ` f     `.`.`.`.`.",
+"`.T h !.(./.Q.Q.Q.Q.(.(.f.).).:.C.( y.s.Q.U.c / / >     `.`.`.`.",
+"  U l W.Q.Q.Q.Q.Q.W.E.~.g.^.,.Z.] J s.Q.).K.A v ) T @     `.`.`.",
+"  U C E.Q.W.Q.W.E.W.Q.~.i.| &.] U u.S.~.(.J.S k g ) M       `.`.",
+"  U w E.W.E.E.E.E.E.Y.$.] ) / ) K p.W.(.Q.D.D b   v ) v       `.",
+"  U t E.E.E.E.W.I.n.3.{ V @.] V q.J.Q.Q.Q.D.F m   o b / j       ",
+"  U u W.I.L.I.L.M.;._ r.H *./ 9.h.Q.E.E.W.S.p M     $ b T g     ",
+"  U i E.L.L.I.<.V.^ 0.i.b.) K p.I.E.E.Q.Q.A.G M       - m } f   ",
+"  T d I.J.L.I.-.] ^ l.b./ P q.J.I.L.L.I.E.A.a I         - N W @ ",
+"1 U 6.L.J.J.J.z.] ] ] ~ t w.J.L.L.L.L.L.I.A.r U             1 o ",
+"m M 0.J.J.J.J.H.D.P 5.7.4.I.L.J.J.L.L.I.E.A.r T       `.        ",
+"M m q.L.D.J.J.H.J.J.J.L.9.L.L.L.L.J.J.J.L.z.r T o     `.`.      ",
+"m n p.J.J.J.D.J.D.D.J.J.8.L.J.D.J.J.J.K.P.j.r T %     `.`.`.`.`.",
+"M x a.L.H.S.j.j.S.K.K.I.w.J.D.H.J.K.I.L.I.S.e U :     `.`.`.`.`.",
+"m N z z 3 3 6 4 4 4 5 C 0 5 7 7 2 7 9 y G 5.8 I %     `.`.`.`.`.",
+"X k k v v k k k j j j g 1 f g j k v b m M M M m .     `.`.`.`.`.",
+"                                                      `.`.`.`.`."
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpovmodeler-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpovmodeler-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpovmodeler-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,143 @@
+/* XPM */
+static char *kpovmodeler-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 121 2",
+"   c black",
+".  c #000200",
+"X  c #000700",
+"o  c #000900",
+"O  c #000013",
+"+  c #00001B",
+"@  c #050812",
+"#  c #010520",
+"$  c #030A2B",
+"%  c #041036",
+"&  c #022500",
+"*  c #032400",
+"=  c #022406",
+"-  c #002B00",
+";  c #002E22",
+":  c #0C1740",
+">  c #050965",
+",  c #01086C",
+"<  c #056A02",
+"1  c #0F7209",
+"2  c #167D0F",
+"3  c #0B4973",
+"4  c #334876",
+"5  c #050C86",
+"6  c #000094",
+"7  c #0F248C",
+"8  c #16369F",
+"9  c #0E23B3",
+"0  c #1221AD",
+"q  c #1939C5",
+"w  c #2A4994",
+"e  c #2D49BB",
+"r  c #2047CB",
+"t  c #224AD4",
+"y  c #2655D6",
+"u  c #2D5DD2",
+"i  c #344DCD",
+"p  c #2C5DE1",
+"a  c #3169EA",
+"s  c #3A74EC",
+"d  c #3A76ED",
+"f  c #606B8F",
+"g  c #446AD9",
+"h  c #4B78E1",
+"j  c #17840C",
+"k  c #1E860C",
+"l  c #1B8310",
+"z  c #1A8610",
+"x  c #20870E",
+"c  c #218F0D",
+"v  c #208F11",
+"b  c #258A1C",
+"n  c #278D1F",
+"m  c #288F19",
+"M  c #2E9C0F",
+"N  c #2E9516",
+"B  c #2F971F",
+"V  c #299915",
+"C  c #309617",
+"Z  c #278522",
+"A  c #339B22",
+"S  c #309A26",
+"D  c #3C9C37",
+"F  c #2FA317",
+"G  c #39A611",
+"H  c #3BA21C",
+"J  c #3DA31E",
+"K  c #3EB72D",
+"L  c #45AD1F",
+"P  c #48B11B",
+"I  c #48BD2E",
+"U  c #70BD6D",
+"Y  c #79BE77",
+"T  c #4FCD38",
+"R  c #51CE3A",
+"E  c #53CE3C",
+"W  c #5ACE44",
+"Q  c #77D44E",
+"!  c #79D946",
+"~  c #378099",
+"^  c #6281BC",
+"/  c #5184E2",
+"(  c #538CE8",
+")  c #5690E9",
+"_  c #5998F0",
+"`  c #599FF6",
+"'  c #7A9DD9",
+"]  c #6B92F9",
+"[  c #799AF4",
+"{  c #7DB2F9",
+"}  c #85D679",
+"|  c #8E9EC8",
+" . c #9BB1DF",
+".. c #82BCFF",
+"X. c #86BDFC",
+"o. c #86BDFF",
+"O. c #93B0E3",
+"+. c #91D88F",
+"@. c #B9E1B9",
+"#. c #99D2FF",
+"$. c #9FD7FF",
+"%. c #A4DBFF",
+"&. c #AFD1FF",
+"*. c #B5DDFF",
+"=. c #C2F2BB",
+"-. c #C8E6C6",
+";. c #C9EDC5",
+":. c #C6F0C0",
+">. c #C7F5C0",
+",. c #CBF3C5",
+"<. c #CEF0CA",
+"1. c #CDFEC6",
+"2. c #D1EDCE",
+"3. c #D5EFD1",
+"4. c #D3FFCC",
+"5. c #D0ECFF",
+"6. c #D9F0FF",
+"7. c #DCF0FF",
+"8. c #ECFBFF",
+"9. c gray100",
+"0. c None",
+/* pixels */
+"0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"< l B A m 1 -   6 >     0.0.0.0.",
+"S W T R E K &   0 e O     0.0.0.",
+"2 -. at .n b z & + g h ,     0.0.0.",
+"j 3.2.k x c = 5 { / 9 #     0.0.",
+"v <.;.N C M ; i $.( q 7     0.0.",
+"V ,.:.H J G 3 [ %._ r t $     0.",
+"F >.=.L P D u &.#.` y p 8     0.",
+"I 4.1.Q ! ~ ] 6.*.X.d s a %     ",
+"Z Y +.} U ) 7.9.8.5.X.X...w     ",
+"    o o   : f |  .O.' ^ 4 @     ",
+"                                ",
+"0.                              ",
+"0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.",
+"0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0."
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpovmodeler.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpovmodeler.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kpovmodeler.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kpovmodeler[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #00000B",
+"X  c #000C00",
+"o  c #000012",
+"O  c #00001B",
+"+  c #001400",
+"@  c #001900",
+"#  c #000229",
+"$  c #000330",
+"%  c #010832",
+"&  c #00093D",
+"*  c #002424",
+"=  c #010C42",
+"-  c #02044B",
+";  c #00065C",
+":  c #05154D",
+">  c #0D1C56",
+",  c #000960",
+"<  c #040D72",
+"1  c #0E2160",
+"2  c #1F337A",
+"3  c #004200",
+"4  c #064A04",
+"5  c #025501",
+"6  c #015C00",
+"7  c #026300",
+"8  c #066709",
+"9  c #086D05",
+"0  c #066C04",
+"q  c #047301",
+"w  c #077A03",
+"e  c #097400",
+"r  c #097E04",
+"t  c #0E780A",
+"y  c #117608",
+"u  c #127B05",
+"i  c #157C08",
+"p  c #127811",
+"a  c #0B6352",
+"s  c #307D68",
+"d  c #000085",
+"f  c #00008E",
+"g  c #000B89",
+"h  c #00029B",
+"j  c #070F9B",
+"k  c #050B93",
+"l  c #061684",
+"z  c #000AAA",
+"x  c #0311A1",
+"c  c #0915A8",
+"v  c #041DBC",
+"b  c #092094",
+"n  c #0B26A4",
+"m  c #0023B9",
+"M  c #0F21B2",
+"N  c #0D31A5",
+"B  c #1324AC",
+"V  c #142CB3",
+"C  c #192DB0",
+"Z  c #1032AA",
+"A  c #1833BC",
+"S  c #1C3ABC",
+"D  c #233C89",
+"F  c #0027DB",
+"G  c #1132C9",
+"H  c #1532C2",
+"J  c #173BD6",
+"K  c #194CB4",
+"L  c #354E9C",
+"P  c #2B44BA",
+"I  c #2259BE",
+"U  c #3553A7",
+"Y  c #1E41C3",
+"T  c #1C40D0",
+"R  c #1F4BE3",
+"E  c #2043CB",
+"W  c #2548C3",
+"Q  c #244BCB",
+"!  c #224FDB",
+"~  c #2C55CC",
+"^  c #2955D3",
+"/  c #2853D8",
+"(  c #2B59D6",
+")  c #2C5CDA",
+"_  c #2551D2",
+"`  c #3055C3",
+"'  c #3A5ACA",
+"]  c #2257EB",
+"[  c #255AE6",
+"{  c #275BE8",
+"}  c #2C60DF",
+"|  c #3768D8",
+" . c #3970C0",
+".. c #2E63E1",
+"X. c #3166E1",
+"o. c #3B75EB",
+"O. c #3773F3",
+"+. c #4661B1",
+"@. c #4263B8",
+"#. c #4D6DC3",
+"$. c #4C6ED1",
+"%. c #4C70C7",
+"&. c #4B78D9",
+"*. c #4371E0",
+"=. c #417AE3",
+"-. c #4177F1",
+";. c #417EF1",
+":. c #0B8405",
+">. c #0E8C06",
+",. c #009600",
+"<. c #009800",
+"1. c #158004",
+"2. c #188107",
+"3. c #1A860A",
+"4. c #1F880A",
+"5. c #119308",
+"6. c #129B0B",
+"7. c #1BA011",
+"8. c #248E0C",
+"9. c #208610",
+"0. c #258C13",
+"q. c #258D18",
+"w. c #23811B",
+"e. c #2A940F",
+"r. c #2C9316",
+"t. c #2C9816",
+"y. c #269213",
+"u. c #319B13",
+"i. c #339A19",
+"p. c #218320",
+"a. c #36902E",
+"s. c #3F9939",
+"d. c #369B3B",
+"f. c #26B21A",
+"g. c #37A116",
+"h. c #39A11B",
+"j. c #3EA819",
+"k. c #3EAC13",
+"l. c #2FA123",
+"z. c #2FB723",
+"x. c #2FB823",
+"c. c #3DA629",
+"v. c #34B829",
+"b. c #3CBB31",
+"n. c #449E3E",
+"m. c #43AC1C",
+"M. c #4AB41F",
+"N. c #50BA1B",
+"B. c #40A620",
+"V. c #46AC23",
+"C. c #48AF21",
+"Z. c #4BB125",
+"A. c #47BB3B",
+"S. c #4EB834",
+"D. c #50B52B",
+"F. c #57BE2A",
+"G. c #59BE2E",
+"H. c #54BD25",
+"J. c #43AA43",
+"K. c #59B74F",
+"L. c #56BF52",
+"P. c #47C62F",
+"I. c #4AC531",
+"U. c #5AC02E",
+"Y. c #59C23B",
+"T. c #5DDC3B",
+"R. c #61DE3F",
+"E. c #54C448",
+"W. c #5BC15B",
+"Q. c #62DE40",
+"!. c #78D251",
+"~. c #65CA63",
+"^. c #69CF66",
+"/. c #78DD68",
+"(. c #539D84",
+"). c #4B83D7",
+"_. c #5A80DF",
+"`. c #4785EA",
+"'. c #4B8EEF",
+"]. c #4685F6",
+"[. c #4386F9",
+"{. c #5E8CE1",
+"}. c #5096F4",
+"|. c #5691FD",
+" X c #6B9FFF",
+".X c #7196E4",
+"XX c #6AA7F2",
+"oX c #6AA6FE",
+"OX c #6CA8FF",
+"+X c #7EA3EF",
+"@X c #7FA8F9",
+"#X c #71B5FB",
+"$X c #76BCFF",
+"%X c #77C0FF",
+"&X c #78C1FF",
+"*X c #82DA5C",
+"=X c #8AE457",
+"-X c #81ADEF",
+";X c #8CBCFF",
+":X c #9AADE8",
+">X c #98B9F2",
+",X c #96CF94",
+"<X c #A3D49C",
+"1X c #A3DB98",
+"2X c #A7D0A2",
+"3X c #B2DDAC",
+"4X c #B4D9B0",
+"5X c #BBDAB8",
+"6X c #A4E196",
+"7X c #A7E897",
+"8X c #B1F49D",
+"9X c #AFEBA2",
+"0X c #B0E6A6",
+"qX c #B1E2A9",
+"wX c #B0E9A4",
+"eX c #B5F4A4",
+"rX c #BDF5B2",
+"tX c #87C1FC",
+"yX c #8AC6FF",
+"uX c #8DC8FF",
+"iX c #93C3FE",
+"pX c #93CFFF",
+"aX c #9CC5FF",
+"sX c #9DCFFF",
+"dX c #96D3FF",
+"fX c #9FD0FF",
+"gX c #A5CBF9",
+"hX c #A2D2FF",
+"jX c #AAD3FF",
+"kX c #ABDBFF",
+"lX c #B3DAFF",
+"zX c #B8DCFF",
+"xX c #BFE3FF",
+"cX c #C4FFBE",
+"vX c #C7DCFB",
+"bX c #D0DEFF",
+"nX c #CDFFC6",
+"mX c #D4EFD4",
+"MX c #D7FFD9",
+"NX c #DCFFDE",
+"BX c #C3E2FE",
+"VX c #C9E6FF",
+"CX c #D3ECFF",
+"ZX c #DAEEFF",
+"AX c #DDFFE0",
+"SX c #DCF1FF",
+"DX c #E2FFE4",
+"FX c #E6FFE8",
+"GX c #EBF7EC",
+"HX c #EAFFEC",
+"JX c #E3F3FF",
+"KX c #E7F8FF",
+"LX c #E9F6FF",
+"PX c #F2FFF3",
+"IX c #F1F9FF",
+"UX c #FEFEFE",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYX7 6 6 6 6 6 6 6 6 YXYXYXYXYXYXYXd O YXYXYXYXYXYXYXYXYXYX",
+"YXYX7 0 q.c.S.Y.Y.Y.S.c.q.0 3 YXYXYXYXf B - YXYXYXYXYXYXYXYXYXYX",
+"YXYXt I.T.T.Q.Q.Q.Q.Q.Q.R.P.4   YXYXYXb &.k o YXYXYXYXYXYXYXYXYX",
+"YXYXp K.E.v.f.f.z.z.v.b.I.a.5   YXYXh P XXc ;   YXYXYXYXYXYXYXYX",
+"YXYXq t 5XGXmX,Xn.n.s.a.w.i 5   YXYXh _.#XB x O YXYXYXYXYXYXYXYX",
+"YXYXw e 4XUXUX2Xw u i i i 0.5   YXz V ;X#XC M <   YXYXYXYXYXYXYX",
+"YXYXw 2.3XUXUX<Xu 9.9.9.9.9.6   YXz $.dX#XS V M # YXYXYXYXYXYXYX",
+"YXYXr 4.3XPXUX<X4.0.0.0.0.y.6 . x M +XdX$XP V A l   YXYXYXYXYXYX",
+"YXYX:.8.3XPXPX<X8.r.r.r.r.u.6 $ m ' hXuX$X~ A S H $ YXYXYXYXYXYX",
+"YXYX:.r.qXPXPX1Xe.i.i.i.i.i.7 ; G .XkXuX$X| S Y E b   YXYXYXYXYX",
+"YXYX>.i.qXHXHX1Xu.i.c.i.l.h.8 n ^ gXhXuX&X| W E Q T & YXYXYXYXYX",
+"YXYX>.g.0XHXHX1Xi.B.m.j.V.j.a J _.BXhXyX&X=.Q _ Q / N   YXYXYXYX",
+"YXYX5.j.0XDXFX1Xm.C.C.C.C.c.K T >XxXhXyX&X`._ ( ( ( ! = YXYXYXYX",
+"YXYX5.M.0XDXDX7Xm.C.Z.Z.N.s R &.BXzXhXyX&X'.( } } ) } Z   YXYXYX",
+"YXYX6.M.9XAXAX7XH.G.G.F.D.I [ +XZXlXsXyX$X}.} } } } } { = YXYXYX",
+"YXYX6.!.rXMXMXwX*X*X*X=X(.] o.vXJXZXCXVXBXiX[.].].].o.O.N   YXYX",
+"YXYX6./.nXMXDXnX8XeXeX8X).|.;XUXIXLXJXZXSXzXOXOXOXOXOXoX-.% YXYX",
+"YXYX<.6 p.J.L.^.^.~.E.d. .iXZXUXIXLXJXZXZXzX;X;X;XiXiXsX X= YXYX",
+"YXYXYXYXYX  X + @ + X   m ` :XbXJXKXKXSXSXCXlXlXjXaX at X%.>   YXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXO : 2 L +.#.#.#. at .U D 1 $   YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kruler-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kruler-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kruler-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,40 @@
+/* XPM */
+static char *kruler-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 18 1",
+"  c black",
+". c #54450A",
+"X c #A58608",
+"o c #CCA818",
+"O c #CDA919",
+"+ c #D1AF26",
+"@ c #D4B432",
+"# c #D6B533",
+"$ c #DABB40",
+"% c #DFC14D",
+"& c #E0C558",
+"* c #E3C85A",
+"= c #E8CE67",
+"- c #ECD474",
+"; c #F1DA81",
+": c #F5E08E",
+"> c #FAE69B",
+", c None",
+/* pixels */
+",,,,,,,,,,,,,,,,",
+"                ",
+" .>.>.>.>.>.>.X ",
+" .:.:.:.:.:.:.X ",
+" ;;;;.;;;;;.;;X ",
+" ----.-----.--X ",
+" ====.=====.==X ",
+" **&**********X ",
+" %.%%%.%%%.%%%X ",
+" $$.$.$.$..$$$X ",
+" #.###..##.###X ",
+" ++.+++.++.+++X ",
+" O.OOO.OOO.OOOX ",
+" XXXXXXXXXXXXXX ",
+"                ",
+",,,,,,,,,,,,,,,,"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kruler.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kruler.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kruler.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,89 @@
+/* XPM */
+static char *kruler[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 51 1",
+"  c black",
+". c #54450A",
+"X c #62500C",
+"o c #675614",
+"O c #7A6619",
+"+ c #7A681F",
+"@ c #8D7823",
+"# c #8D7825",
+"$ c #8D7929",
+"% c #A08829",
+"& c #A08A31",
+"* c #A08B34",
+"= c #B39B3B",
+"- c #C49D00",
+"; c #C6A934",
+": c #C6AA38",
+"> c #C6AB3D",
+", c #D9BA3B",
+"< c #C6AC41",
+"1 c #C6AD45",
+"2 c #C6AD49",
+"3 c #D9BD46",
+"4 c #D9BD4A",
+"5 c #D9BE4F",
+"6 c #D9BF54",
+"7 c #FFD20C",
+"8 c #FFD312",
+"9 c #FFD418",
+"0 c #FFD51F",
+"q c #FFD625",
+"w c #FFD72B",
+"e c #FFD831",
+"r c #FFD937",
+"t c #FFDA3E",
+"y c #ECCE4E",
+"u c #ECCF59",
+"i c #FFDB44",
+"p c #FFDC4A",
+"a c #FFDD50",
+"s c #FFDF57",
+"d c #FFE05D",
+"f c #FFE163",
+"g c #FFE269",
+"h c #FFE36F",
+"j c #FFE476",
+"k c #FFE57C",
+"l c #FFE682",
+"z c #FFE788",
+"x c #FFE88F",
+"c c #FFE995",
+"v c None",
+/* pixels */
+"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv",
+"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv",
+"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv",
+"                                ",
+" cXccXccXccXccXccXccXccXccXccX- ",
+" x.xx.xx.xx.xx.xx.xx.xx.xx.xx.- ",
+" z.zz.zz.zz.zz.zz.zz.zz.zz.zz.- ",
+" l.ll.ll.ll.ll.ll.ll.ll.ll.ll.- ",
+" kkkkkkk.kkkkkkkk.kkkkkkkk.kkk- ",
+" jjjjjjj.jjjjjjjj.jjjjjjjj.jjj- ",
+" hhhhhhh.hhhhhhhh.hhhhhhhh.hhh- ",
+" ggg6$.g6+o6gggggggggg2$$*6+o6- ",
+" fffu1.f&=5&ffffffffff=55&&=5&- ",
+" ddddd.d#<d#ddddddddddd<.4#<d#- ",
+" sssss.s@>s at ssssssssss3y3@@>s at - ",
+" aaaaa.a:OO:aaaaaaaaaa%%O%:OO:- ",
+" ppppp;pp,;pppppppppppp,;pp,;p- ",
+" iiiiiiiiiiiiiiiiiiiiiiiiiiiii- ",
+" ttttttttttttttttttttttttttttt- ",
+" r..rrr..rrrr.rrrrrrrrrrrrrrrr- ",
+" eee.e.ee.ee..eeeeeeeeeeeeeeee- ",
+" w..ww.ww.www.wwwwwwwwwwwwwwww- ",
+" qqq.qq...qqq.qqqqqqqqqqqqqqqq- ",
+" 000.0000.000.0000000000000000- ",
+" 9..999..9999.9999999999999999- ",
+" 88888888888888888888888888888- ",
+" 77777777777777777777777777777- ",
+" ------------------------------ ",
+"                                ",
+"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv",
+"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv",
+"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/ksnapshot-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/ksnapshot-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/ksnapshot-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,248 @@
+/* XPM */
+static char *ksnapshot-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 226 2",
+"   c black",
+".  c gray2",
+"X  c #090909",
+"o  c gray10",
+"O  c gray19",
+"+  c gray20",
+"@  c #353535",
+"#  c #3F3F3F",
+"$  c #3D4C70",
+"%  c gray25",
+"&  c #464646",
+"*  c #4B4B4B",
+"=  c #4B4D4D",
+"-  c #4E4E4E",
+";  c gray31",
+":  c #515151",
+">  c gray32",
+",  c gray33",
+"<  c gray35",
+"1  c #5B5B5B",
+"2  c #5D5D5B",
+"3  c #5D5D5F",
+"4  c gray37",
+"5  c #5F5F5F",
+"6  c #626262",
+"7  c gray39",
+"8  c gray40",
+"9  c #053FA7",
+"0  c #0544AF",
+"q  c #0A47AE",
+"w  c #104BAF",
+"e  c #174FAD",
+"r  c #1D50AC",
+"t  c #1150B5",
+"y  c #1752B5",
+"u  c #1758B9",
+"i  c #1E56B1",
+"p  c #1D5DBE",
+"a  c #3E5280",
+"s  c #2965BF",
+"d  c #2C66BA",
+"f  c #2C69BC",
+"g  c #3068BD",
+"h  c #316ABE",
+"j  c #2163C3",
+"k  c #296AC6",
+"l  c #2A6DC7",
+"z  c #2D68C1",
+"x  c #2F6FC3",
+"c  c #2D6DC5",
+"v  c #2D70C8",
+"b  c #2F71C9",
+"n  c #306EC4",
+"m  c #326EC6",
+"M  c #3273CC",
+"N  c #3477CE",
+"B  c #3879CF",
+"V  c #3F7ECE",
+"C  c #3B7CD1",
+"Z  c #3D7ED2",
+"A  c #3D7FD4",
+"S  c #4A6797",
+"D  c #4C70AC",
+"F  c #4A78BE",
+"G  c #517FC3",
+"H  c #3F80D2",
+"J  c #4183D6",
+"K  c #4586D6",
+"L  c #4587D7",
+"P  c #4688D8",
+"I  c #4688D9",
+"U  c #4988D4",
+"Y  c #488AD8",
+"T  c #4A8BD9",
+"R  c #4D90DC",
+"E  c #4F90DC",
+"W  c #508FD8",
+"Q  c #5294DE",
+"!  c #5897DD",
+"~  c #5396E0",
+"^  c #5497E0",
+"/  c #5698E0",
+"(  c #599DE5",
+")  c #5F9EE1",
+"_  c #5EA1E7",
+"`  c #7DA4DC",
+"'  c #66A6E6",
+"]  c #61A6EA",
+"[  c #63A7EB",
+"{  c #6CACEA",
+"}  c #71B2ED",
+"|  c #74B5EF",
+" . c #818181",
+".. c #848484",
+"X. c #888888",
+"o. c #8D8C89",
+"O. c #8E8D8B",
+"+. c #8D8D8D",
+"@. c #8E8E8E",
+"#. c #90908F",
+"$. c #92908E",
+"%. c #94928E",
+"&. c #979594",
+"*. c #979694",
+"=. c gray59",
+"-. c #9B9A97",
+";. c #989898",
+":. c #9B9B9B",
+">. c #9F9D9A",
+",. c gray61",
+"<. c gray62",
+"1. c #A0A0A0",
+"2. c gray63",
+"3. c gray64",
+"4. c #A5A6A4",
+"5. c #A6A6A5",
+"6. c #A6A6A7",
+"7. c #A7A7A7",
+"8. c #A8A7A9",
+"9. c #A9A9AA",
+"0. c gray67",
+"q. c #AFAFAF",
+"w. c #A6ACB5",
+"e. c #B3B3B2",
+"r. c gray70",
+"t. c #B4B4B4",
+"y. c gray72",
+"u. c #B9B9B9",
+"i. c #BCBCBC",
+"p. c gray74",
+"a. c #87A1C6",
+"s. c #89A0C5",
+"d. c #8EA8CC",
+"f. c #9BAAC0",
+"g. c #9DADC5",
+"h. c #91AED5",
+"j. c #9DB9E0",
+"k. c #B4C1D6",
+"l. c #B4C2D5",
+"z. c #C1C1C1",
+"x. c #C2C2C1",
+"c. c #C7C7C6",
+"v. c #C8C8C8",
+"b. c gray79",
+"n. c #CACACA",
+"m. c #CBCACA",
+"M. c #CBCBCB",
+"N. c #CDCCC9",
+"B. c #CECCC9",
+"V. c #CDCDCD",
+"C. c #CECDCC",
+"Z. c #CECECE",
+"A. c gray81",
+"S. c #C7CDD7",
+"D. c #CDCFD3",
+"F. c #CCCFD5",
+"G. c #D0CFCC",
+"H. c #D0D0D0",
+"J. c gray82",
+"K. c #D2D2D1",
+"L. c #D3D3D2",
+"P. c LightGray",
+"I. c #D4D3D0",
+"U. c #D4D3D4",
+"Y. c #D5D4D3",
+"T. c #D7D4D2",
+"R. c gray84",
+"E. c #D7D7D7",
+"W. c #D1D4D8",
+"Q. c #D8D6D3",
+"!. c #DAD7D4",
+"~. c #DAD9D7",
+"^. c #DBDAD7",
+"/. c #DFDBD6",
+"(. c gray85",
+"). c #DBDAD8",
+"_. c #DBDBDA",
+"`. c #DCDAD9",
+"'. c #DDDAD8",
+"]. c #DDDAD9",
+"[. c #DEDDDB",
+"{. c #DFDFDF",
+"}. c #CFD7E6",
+"|. c #D2DAEA",
+" X c #D2DBEA",
+".X c #D4DDEC",
+"XX c #D6DFEE",
+"oX c #DBDDE2",
+"OX c #D9DFE8",
+"+X c #D9E1EA",
+"@X c #DAE0E9",
+"#X c #DCE4ED",
+"$X c #DEE6EE",
+"%X c #DFE7EF",
+"&X c #D8E1F1",
+"*X c #DAE3F1",
+"=X c #E1DFDB",
+"-X c #E3E1DF",
+";X c #E0E3E6",
+":X c #E4E4E3",
+">X c #E4E4E4",
+",X c #E7E6E4",
+"<X c #E1E5EC",
+"1X c #E4E8EE",
+"2X c #E8E6E4",
+"3X c #E8E6E5",
+"4X c #E9E8E6",
+"5X c #EDECEA",
+"6X c #EFEDE9",
+"7X c #E0E7F0",
+"8X c #E1E9F0",
+"9X c #E2E9F1",
+"0X c #E4EBF2",
+"qX c #E6EBF4",
+"wX c #E4ECF3",
+"eX c #F0ECE7",
+"rX c #F1F0EF",
+"tX c #F1F1F0",
+"yX c #F2F1F1",
+"uX c #F0F3F9",
+"iX c #F5F9FD",
+"pX c #F7FAFF",
+"aX c #F9F7F3",
+"sX c #FBFCFE",
+"dX c gray100",
+"fX c None",
+/* pixels */
+": J.[.].].~.~.~.,X,X,X,X4XZ.+ fX",
+"i.sX at X$X8X8X0XwX8X<X$X at X@XdX at .  ",
+"N.}.d U ! [ } | { ) T Z f pX&.  ",
+"N. Xn A R _ _ [ _ ^ U B m uX#.  ",
+"G. Xs B L Q / / ^ U J b z 1XO.  ",
+"I. Xw k B J I U L C M j y <XO.  ",
+"T..X9 0 u f n v l c f r r oX%.  ",
+"T.XXq i s.w.f.d.a.g.W.F.D.S.k.= ",
+"Q.&Xt F dXdXaX5X/.6XrX5X=Xk.j.3 ",
+"~.*Xp G ~.J.n.p.oX,X>.-.M.I.:X2 ",
+"].qX` h.t.5.<.3.rX0.a $ =.M.R.< ",
+"Z.dXpX;Xr.8.<.3.rX8.D S O.i.-.& ",
+"* n.N.z.q.3.<.;.U.,Xe.5.i.8. .# ",
+"fX  . @ 0.<.;.+.<.G.U.c.t.X...% ",
+"fXfXfX+ ~.E.G.n.z.b.I.Z.i.t.y.= ",
+"fXfXfX. 7 8 7 3 3 < , , : ; ; o "
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/ksnapshot.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/ksnapshot.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/ksnapshot.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,211 @@
+/* XPM */
+static char *ksnapshot[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 173 2",
+"   c #000000",
+".  c #0D0D0D",
+"X  c gray7",
+"o  c #0A1122",
+"O  c #1F2025",
+"+  c #2D2D2D",
+"@  c gray20",
+"#  c #031741",
+"$  c #1B2942",
+"%  c #213D71",
+"&  c #37456A",
+"*  c #434343",
+"=  c #494847",
+"-  c #484848",
+";  c #504F4C",
+":  c #53524F",
+">  c #535353",
+",  c #5C5D5D",
+"<  c gray40",
+"1  c #6A6764",
+"2  c #6D6D6D",
+"3  c #616D7A",
+"4  c #686E77",
+"5  c #726F69",
+"6  c #71716F",
+"7  c #707070",
+"8  c #7C7C7C",
+"9  c #0B3F9F",
+"0  c #133580",
+"q  c #003AA5",
+"w  c #013EA9",
+"e  c #0543AB",
+"r  c #0B41A0",
+"t  c #0845AE",
+"y  c #0E49AE",
+"u  c #0D4BB2",
+"i  c #0E50B9",
+"p  c #1349A5",
+"a  c #1D4FA8",
+"s  c #114AB0",
+"d  c #1351B5",
+"f  c #1151B8",
+"g  c #1558BE",
+"h  c #1955B6",
+"j  c #1857BA",
+"k  c #1A58B7",
+"l  c #1D5DBC",
+"z  c #1F60BF",
+"x  c #2557A8",
+"c  c #245AB0",
+"v  c #205EBC",
+"b  c #3F629A",
+"n  c #2662BE",
+"m  c #2F67B8",
+"M  c #3D6AAC",
+"N  c #1B5FC3",
+"B  c #1E60C1",
+"V  c #2364C2",
+"C  c #2568C8",
+"Z  c #2B6AC4",
+"A  c #2C6EC9",
+"S  c #2E70CB",
+"D  c #3370C3",
+"F  c #3374CC",
+"G  c #3878CE",
+"H  c #3C7DD1",
+"J  c #55658D",
+"K  c #476FAD",
+"L  c #416FB1",
+"P  c #4A72AA",
+"I  c #4371B3",
+"U  c #637185",
+"Y  c #6A7B8B",
+"T  c #407CCF",
+"R  c #3E80D2",
+"E  c #6F8DBC",
+"W  c #7D8FB3",
+"Q  c #7090BF",
+"!  c #4283D4",
+"~  c #4387D8",
+"^  c #4688D7",
+"/  c #4488D8",
+"(  c #4B8CD9",
+")  c #4D90DC",
+"_  c #5193DE",
+"`  c #5496E0",
+"'  c #5599E1",
+"]  c #5A9CE4",
+"[  c #5CA0E5",
+"{  c #668DCC",
+"}  c #7494C1",
+"|  c #739BD5",
+" . c #6298E7",
+".. c #6292F7",
+"X. c #7DA1D6",
+"o. c #78A1DC",
+"O. c #62A5E9",
+"+. c #63A8EB",
+"@. c #68ACED",
+"#. c #6AAFF0",
+"$. c #6EA8FC",
+"%. c #6DB2F2",
+"&. c #7AA6E1",
+"*. c #72A3FF",
+"=. c #70B6F4",
+"-. c #807E7A",
+";. c #828282",
+":. c #8A8A8A",
+">. c #939393",
+",. c #9B9B9B",
+"<. c #859ABD",
+"1. c #A09F9E",
+"2. c #A3A3A3",
+"3. c #A8A6A4",
+"4. c #A8A8A7",
+"5. c #ABABAB",
+"6. c #B0AEAA",
+"7. c #B2B2B2",
+"8. c #BABABA",
+"9. c #8AA2C3",
+"0. c #92ACCB",
+"q. c #99A7C0",
+"w. c #9FADC3",
+"e. c #96B0CD",
+"r. c #9AB1CD",
+"t. c #9CB6D1",
+"y. c #9FB9D3",
+"u. c #A5B3CB",
+"i. c #AAB7CF",
+"p. c #A3BDD6",
+"a. c #ADBAD2",
+"s. c #B1BFD7",
+"d. c #A7C2D9",
+"f. c #A8C3D9",
+"g. c #B5C4DB",
+"h. c #BCC6D3",
+"j. c #B8C6DC",
+"k. c #B2C3E3",
+"l. c #BBCEEA",
+"z. c #BED3EE",
+"x. c #C3C0BC",
+"c. c #C3C3C3",
+"v. c #CBC7C1",
+"b. c #CACACA",
+"n. c #C5CAD2",
+"m. c #C0CCDB",
+"M. c #C8CBD0",
+"N. c #CBD1DA",
+"B. c #D0CFCD",
+"V. c #D2D0CF",
+"C. c #D3D3D3",
+"Z. c #DCDAD7",
+"A. c #DBDBDB",
+"S. c #C2CEE5",
+"D. c #C9D3E0",
+"F. c #C0D6F2",
+"G. c #DEE2E9",
+"H. c #E0DDDA",
+"J. c #E1E0DE",
+"K. c #E4E3E3",
+"L. c #E1E5EC",
+"P. c #E8E5E2",
+"I. c #EAE9E6",
+"U. c #EBEBEB",
+"Y. c #E9EDF4",
+"T. c #F0EEEB",
+"R. c #F1F0EA",
+"E. c #F3F3F3",
+"W. c #F5F6F8",
+"Q. c #F8F7F6",
+"!. c #F9F8F7",
+"~. c #FEFEFD",
+"^. c None",
+/* pixels */
+"^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.",
+"^.> :.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.2.,.2.8 . ^.^.^.",
+"X 7.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.!.>.  ^.^.",
+"2 ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.U.@ ^.^.",
+";.~.~.n.W 9.0.e.r.t.y.p.p.f.f.f.p.p.y.t.r.e.0.0.<.<.W.~.W.@ ^.^.",
+";.~.~.q.w S R / ) ' [ +. at .=.=.=. at .+.[ _ ) / R F n y Y.~.E.* ^.^.",
+";.~.~.w.l H R ( _ _ [ O. at .%.%. at .@.O.[ ' ) ^ R G S n Y.~.E.* ^.^.",
+";.~.~.u.n G H ! ( _ ] [ O.O.+.+.O.[ ] _ ( ~ H G A Z L.E.I.= ^.^.",
+":.~.~.u.n F G ! ^ ( _ ] ] [ [ [ ] _ _ ( ^ ! G F Z Z L.K.K.= ^.^.",
+":.~.~.u.k A F H ! ^ ( _ ' ' ' _ _ _ ) ^ ! G F A V n G.K.H.= ^.^.",
+":.~.~.u.e Z F G H ! ^ ( ) ) ) ) ) ( ! ! T G F Z v k G.H.K.= ^.^.",
+">.~.~.a.q y Z F G H T ! ! ^ ^ / ^ ! ! G G F Z Z u s G.A.A.- ^.^.",
+">.~.~.a.q q t N A F G H H R R R T H G F A Z n u q s L.A.K.- ^.^.",
+">.~.~.a.w w e t u n Z D F S F G F S A Z m c p q 9 a N.b.V.;   ^.",
+",.~.~.a.w e u u x b 3 4 U P I I I M M w.N.M.M.M.M.b.C.b.V.b.8   ",
+",.~.~.s.e u u K K.U.I.I.P.K.A.A.A.Z.V.Z.K.P.K.A.I.P.A.S.l.k.7.. ",
+",.~.~.g.u u i E ~.~.!.E.U.I.P.A.A.b.c.A.!.~.~.E.b.c.C.X.T { 5.. ",
+",.~.~.g.d j g } ~.~.!.W.U.U.P.G.C.b.E.~.I.Z.C.L.E.C.V.j.g.N.4.. ",
+"1.~.~.j.k N B } T.I.G.A.A.Z.N.b.c.W.W.b.c.8.7.7.c.I.b.V.A.Z.2.. ",
+"2.~.~.j.v V Z Q v.7.7.5.4.4.2.,.b.~.C.b.>.- : >.5.c.C.c.C.Z.2.. ",
+"2.~.~.D.| o.&.r.x.7.5.5.2.4.2.,.Q.E.A.1.o J & + 1.5.Z.x.C.Z.2.. ",
+"3.~.~.L.l.z.F.h.8.5.5.5.2.2.,.2.~.I.P.; 0 *...# 6 6.b.x.x.c.,.. ",
+",.~.!.!.Q.E.!.C.7.5.5.3.2.1.,.2.W.I.I.1 % $. .$ -.5.x.8.-.W 7 . ",
+"* ~.~.W.W.E.W.C.7.5.4.3.2.1.,.>.I.L.L.V., Y 3 6 5.6.x.1.8 8 7 X ",
+"  :.U.W.W.W.E.C.7.4.3.2.,.,.,.>.b.Y.C.U.b.2.3.8.5.8.h.>.-.-.7 X ",
+"^.  + = * * * 8 8.4.2.2.,.,.,.:.,.A.K.C.A.Z.b.8.8.c.5.-.-.-.6 X ",
+"^.^.^.        : 8.3.2.1.,.,.,.>.:.,.C.Z.V.b.c.c.h.4.;.-.8 8 2 X ",
+"^.^.^.^.^.^.^.> 8.2.1.1.,.>.>.>.:.:.>.8.b.b.c.8.3.:.:.:.:.:.8 X ",
+"^.^.^.^.^.^.^.< !.R.T.I.I.K.K.K.A.A.C.C.V.b.c.b.b.b.b.c.c.c.,.. ",
+"^.^.^.^.^.^.^.+ 7.a.8.7.7.7.5.5.5.3.2.1.2.2.,.>.>.>.>.:.:.:.,   ",
+"^.^.^.^.^.^.^.                  .                 .   . .       ",
+"^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^.^."
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kuickshow-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kuickshow-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kuickshow-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,41 @@
+/* XPM */
+static char *kuickshow-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 14 21 1",
+"  c black",
+". c #000033",
+"X c gray20",
+"o c #006633",
+"O c #336633",
+"+ c #0033FF",
+"@ c #3333FF",
+"# c #6666FF",
+"$ c #009933",
+"% c #669933",
+"& c #9900CC",
+"* c #9933CC",
+"= c #9933FF",
+"- c #9966FF",
+"; c #CC66CC",
+": c #9999FF",
+"> c #CC99FF",
+", c #CCCCFF",
+"< c #FFCCFF",
+"1 c gray100",
+"2 c None",
+/* pixels */
+"2222222221,:2222",
+"22211,:21,>:2222",
+"22-<>1>-::->1122",
+"22-,:->--:11>--2",
+"222:-++@@-+-::#2",
+"-11>-=>* @@+:@+2",
+"1<::@=. @-:@*222",
+">-@>>:@@##>+oo22",
+"@@1+@>,#@>-=$%O2",
+"-1-+ at 1:#--&OOXOO",
+"-1;:@<:::*&2oOO2",
+"2+@@2<:*22o%2222",
+"2222222222o%2222",
+"22222222222oo222"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kuickshow.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kuickshow.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kuickshow.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,66 @@
+/* XPM */
+static char *kuickshow[] = {
+/* columns rows colors chars-per-pixel */
+"32 29 31 1",
+"  c black",
+". c #000033",
+"X c #003333",
+"o c gray20",
+"O c #006633",
+"+ c #336633",
+"@ c #0033FF",
+"# c #3333FF",
+"$ c #6666FF",
+"% c #009933",
+"& c #339933",
+"* c #669933",
+"= c #6699CC",
+"- c #6699FF",
+"; c #9900CC",
+": c #9900FF",
+"> c #9933CC",
+", c #9933FF",
+"< c #9966CC",
+"1 c #9966FF",
+"2 c #CC00CC",
+"3 c #CC66CC",
+"4 c #CC66FF",
+"5 c #9999CC",
+"6 c #9999FF",
+"7 c #CC99FF",
+"8 c #FF99FF",
+"9 c #CCCCFF",
+"0 c #FFCCFF",
+"q c gray100",
+"w c None",
+/* pixels */
+"wwwwwwwwwwwwwwwwwww14114wwwwwwww",
+"wwwwwwwwwwwwwwwwww6qqqq66wwwwwww",
+"wwwwwww464141wwww4q909941wwwwwww",
+"wwwwww1qq09976ww1q0917966wwwwwww",
+"wwwww4q99171416w7q14117$1764wwww",
+"wwwww1q01719176176667167qqqq7www",
+"wwwww7q949617116016161qq979916ww",
+"wwwww1q94661-761-1 at 6@q9q4771716w",
+"wwwwww499116#@101#@#946$614616#w",
+"wwwwwww671#@#@>#@##11 at 6166666$#w",
+"www71717616#>,q, 6 at 6##@15$11@#>w",
+"w1790997616,q7,, #@#@##@#6@##1ww",
+"7q971711##>q6>,X#11611@,#@#>,www",
+"1q9096 at 6@#.,,. #@#=1666#,>,wwwww",
+"1q71711#@#-;X7#@#@#1611#>wwwwwww",
+"1711@##777#67#@##6$6171@,***wwww",
+"#66##q71##@710 at 1@166166#>++%**ww",
+">#@#976 at 1#17961#6#$791#,*%%+++;w",
+"w>6q97 at 6@#q9166$11776@>+o*;%%+:;",
+"w1q0614 at 1#q096<67191#;:+*+%o++%;",
+"w7q946616 at q68909901@;,w;+o+%%++:",
+"w1q963161#@064116@#,%;;w:O++;:;w",
+"ww#70616@>,#@####>,w%&,ww;::;www",
+"ww,@##@#,ww>,>,>,wwww%*>wwwwwwww",
+"www,>,>,wwwwwwwwwwwwww%2wwwwwwww",
+"wwwwwwwwwwwwwwwwwwwwww%*2wwwwwww",
+"wwwwwwwwwwwwwwwwwwwwwww%:wwwwwww",
+"wwwwwwwwwwwwwwwwwwwwwww%*2wwwwww",
+"wwwwwwwwwwwwwwwwwwwwwwww>:wwwwww"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kview-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kview-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kview-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,194 @@
+/* XPM */
+static char *kview-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 172 2",
+"   c black",
+".  c #010205",
+"X  c #040407",
+"o  c #06070A",
+"O  c #09090E",
+"+  c #0C0A0E",
+"@  c #080B10",
+"#  c #0C0E14",
+"$  c #0C0E15",
+"%  c #0F1118",
+"&  c #11131A",
+"*  c #15171D",
+"=  c #1A191D",
+"-  c #1C1A1A",
+";  c #151820",
+":  c #171A24",
+">  c #201303",
+",  c #271804",
+"<  c #2D1C06",
+"1  c #301F0A",
+"2  c #3A2C1D",
+"3  c #2F313B",
+"4  c #2F323F",
+"5  c #303441",
+"6  c #373946",
+"7  c #3A3D4A",
+"8  c #3E404E",
+"9  c #47392E",
+"0  c #4A4031",
+"q  c #444857",
+"w  c #464A5B",
+"e  c #584D48",
+"r  c #505362",
+"t  c #525665",
+"y  c #575D73",
+"u  c #5B6176",
+"i  c #666E7B",
+"p  c #6A6F7F",
+"a  c #657081",
+"s  c #6D7181",
+"d  c #707487",
+"f  c #C08320",
+"g  c #E5A63F",
+"h  c #E9A83A",
+"j  c #D7B566",
+"k  c #D3B56C",
+"l  c #E0C377",
+"z  c #F3CB76",
+"x  c #868A99",
+"c  c #84899D",
+"v  c #9798A1",
+"b  c #89A0B8",
+"n  c #8DA3BB",
+"m  c #9EA2B4",
+"M  c #9AA1B8",
+"N  c #9DA7BD",
+"B  c #A4A6B3",
+"V  c #ABADBE",
+"C  c #94B1C4",
+"Z  c #99B5CF",
+"A  c #9CBED7",
+"S  c #B4B5C9",
+"D  c #B4B9CB",
+"F  c #B7BAC9",
+"G  c #B5BCCD",
+"H  c #B8BDCE",
+"J  c #BBC0CD",
+"K  c #ADDCFA",
+"L  c #B3DEFD",
+"P  c #BBDBF1",
+"I  c #A4E2FF",
+"U  c #A6E3FC",
+"Y  c #AAE3FF",
+"T  c #A8E5FF",
+"R  c #A9E5FF",
+"E  c #ACE6FC",
+"W  c #AEE7FD",
+"Q  c #AFE8FF",
+"!  c #B3E2F4",
+"~  c #B0E7FC",
+"^  c #B2ECFE",
+"/  c #BCF2FD",
+"(  c #BFF1FD",
+")  c #BDF9FF",
+"_  c #D4BDA1",
+"`  c #F6CE89",
+"'  c #EDD5B3",
+"]  c #FFE48B",
+"[  c #FFE591",
+"{  c #CFD0DB",
+"}  c #CCD0DD",
+"|  c #D4D5DF",
+" . c #C1DFE9",
+".. c #CBD0E6",
+"X. c #CFD2E0",
+"o. c #CFD5E8",
+"O. c #D2D6E6",
+"+. c #D2D7E9",
+"@. c #D3D7EA",
+"#. c #D2DDE4",
+"$. c #D5D8E6",
+"%. c #D5DBE5",
+"&. c #D3D8EA",
+"*. c #D2D9ED",
+"=. c #D4D9EB",
+"-. c #D6DAEB",
+";. c #D7DCE9",
+":. c #D9DCEC",
+">. c #DCDEED",
+",. c #DBDFF0",
+"<. c #CBEEF2",
+"1. c #C3F6FE",
+"2. c #C6F3FB",
+"3. c #C1F9FF",
+"4. c #C7F9FF",
+"5. c #C8FAFF",
+"6. c #CAF9FE",
+"7. c #C9FDFF",
+"8. c #CEF9FE",
+"9. c #DDE0ED",
+"0. c #D5E7F0",
+"q. c #D5EDF1",
+"w. c #DAE1F5",
+"e. c #DFE2F0",
+"r. c #D3FFFF",
+"t. c #D5FFFF",
+"y. c #D8FDFF",
+"u. c #D8FFFF",
+"i. c #DBFFFF",
+"p. c #DFFAFF",
+"a. c #DDFFFF",
+"s. c #DEFFFF",
+"d. c #E9DBC6",
+"f. c #F4E2C8",
+"g. c #E3E4EF",
+"h. c #E7E7EC",
+"j. c #E9E7EE",
+"k. c #E2E5F1",
+"l. c #E7E7F0",
+"z. c #E7E9F3",
+"x. c #E7E9F5",
+"c. c #E7EBFB",
+"v. c #E9E8F1",
+"b. c #E8EBF6",
+"n. c #E8EBF7",
+"m. c #EAEAF4",
+"M. c #EFECF3",
+"N. c #ECECF4",
+"B. c #EDEDF5",
+"V. c #E1F4FF",
+"C. c #E1FFFF",
+"Z. c #E7FFFF",
+"A. c #EEF5F7",
+"S. c #EBFFFF",
+"D. c #F0EFF9",
+"F. c #F2F3F8",
+"G. c #F3F2FA",
+"H. c #F0F3FE",
+"J. c #F4F3F8",
+"K. c #F6F5FA",
+"L. c #F7F7FB",
+"P. c #F6F5FC",
+"I. c #F2FFFF",
+"U. c #FBFAFD",
+"Y. c #FAFAFE",
+"T. c #FAFBFF",
+"R. c #F9FCFF",
+"E. c #FAFFFF",
+"W. c #FCFCFF",
+"Q. c #FDFEFF",
+"!. c gray100",
+"~. c None",
+/* pixels */
+"~.~.~.~.~.~.% c t # ~.~.~.~.~.~.",
+"~.~.~.% 4 q M c.T.} d : ~.~.~.~.",
+"X p v F O.D.K.>.:.T.!.%.x 5 o ~.",
+"~.B V.L K P ;.M.....:.m.W.H.y ~.",
+"- Z I ^ E I ! %.B.&.m.+.,.H $ ~.",
+"i Y 4.s.2./ 3. .j.e.>.J.m.D r * ",
+"n R 8.p.4.t.t.<.| K. at .k.l.G.!.y ",
+"b R W 1.t.C.Z.q.{ T.B.+.l.!.m O ",
+"a ~ ~ 4.s.S.R.#.h.K.G.o.z.X.; ~.",
+"= A ) 7.s.I.A.V *.w.-.k.x.7 ~.~.",
+"~.4 C 2.t.0.H S _ ' R.!.s   ~.~.",
+"~.~.+ 6 7 w H d.z h f.N . ~.~.~.",
+"~.~.~.~.~.~.@ 0 j [ g 2 ~.~.~.~.",
+"~.~.~.~.~.~.~.~., k ] f > ~.~.~.",
+"~.~.~.~.~.~.~.~.~.< l ` 9 ~.~.~.",
+"~.~.~.~.~.~.~.~.~.~.1 e & ~.~.~."
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/icons/kview.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/icons/kview.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/icons/kview.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,238 @@
+/* XPM */
+static char *kview[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 200 2",
+"   c #010102",
+".  c #050609",
+"X  c #06080D",
+"o  c #0C0501",
+"O  c #080609",
+"+  c #090A0F",
+"@  c #070910",
+"#  c #090B12",
+"$  c #0F1119",
+"%  c #100702",
+"&  c #130A02",
+"*  c #100E11",
+"=  c #111011",
+"-  c #10141D",
+";  c #131621",
+":  c #1F232D",
+">  c #1D2130",
+",  c #23202D",
+"<  c #2A2727",
+"1  c #2A2828",
+"2  c #212533",
+"3  c #24293A",
+"4  c #2B2B3B",
+"5  c #2C3042",
+"6  c #323342",
+"7  c #30364B",
+"8  c #343A4E",
+"9  c #3F3B41",
+"0  c #3D3B4B",
+"q  c #373E53",
+"w  c #3D3D50",
+"e  c #3C4252",
+"r  c #3C435A",
+"t  c #41290D",
+"y  c #523D27",
+"u  c #51463E",
+"i  c #40465E",
+"p  c #4F4D50",
+"a  c #514E5A",
+"s  c #57555E",
+"d  c #595559",
+"f  c #464C60",
+"g  c #4D5571",
+"h  c #50576F",
+"j  c #51586B",
+"k  c #5B5B64",
+"l  c #575F7B",
+"z  c #5B6276",
+"x  c #5C637E",
+"c  c #686A7F",
+"v  c #606682",
+"b  c #606981",
+"n  c #687089",
+"m  c #707185",
+"M  c #7B7A8B",
+"N  c #707894",
+"B  c #777F9F",
+"V  c #7C849C",
+"C  c #7780A1",
+"Z  c #91611F",
+"A  c #9B6920",
+"S  c #906535",
+"D  c #A26F20",
+"F  c #A77321",
+"G  c #B88024",
+"H  c #A4815A",
+"J  c #BF9C78",
+"K  c #D08514",
+"L  c #D98E1C",
+"P  c #DC9018",
+"I  c #DF9C2F",
+"U  c #E19418",
+"Y  c #EEA82C",
+"T  c #E8A331",
+"R  c #F0AA2D",
+"E  c #F3AD31",
+"W  c #DEA951",
+"Q  c #FFE07F",
+"!  c #96959C",
+"~  c #848BA0",
+"^  c #838BAA",
+"/  c #8C8DA4",
+"(  c #8F90A7",
+")  c #8890AE",
+"_  c #8790B2",
+"`  c #8891B2",
+"'  c #8997B8",
+"]  c #9291A7",
+"[  c #979DB5",
+"{  c #9C9CB1",
+"}  c #95A0B8",
+"|  c #A4A3B6",
+" . c #A5A5B8",
+".. c #A5A9BA",
+"X. c #ABABBD",
+"o. c #96A0C0",
+"O. c #9BA6C3",
+"+. c #9CA5C8",
+"@. c #A5ABC3",
+"#. c #A6AECC",
+"$. c #A3ADD4",
+"%. c #A9B1CE",
+"&. c #A7B2D8",
+"*. c #A3BDD2",
+"=. c #ABB3D0",
+"-. c #ABB5DB",
+";. c #B2B1C2",
+":. c #B3B9CF",
+">. c #BBB8C8",
+",. c #B5BEDC",
+"<. c #B2BCE3",
+"1. c #96CEF6",
+"2. c #9BCBF5",
+"3. c #98CEFB",
+"4. c #93D2FB",
+"5. c #9ED4F7",
+"6. c #99D7FB",
+"7. c #9CDAFB",
+"8. c #B7C1CE",
+"9. c #B4C3D2",
+"0. c #B5C5DE",
+"q. c #BDC5D4",
+"w. c #BAC1DD",
+"e. c #A5C5E3",
+"r. c #A2CEF3",
+"t. c #A4DEFB",
+"y. c #ABD2F3",
+"u. c #AAD6FD",
+"i. c #AEDBF4",
+"p. c #BEC5E0",
+"a. c #BCD3EC",
+"s. c #BDD9E1",
+"d. c #BCDFEB",
+"f. c #A5E0FC",
+"g. c #ABE3FB",
+"h. c #AFE8FD",
+"j. c #B9E0EF",
+"k. c #B2E5FA",
+"l. c #B3EAFC",
+"z. c #B8EDFC",
+"x. c #BCF2FE",
+"c. c #CBB59D",
+"v. c #D8BA8F",
+"b. c #ECCA82",
+"n. c #F6D383",
+"m. c #FAD887",
+"M. c #F2DB9E",
+"N. c #E5D0B4",
+"B. c #E4D0B9",
+"V. c #E9D3B4",
+"C. c #F3DCBA",
+"Z. c #FFE181",
+"A. c #C2C8D5",
+"S. c #C4CDDC",
+"D. c #C8C7D4",
+"F. c #CCCBD4",
+"G. c #CBCDDA",
+"H. c #C4CBE3",
+"J. c #C9CDE4",
+"K. c #CCD1E6",
+"L. c #CCD3E9",
+"P. c #C9DDE4",
+"I. c #CDD7F0",
+"U. c #D2D5E2",
+"Y. c #D4DBE2",
+"T. c #D4D9EB",
+"R. c #DBD9E3",
+"E. c #DBDEED",
+"W. c #D3DBF2",
+"Q. c #D8DEF0",
+"!. c #C5E1EA",
+"~. c #CBEAEE",
+"^. c #C6E8F0",
+"/. c #C1F5FE",
+"(. c #C4F9FE",
+"). c #C9F4FE",
+"_. c #CCFDFF",
+"`. c #DEE1ED",
+"'. c #D2ECF0",
+"]. c #DFE3F3",
+"[. c #D4FEFF",
+"{. c #DBFFFF",
+"}. c #E1DEE7",
+"|. c #FEF6C3",
+" X c #E2E2EC",
+".X c #E4E5F0",
+"XX c #E1E6F8",
+"oX c #E5E8F3",
+"OX c #E4E9F9",
+"+X c #EBEBF3",
+"@X c #E2FEFF",
+"#X c #EEF0F6",
+"$X c #EFF3FE",
+"%X c #EAFEFE",
+"&X c #F0F0F6",
+"*X c #F4F4F9",
+"=X c #F3FBFE",
+"-X c #F8F7FA",
+";X c #FEFEFE",
+":X c None",
+/* pixels */
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X5 8 @ :X:X:X:X:X:X:X:X:X:X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X8 L.].=.v 2 :X:X:X:X:X:X:X:X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X  7 &.Q.;X;X=XL.^ r # :X:X:X:X:X:X:X:X:X:X",
+":X:X:X:X:X:XX 3 r x V @.L.oXJ.H.-X-X;X;XOX%.l > :X:X:X:X:X:X:X:X",
+":XX e i z ~ :.K..X;X;X;X-X+X*XS.J.-X&X&X-X;X=XJ.^ q # :X:X:X:X:X",
+":X. O.$X;X;X-X+X.X`. X X.X+X+X&X,.L.+X&X+X+X&X;X;X].#.l , . :X:X",
+":X:Xj &X+Xa.r.1.1.5.i.H.U. X+X+X&X$.,.J.`.+X+X X+X*X;X=X<.7 :X:X",
+":X:Xp L.2.4.7.g.g.g.g.f.i.S. X+X#XE.H.].H.,.K. X.X X;X*XB # :X:X",
+":X< q.3.6.k.z.l.l.t.t.h.l.l.A. X+X*XH.].;X&XL.,.H.oX=X` # :X:X:X",
+":X! u.6.l.(._._.l.x.h.k.l.x.j.D.#X#X&X,..X-X;X-XE.H.-.r :X:X:X:X",
+"< 0.4.g./.[. at X%Xz.(.(.x.(.(._.9.R.#X-X}.,.#X+X+X*X-X+XJ.) i $ :X",
+"d y.6.h.(.{.=X%Xx.).[._._.[.[.s.>.*X#X-XH.L.#XoX.X.X+X-X;XOX$.5 ",
+"k u.7.g.z.{. at X).(.{.[.{.{.[.{.~.X.#X&X&X&X,. X+X+X.X.X X-X;X` # ",
+"k u.t.g.g.g.l.x.[.{.{.{.{. at X@X~.| &X*X&X*X.X,.+X+X.X X*X;X+.; :X",
+"s y.t.t.l.z./.[.{.[. at X@X%X%X%XP.| -X-X*X&X;XJ.J.+X X+X;Xw.3 :X:X",
+"9 e.f.f.t.z.(.[.[.{. at X%X=X=X=X9.X.;X-X&X*X-X-X,. X+X;XOXg   :X:X",
+"= } f.h.f.k./._.{. at X%X=X=X=X=X...X;X;X;X;X-X.X,.,.;X=XC . :X:X:X",
+":Xs e.h.k.h.(._.[. at X%X%X;X;XA...=X XT.J.,.,.H.J.+X;X[ $ :X:X:X:X",
+":X. m y.x.x./._.[.{.%X%X;XY.( { ,.I.Q.`.+X#X#X-X;X,.> :X:X:X:X:X",
+":X:X* c e.x._._.{.{.%X%X8./ X.;.U.V.C.;X*X+X*X;XL.8 :X:X:X:X:X:X",
+":X:X:X  0 V *.j.^.!.9.[ ;.F.F.G.c.I P V.=X-X;XXXh   :X:X:X:X:X:X",
+":X:X:X:X:XO , 6 w 4 3 b J.=X;Xv.b.n.Y P N.;X=XN   :X:X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X  : b X.W Z.|.m.Y P B.' @ :X:X:X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X- u F Q |.m.Y L y :X:X:X:X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X& F Q |.m.E K t :X:X:X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X& F Q |.n.E K t   :X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X& Z Z.|.m.T S   :X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:Xo Z Z.M.J M   :X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:Xo Z H ] 6   :X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:Xo * X   :X:X:X:X:X:X:X",
+":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X"
+};

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kamera.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kamera.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kamera.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+
+debian/tmp/usr/lib/kde3/kcm_kamera.la
+debian/tmp/usr/lib/kde3/kcm_kamera.so
+debian/tmp/usr/lib/kde3/kio_kamera.la
+debian/tmp/usr/lib/kde3/kio_kamera.so
+debian/tmp/usr/share/applications/kde/kamera.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kamera/common
+debian/tmp/usr/share/doc/kde/HTML/en/kamera/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kamera/index.docbook
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/camera_test.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/camera.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/camera.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/devices/camera.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/filesystems/camera.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/devices/camera.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/filesystems/camera.png
+debian/tmp/usr/share/services/camera.protocol

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kcoloredit.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kcoloredit.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kcoloredit.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,23 @@
+?package(kcoloredit):\
+	needs="X11"\
+	section="Apps/Graphics"\
+	hints="KDE"\
+	title="KColorChooser"\
+	icon32x32="/usr/share/pixmaps/kcolorchooser.xpm"\
+	icon16x16="/usr/share/pixmaps/kcolorchooser-16.xpm"\
+	command="/usr/bin/kcolorchooser"
+
+?package(kcoloredit):\
+	needs="X11"\
+	section="Apps/Graphics"\
+	hints="KDE"\
+	title="KColorEdit"\
+	icon32x32="/usr/share/pixmaps/kcoloredit.xpm"\
+	icon16x16="/usr/share/pixmaps/kcoloredit-16.xpm"\
+	command="/usr/bin/kcoloredit"
+
+# Icon 22x22 kcoloredit/cr22-app-kcolorchooser.png kcolorchooser.xpm
+# Icon 16x16 kcoloredit/cr16-app-kcolorchooser.png kcolorchooser-16.xpm
+
+# Icon 32x32 kcoloredit/cr32-app-kcoloredit.png kcoloredit.xpm
+# Icon 16x16 kcoloredit/cr16-app-kcoloredit.png kcoloredit-16.xpm

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,196 @@
+debian/tmp/usr/include/kde/dom/SVGAElement.h
+debian/tmp/usr/include/kde/dom/SVGAltGlyphDefElement.h
+debian/tmp/usr/include/kde/dom/SVGAltGlyphElement.h
+debian/tmp/usr/include/kde/dom/SVGAngle.h
+debian/tmp/usr/include/kde/dom/SVGAnimateColorElement.h
+debian/tmp/usr/include/kde/dom/SVGAnimateElement.h
+debian/tmp/usr/include/kde/dom/SVGAnimateMotionElement.h
+debian/tmp/usr/include/kde/dom/SVGAnimateTransformElement.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedAngle.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedBoolean.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedEnumeration.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedInteger.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedLength.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedLengthList.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedNumber.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedNumberList.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedPathData.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedPoints.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedPreserveAspectRatio.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedRect.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedString.h
+debian/tmp/usr/include/kde/dom/SVGAnimatedTransformList.h
+debian/tmp/usr/include/kde/dom/SVGAnimationElement.h
+debian/tmp/usr/include/kde/dom/SVGCSSRule.h
+debian/tmp/usr/include/kde/dom/SVGCircleElement.h
+debian/tmp/usr/include/kde/dom/SVGClipPathElement.h
+debian/tmp/usr/include/kde/dom/SVGColor.h
+debian/tmp/usr/include/kde/dom/SVGColorProfileElement.h
+debian/tmp/usr/include/kde/dom/SVGColorProfileRule.h
+debian/tmp/usr/include/kde/dom/SVGComponentTransferFunctionElement.h
+debian/tmp/usr/include/kde/dom/SVGCursorElement.h
+debian/tmp/usr/include/kde/dom/SVGDefinitionSrcElement.h
+debian/tmp/usr/include/kde/dom/SVGDefsElement.h
+debian/tmp/usr/include/kde/dom/SVGDescElement.h
+debian/tmp/usr/include/kde/dom/SVGDocument.h
+debian/tmp/usr/include/kde/dom/SVGElement.h
+debian/tmp/usr/include/kde/dom/SVGElementInstance.h
+debian/tmp/usr/include/kde/dom/SVGElementInstanceList.h
+debian/tmp/usr/include/kde/dom/SVGEllipseElement.h
+debian/tmp/usr/include/kde/dom/SVGEvent.h
+debian/tmp/usr/include/kde/dom/SVGException.h
+debian/tmp/usr/include/kde/dom/SVGExternalResourcesRequired.h
+debian/tmp/usr/include/kde/dom/SVGFEBlendElement.h
+debian/tmp/usr/include/kde/dom/SVGFEColorMatrixElement.h
+debian/tmp/usr/include/kde/dom/SVGFEComponentTransferElement.h
+debian/tmp/usr/include/kde/dom/SVGFECompositeElement.h
+debian/tmp/usr/include/kde/dom/SVGFEConvolveMatrixElement.h
+debian/tmp/usr/include/kde/dom/SVGFEDiffuseLightingElement.h
+debian/tmp/usr/include/kde/dom/SVGFEDisplacementMapElement.h
+debian/tmp/usr/include/kde/dom/SVGFEDistantLightElement.h
+debian/tmp/usr/include/kde/dom/SVGFEFloodElement.h
+debian/tmp/usr/include/kde/dom/SVGFEFuncAElement.h
+debian/tmp/usr/include/kde/dom/SVGFEFuncBElement.h
+debian/tmp/usr/include/kde/dom/SVGFEFuncGElement.h
+debian/tmp/usr/include/kde/dom/SVGFEFuncRElement.h
+debian/tmp/usr/include/kde/dom/SVGFEGaussianBlurElement.h
+debian/tmp/usr/include/kde/dom/SVGFEImageElement.h
+debian/tmp/usr/include/kde/dom/SVGFEMergeElement.h
+debian/tmp/usr/include/kde/dom/SVGFEMergeNodeElement.h
+debian/tmp/usr/include/kde/dom/SVGFEMorphologyElement.h
+debian/tmp/usr/include/kde/dom/SVGFEOffsetElement.h
+debian/tmp/usr/include/kde/dom/SVGFEPointLightElement.h
+debian/tmp/usr/include/kde/dom/SVGFESpecularLightingElement.h
+debian/tmp/usr/include/kde/dom/SVGFESpotLightElement.h
+debian/tmp/usr/include/kde/dom/SVGFETileElement.h
+debian/tmp/usr/include/kde/dom/SVGFETurbulenceElement.h
+debian/tmp/usr/include/kde/dom/SVGFilterElement.h
+debian/tmp/usr/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h
+debian/tmp/usr/include/kde/dom/SVGFitToViewBox.h
+debian/tmp/usr/include/kde/dom/SVGFontElement.h
+debian/tmp/usr/include/kde/dom/SVGFontFaceElement.h
+debian/tmp/usr/include/kde/dom/SVGFontFaceFormatElement.h
+debian/tmp/usr/include/kde/dom/SVGFontFaceNameElement.h
+debian/tmp/usr/include/kde/dom/SVGFontFaceSrcElement.h
+debian/tmp/usr/include/kde/dom/SVGFontFaceUriElement.h
+debian/tmp/usr/include/kde/dom/SVGForeignObjectElement.h
+debian/tmp/usr/include/kde/dom/SVGGElement.h
+debian/tmp/usr/include/kde/dom/SVGGlyphElement.h
+debian/tmp/usr/include/kde/dom/SVGGlyphRefElement.h
+debian/tmp/usr/include/kde/dom/SVGGradientElement.h
+debian/tmp/usr/include/kde/dom/SVGHKernElement.h
+debian/tmp/usr/include/kde/dom/SVGICCColor.h
+debian/tmp/usr/include/kde/dom/SVGImageElement.h
+debian/tmp/usr/include/kde/dom/SVGLangSpace.h
+debian/tmp/usr/include/kde/dom/SVGLength.h
+debian/tmp/usr/include/kde/dom/SVGLengthList.h
+debian/tmp/usr/include/kde/dom/SVGLineElement.h
+debian/tmp/usr/include/kde/dom/SVGLinearGradientElement.h
+debian/tmp/usr/include/kde/dom/SVGLocatable.h
+debian/tmp/usr/include/kde/dom/SVGMPathElement.h
+debian/tmp/usr/include/kde/dom/SVGMarkerElement.h
+debian/tmp/usr/include/kde/dom/SVGMaskElement.h
+debian/tmp/usr/include/kde/dom/SVGMatrix.h
+debian/tmp/usr/include/kde/dom/SVGMetadataElement.h
+debian/tmp/usr/include/kde/dom/SVGMissingGlyphElement.h
+debian/tmp/usr/include/kde/dom/SVGNumber.h
+debian/tmp/usr/include/kde/dom/SVGNumberList.h
+debian/tmp/usr/include/kde/dom/SVGPaint.h
+debian/tmp/usr/include/kde/dom/SVGPathElement.h
+debian/tmp/usr/include/kde/dom/SVGPathSeg.h
+debian/tmp/usr/include/kde/dom/SVGPathSegArc.h
+debian/tmp/usr/include/kde/dom/SVGPathSegClosePath.h
+debian/tmp/usr/include/kde/dom/SVGPathSegCurvetoCubic.h
+debian/tmp/usr/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h
+debian/tmp/usr/include/kde/dom/SVGPathSegCurvetoQuadratic.h
+debian/tmp/usr/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h
+debian/tmp/usr/include/kde/dom/SVGPathSegLineto.h
+debian/tmp/usr/include/kde/dom/SVGPathSegLinetoHorizontal.h
+debian/tmp/usr/include/kde/dom/SVGPathSegLinetoVertical.h
+debian/tmp/usr/include/kde/dom/SVGPathSegList.h
+debian/tmp/usr/include/kde/dom/SVGPathSegMoveto.h
+debian/tmp/usr/include/kde/dom/SVGPatternElement.h
+debian/tmp/usr/include/kde/dom/SVGPoint.h
+debian/tmp/usr/include/kde/dom/SVGPointList.h
+debian/tmp/usr/include/kde/dom/SVGPolygonElement.h
+debian/tmp/usr/include/kde/dom/SVGPolylineElement.h
+debian/tmp/usr/include/kde/dom/SVGPreserveAspectRatio.h
+debian/tmp/usr/include/kde/dom/SVGRadialGradientElement.h
+debian/tmp/usr/include/kde/dom/SVGRect.h
+debian/tmp/usr/include/kde/dom/SVGRectElement.h
+debian/tmp/usr/include/kde/dom/SVGRenderingIntent.h
+debian/tmp/usr/include/kde/dom/SVGSVGElement.h
+debian/tmp/usr/include/kde/dom/SVGScriptElement.h
+debian/tmp/usr/include/kde/dom/SVGSetElement.h
+debian/tmp/usr/include/kde/dom/SVGStopElement.h
+debian/tmp/usr/include/kde/dom/SVGStringList.h
+debian/tmp/usr/include/kde/dom/SVGStylable.h
+debian/tmp/usr/include/kde/dom/SVGStyleElement.h
+debian/tmp/usr/include/kde/dom/SVGSwitchElement.h
+debian/tmp/usr/include/kde/dom/SVGSymbolElement.h
+debian/tmp/usr/include/kde/dom/SVGTRefElement.h
+debian/tmp/usr/include/kde/dom/SVGTSpanElement.h
+debian/tmp/usr/include/kde/dom/SVGTests.h
+debian/tmp/usr/include/kde/dom/SVGTextContentElement.h
+debian/tmp/usr/include/kde/dom/SVGTextElement.h
+debian/tmp/usr/include/kde/dom/SVGTextPathElement.h
+debian/tmp/usr/include/kde/dom/SVGTextPositioningElement.h
+debian/tmp/usr/include/kde/dom/SVGTitleElement.h
+debian/tmp/usr/include/kde/dom/SVGTransform.h
+debian/tmp/usr/include/kde/dom/SVGTransformList.h
+debian/tmp/usr/include/kde/dom/SVGTransformable.h
+debian/tmp/usr/include/kde/dom/SVGURIReference.h
+debian/tmp/usr/include/kde/dom/SVGUnitTypes.h
+debian/tmp/usr/include/kde/dom/SVGUseElement.h
+debian/tmp/usr/include/kde/dom/SVGVKernElement.h
+debian/tmp/usr/include/kde/dom/SVGViewElement.h
+debian/tmp/usr/include/kde/dom/SVGViewSpec.h
+debian/tmp/usr/include/kde/dom/SVGWindow.h
+debian/tmp/usr/include/kde/dom/SVGZoomAndPan.h
+debian/tmp/usr/include/kde/dom/SVGZoomEvent.h
+debian/tmp/usr/include/kde/kfaximage.h
+debian/tmp/usr/include/kde/kmultipageInterface.h
+debian/tmp/usr/include/kde/ksvg/CanvasFactory.h
+debian/tmp/usr/include/kde/ksvg/CanvasItem.h
+debian/tmp/usr/include/kde/ksvg/CanvasItems.h
+debian/tmp/usr/include/kde/ksvg/DocumentFactory.h
+debian/tmp/usr/include/kde/ksvg/KSVGCanvas.h
+debian/tmp/usr/include/kde/ksvg/ksvg_plugin.h
+debian/tmp/usr/include/kde/kviewshell/anchor.h
+debian/tmp/usr/include/kde/kviewshell/bookmark.h
+debian/tmp/usr/include/kde/kviewshell/pageView.h
+debian/tmp/usr/include/kde/kviewshell/documentPageCache.h
+debian/tmp/usr/include/kde/kviewshell/documentRenderer.h
+debian/tmp/usr/include/kde/kviewshell/documentWidget.h
+debian/tmp/usr/include/kde/kviewshell/history.h
+debian/tmp/usr/include/kde/kviewshell/hyperlink.h
+debian/tmp/usr/include/kde/kviewshell/kmultipage.h
+debian/tmp/usr/include/kde/kviewshell/length.h
+debian/tmp/usr/include/kde/kviewshell/pageNumber.h
+debian/tmp/usr/include/kde/kviewshell/pageSize.h
+debian/tmp/usr/include/kde/kviewshell/renderedDocumentPage.h
+debian/tmp/usr/include/kde/kviewshell/renderedDocumentPagePixmap.h
+debian/tmp/usr/include/kde/kviewshell/renderedDocumentPagePrinter.h
+debian/tmp/usr/include/kde/kviewshell/selection.h
+debian/tmp/usr/include/kde/kviewshell/simplePageSize.h
+debian/tmp/usr/include/kde/kviewshell/textBox.h
+debian/tmp/usr/include/kde/kviewshell/zoom.h
+debian/tmp/usr/include/kde/kviewshell/zoomlimits.h
+debian/tmp/usr/include/kde/libtext2path-0.1/BezierPath.h
+debian/tmp/usr/include/kde/libtext2path-0.1/Glyph.h
+debian/tmp/usr/include/kde/libtext2path-0.1/GlyphTracer.h
+debian/tmp/usr/lib/libkdeinit_kuickshow.la
+debian/tmp/usr/lib/libkdeinit_kview.la
+debian/tmp/usr/lib/libkdeinit_mrmlsearch.la
+debian/tmp/usr/lib/libkghostviewlib.la
+debian/tmp/usr/lib/libkghostviewlib.so
+debian/tmp/usr/lib/libkimageviewer.la
+debian/tmp/usr/lib/libkimageviewer.so
+debian/tmp/usr/lib/libkmultipage.la
+debian/tmp/usr/lib/libkmultipage.so
+debian/tmp/usr/lib/libkpovmodeler.la
+debian/tmp/usr/lib/libkpovmodeler.so
+debian/tmp/usr/lib/libksvg.la
+debian/tmp/usr/lib/libksvg.so
+debian/tmp/usr/lib/libtext2path.la
+debian/tmp/usr/lib/libtext2path.so

Added: 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.kamera	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-kamera
+Title: Kamera Handbook
+Author: Not listed
+Abstract: Kamera allows you to view and download images on a digital camera.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kamera/index.html
+Files: /usr/share/doc/kde/HTML/en/kamera/*.html
+

Added: 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.kcoloredit	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdegraphics-doc-html-kcoloredit
+Title: KColorEdit Handbook
+Author: Artur Rataj
+Abstract: KColorEdit is a palette files editor. It can be used for editing
+ color palettes and for color choosing and naming.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kcoloredit/index.html
+Files: /usr/share/doc/kde/HTML/en/kcoloredit/*.html
+

Added: 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.kdvi	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-kdvi
+Title: KDVI Handbook
+Author: Stefan Kebekus
+Abstract: This program and KPart allow the user to display *.DVI files from TeX.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kdvi/index.html
+Files: /usr/share/doc/kde/HTML/en/kdvi/*.html
+

Added: 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.kgamma	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-kgamma
+Title: KGamma Handbook
+Author: Michael v. Ostheim
+Abstract: KGamma is a simple tool for monitor gamma correction.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kgamma/index.html
+Files: /usr/share/doc/kde/HTML/en/kgamma/*.html
+

Added: 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.kghostview	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdegraphics-doc-html-kghostview
+Title: KGhostView Handbook
+Author: Pamela Roberts
+Abstract: KGhostView displays and prints PostScript and
+ Portable Document Format files.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kghostview/index.html
+Files: /usr/share/doc/kde/HTML/en/kghostview/*.html
+

Added: 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.kiconedit	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdegraphics-doc-html-kiconedit
+Title: KIconEdit Handbook
+Author: Thomas Tanghus, Lauri Watts
+Abstract: KIconEdit is designed to help create icons for KDE using the
+ standard icon palette.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kiconedit/index.html
+Files: /usr/share/doc/kde/HTML/en/kiconedit/*.html
+

Added: 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.kolourpaint	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-kolourpaint
+Title: KolourPaint Handbook
+Author: Thurston Dang, Clarence Dang
+Abstract: KolourPaint is a free, easy-to-use paint program for KDE.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kolourpaint/index.html
+Files: /usr/share/doc/kde/HTML/en/kolourpaint/*.html
+

Added: 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.kooka	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-kooka
+Title: Kooka Handbook
+Author: Klaas Freitag, Martin Sommer 
+Abstract: Kooka is a very useful KDE scanning application.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kooka/index.html
+Files: /usr/share/doc/kde/HTML/en/kooka/*.html
+

Added: 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.kpdf	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-kpdf
+Title: KPDF Handbook
+Author: Albert Astals Cid
+Abstract: KPDF is a KDE PDF viewer based on xpdf code.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpdf/index.html
+Files: /usr/share/doc/kde/HTML/en/kpdf/*.html
+

Added: 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.kpovmodeler	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdegraphics-doc-html-kpovmodeler
+Title: KPovModeler Handbook
+Author: Lauri Watts, Andreas Zehender, Olivier Saraja
+Abstract: KPovModeler is a graphical 3D modeler, which can generate
+ scenes for PovRay.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpovmodeler/index.html
+Files: /usr/share/doc/kde/HTML/en/kpovmodeler/*.html
+

Added: 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.kruler	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-kruler
+Title: KRuler Handbook
+Author: Lauri Watts
+Abstract: KRuler can be used to measure objects on the screen. 
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kruler/index.html
+Files: /usr/share/doc/kde/HTML/en/kruler/*.html
+

Added: 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.ksnapshot	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-ksnapshot
+Title: KSnapshot Handbook
+Author: Richard J. Moore, Robert L. McCormick, Brad Hards, Lauri Watts
+Abstract: KSnapshot is a simple applet for taking screenshots.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ksnapshot/index.html
+Files: /usr/share/doc/kde/HTML/en/ksnapshot/*.html
+

Added: 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.kuickshow	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-kuickshow
+Title: KuickShow Handbook
+Author: Carsten Pfeiffer 
+Abstract: KuickShow is a comfortable image browser/viewer.
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kuickshow/index.html
+Files: /usr/share/doc/kde/HTML/en/kuickshow/*.html
+

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdegraphics-doc-html-kview
+Title: KView Handbook
+Author: Hauke Hildebrandt, Sirtaj Singh Kang
+Abstract: KView is an image viewing program. 
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kview/index.html
+Files: /usr/share/doc/kde/HTML/en/kview/*.html
+

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-kfile-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-kfile-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdegraphics-kfile-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,59 @@
+debian/tmp/etc/kde3/magic/x-image-raw.magic
+debian/tmp/usr/lib/kde3/gsthumbnail.la
+debian/tmp/usr/lib/kde3/gsthumbnail.so
+debian/tmp/usr/lib/kde3/kfile_bmp.la
+debian/tmp/usr/lib/kde3/kfile_bmp.so
+debian/tmp/usr/lib/kde3/kfile_dds.la
+debian/tmp/usr/lib/kde3/kfile_dds.so
+debian/tmp/usr/lib/kde3/kfile_dvi.la
+debian/tmp/usr/lib/kde3/kfile_dvi.so
+debian/tmp/usr/lib/kde3/kfile_exr.la
+debian/tmp/usr/lib/kde3/kfile_exr.so
+debian/tmp/usr/lib/kde3/kfile_gif.la
+debian/tmp/usr/lib/kde3/kfile_gif.so
+debian/tmp/usr/lib/kde3/kfile_ico.la
+debian/tmp/usr/lib/kde3/kfile_ico.so
+debian/tmp/usr/lib/kde3/kfile_jpeg.la
+debian/tmp/usr/lib/kde3/kfile_jpeg.so
+debian/tmp/usr/lib/kde3/kfile_pcx.la
+debian/tmp/usr/lib/kde3/kfile_pcx.so
+debian/tmp/usr/lib/kde3/kfile_pdf.la
+debian/tmp/usr/lib/kde3/kfile_pdf.so
+debian/tmp/usr/lib/kde3/kfile_png.la
+debian/tmp/usr/lib/kde3/kfile_png.so
+debian/tmp/usr/lib/kde3/kfile_pnm.la
+debian/tmp/usr/lib/kde3/kfile_pnm.so
+debian/tmp/usr/lib/kde3/kfile_ps.la
+debian/tmp/usr/lib/kde3/kfile_ps.so
+debian/tmp/usr/lib/kde3/kfile_raw.la
+debian/tmp/usr/lib/kde3/kfile_raw.so
+debian/tmp/usr/lib/kde3/kfile_rgb.la
+debian/tmp/usr/lib/kde3/kfile_rgb.so
+debian/tmp/usr/lib/kde3/kfile_tga.la
+debian/tmp/usr/lib/kde3/kfile_tga.so
+debian/tmp/usr/lib/kde3/kfile_tiff.la
+debian/tmp/usr/lib/kde3/kfile_tiff.so
+debian/tmp/usr/lib/kde3/kfile_xbm.la
+debian/tmp/usr/lib/kde3/kfile_xbm.so
+debian/tmp/usr/lib/kde3/kfile_xpm.la
+debian/tmp/usr/lib/kde3/kfile_xpm.so
+debian/tmp/usr/share/mimelnk/image/x-image-raw.desktop
+debian/tmp/usr/share/services/gsthumbnail.desktop
+debian/tmp/usr/share/services/kfile_bmp.desktop
+debian/tmp/usr/share/services/kfile_dds.desktop
+debian/tmp/usr/share/services/kfile_dvi.desktop
+debian/tmp/usr/share/services/kfile_exr.desktop
+debian/tmp/usr/share/services/kfile_gif.desktop
+debian/tmp/usr/share/services/kfile_ico.desktop
+debian/tmp/usr/share/services/kfile_jpeg.desktop
+debian/tmp/usr/share/services/kfile_pcx.desktop
+debian/tmp/usr/share/services/kfile_pdf.desktop
+debian/tmp/usr/share/services/kfile_png.desktop
+debian/tmp/usr/share/services/kfile_pnm.desktop
+debian/tmp/usr/share/services/kfile_ps.desktop
+debian/tmp/usr/share/services/kfile_raw.desktop
+debian/tmp/usr/share/services/kfile_rgb.desktop
+debian/tmp/usr/share/services/kfile_tga.desktop
+debian/tmp/usr/share/services/kfile_tiff.desktop
+debian/tmp/usr/share/services/kfile_xbm.desktop
+debian/tmp/usr/share/services/kfile_xpm.desktop

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,28 @@
+debian/tmp/usr/bin/kdvi
+debian/tmp/usr/lib/kde3/kdvipart.la
+debian/tmp/usr/lib/kde3/kdvipart.so
+debian/tmp/usr/share/applications/kde/kdvi.desktop
+debian/tmp/usr/share/apps/kdvi/kdvi_part.rc
+debian/tmp/usr/share/apps/kdvi/kviewshell.rc
+debian/tmp/usr/share/apps/kdvi/tips
+debian/tmp/usr/share/config.kcfg/kdvi.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/KDVI-features.dvi
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/KDVI-features.tex
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/aboutkde.ps
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/kdvi-search.el
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/optionrequester1.png
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/optionrequester2.png
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/srcltx.sty
+debian/tmp/usr/share/doc/kde/HTML/en/kdvi/srctex.sty
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kdvi.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kdvi.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kdvi.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kdvi.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kdvi.svgz
+debian/tmp/usr/share/services/kdvimultipage.desktop
+
+debian/icons/kdvi.xpm		/usr/share/pixmaps
+debian/icons/kdvi-16.xpm	/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.mime
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kdvi.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+application/x-dvi;	kviewshell dvi %s -caption "DVI Viewer";	nametemplate=%s.dvi;	test=test "$DISPLAY" != "";	priority=4

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kfax.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kfax.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kfax.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+debian/tmp/usr/bin/kfax
+debian/tmp/usr/share/applications/kde/kfax.desktop
+debian/tmp/usr/share/apps/kfax/kfaxui.rc
+debian/tmp/usr/share/apps/kfax/pics/kfax.tif
+debian/tmp/usr/share/apps/kfax/pics/kfaxlogo.xpm
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kfax.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kfax.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kfax.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kfax.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kfax.svgz
+
+debian/icons/kfax.xpm		/usr/share/pixmaps
+debian/icons/kfax-16.xpm	/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kfax.mime
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kfax.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kfax.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+image/fax-g3;	kviewshell fax %s -caption "Fax Viewer";	nametemplate=%s.g3;	test=test "$DISPLAY" != "";	priority=5

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kfaxview.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kfaxview.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kfaxview.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+debian/tmp/usr/bin/kfaxview
+debian/tmp/usr/lib/kde3/kfaxviewpart.so
+debian/tmp/usr/lib/kde3/kfaxviewpart.la
+debian/tmp/usr/lib/libkfaximage.so
+debian/tmp/usr/lib/libkfaximage.la
+debian/tmp/usr/share/applications/kde/kfaxview.desktop
+debian/tmp/usr/share/apps/kfaxview/kviewshell.rc
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kfaxview.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kfaxview.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kfaxview.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kfaxview.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kfaxview.svgz
+debian/tmp/usr/share/services/kfaxmultipage.desktop
+debian/tmp/usr/share/services/kfaxmultipage_tiff.desktop

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kgamma.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kgamma.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kgamma.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+debian/tmp/usr/bin/xf86gammacfg
+debian/tmp/usr/lib/kde3/kcm_kgamma.la
+debian/tmp/usr/lib/kde3/kcm_kgamma.so
+debian/tmp/usr/share/applications/kde/kgamma.desktop
+debian/tmp/usr/share/apps/kgamma/pics/background.png
+debian/tmp/usr/share/apps/kgamma/pics/cmyscale.png
+debian/tmp/usr/share/apps/kgamma/pics/darkgrey.png
+debian/tmp/usr/share/apps/kgamma/pics/greyscale.png
+debian/tmp/usr/share/apps/kgamma/pics/lightgrey.png
+debian/tmp/usr/share/apps/kgamma/pics/midgrey.png
+debian/tmp/usr/share/apps/kgamma/pics/rgbscale.png
+debian/tmp/usr/share/doc/kde/HTML/en/kgamma/common
+debian/tmp/usr/share/doc/kde/HTML/en/kgamma/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kgamma/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kgamma.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kgamma.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kgamma.png

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,24 @@
+debian/tmp/usr/bin/kghostview
+debian/tmp/usr/lib/kde3/libkghostviewpart.la
+debian/tmp/usr/lib/kde3/libkghostviewpart.so
+debian/tmp/usr/lib/libkghostviewlib.so.0
+debian/tmp/usr/lib/libkghostviewlib.so.0.0.0
+debian/tmp/usr/share/applications/kde/kghostview.desktop
+debian/tmp/usr/share/apps/kconf_update/kghostview.upd
+debian/tmp/usr/share/apps/kconf_update/update-to-xt-names.pl
+debian/tmp/usr/share/apps/kghostview/kghostviewui.rc
+debian/tmp/usr/share/apps/kghostview/kgv_part.rc
+debian/tmp/usr/share/apps/kghostview/pdf_sec.ps
+debian/tmp/usr/share/config.kcfg/kghostview.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kghostview/common
+debian/tmp/usr/share/doc/kde/HTML/en/kghostview/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kghostview/index.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kghostview.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kghostview.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kghostview.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kghostview.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kghostview.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kghostview.png
+
+debian/icons/kghostview.xpm		/usr/share/pixmaps
+debian/icons/kghostview-16.xpm		/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.mime
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kghostview.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+application/pdf;	kghostview %s -caption "PS/PDF Viewer";	nametemplate=%s.pdf;	test=test "$DISPLAY" != "";	priority=5
+application/postscript;	kghostview %s -caption "PS/PDF Viewer";	nametemplate=%s.ps;	test=test "$DISPLAY" != "";	priority=5
+image/x-eps;	kghostview %s -caption "PS/PDF Viewer";	nametemplate=%s.eps;	test=test "$DISPLAY" != "";	priority=5

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kiconedit.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kiconedit.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kiconedit.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,41 @@
+debian/tmp/usr/bin/kiconedit
+debian/tmp/usr/share/applications/kde/kiconedit.desktop
+debian/tmp/usr/share/apps/kiconedit/kiconeditui.rc
+debian/tmp/usr/share/apps/kiconedit/pics/aim-cursor.xpm
+debian/tmp/usr/share/apps/kiconedit/pics/aim.png
+debian/tmp/usr/share/apps/kiconedit/pics/airbrush-cursor.xpm
+debian/tmp/usr/share/apps/kiconedit/pics/areaselect.png
+debian/tmp/usr/share/apps/kiconedit/pics/circle.png
+debian/tmp/usr/share/apps/kiconedit/pics/colorpicker-cursor.xpm
+debian/tmp/usr/share/apps/kiconedit/pics/compressed.png
+debian/tmp/usr/share/apps/kiconedit/pics/ellipse.png
+debian/tmp/usr/share/apps/kiconedit/pics/eraser-cursor.xpm
+debian/tmp/usr/share/apps/kiconedit/pics/fileclose.png
+debian/tmp/usr/share/apps/kiconedit/pics/fill-cursor.xpm
+debian/tmp/usr/share/apps/kiconedit/pics/filledcircle.png
+debian/tmp/usr/share/apps/kiconedit/pics/filledellipse.png
+debian/tmp/usr/share/apps/kiconedit/pics/filledrectangle.png
+debian/tmp/usr/share/apps/kiconedit/pics/grayscale.png
+debian/tmp/usr/share/apps/kiconedit/pics/grid.png
+debian/tmp/usr/share/apps/kiconedit/pics/kdepalette.png
+debian/tmp/usr/share/apps/kiconedit/pics/line.png
+debian/tmp/usr/share/apps/kiconedit/pics/paintbrush-cursor.xpm
+debian/tmp/usr/share/apps/kiconedit/pics/pointer.png
+debian/tmp/usr/share/apps/kiconedit/pics/rectangle.png
+debian/tmp/usr/share/apps/kiconedit/pics/selectcircle.png
+debian/tmp/usr/share/apps/kiconedit/pics/selectrect.png
+debian/tmp/usr/share/apps/kiconedit/pics/source.png
+debian/tmp/usr/share/apps/kiconedit/pics/standard.png
+debian/tmp/usr/share/apps/kiconedit/pics/transform.png
+debian/tmp/usr/share/apps/kiconedit/pics/window_new.png
+debian/tmp/usr/share/doc/kde/HTML/en/kiconedit/common
+debian/tmp/usr/share/doc/kde/HTML/en/kiconedit/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kiconedit/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kiconedit/kiconedit-configuration.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kiconedit.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kiconedit.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kiconedit.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kiconedit.png
+
+debian/icons/kiconedit.xpm		/usr/share/pixmaps
+debian/icons/kiconedit-16.xpm		/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kmrml.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kmrml.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kmrml.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+debian/tmp/usr/bin/mrmlsearch
+debian/tmp/usr/lib/kde3/kcm_kmrml.la
+debian/tmp/usr/lib/kde3/kcm_kmrml.so
+debian/tmp/usr/lib/kde3/kded_daemonwatcher.la
+debian/tmp/usr/lib/kde3/kded_daemonwatcher.so
+debian/tmp/usr/lib/kde3/kio_mrml.la
+debian/tmp/usr/lib/kde3/kio_mrml.so
+debian/tmp/usr/lib/kde3/libkmrmlpart.la
+debian/tmp/usr/lib/kde3/libkmrmlpart.so
+debian/tmp/usr/lib/kde3/mrmlsearch.la
+debian/tmp/usr/lib/kde3/mrmlsearch.so
+debian/tmp/usr/lib/libkdeinit_mrmlsearch.so
+debian/tmp/usr/share/applications/kde/kcmkmrml.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
+debian/tmp/usr/share/mimelnk/text/mrml.desktop
+debian/tmp/usr/share/services/kded/daemonwatcher.desktop
+debian/tmp/usr/share/services/mrml.protocol
+debian/tmp/usr/share/services/mrml_part.desktop

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kmrml.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kmrml.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kmrml.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+kmrml: no-shlibs-control-file usr/lib/libkdeinit_mrmlsearch.so
+kmrml: postinst-must-call-ldconfig usr/lib/libkdeinit_mrmlsearch.so
+kmrml: postrm-should-call-ldconfig usr/lib/libkdeinit_mrmlsearch.so

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kolourpaint.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kolourpaint.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kolourpaint.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,172 @@
+debian/tmp/usr/bin/kolourpaint
+debian/tmp/usr/share/applications/kde/kolourpaint.desktop
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_brush.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_picker.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_color_washer.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_curve.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_ellipse.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_elliptical_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_eraser.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_flood_fill.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_free_form_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_line.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_pen.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_polygon.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_polyline.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rect_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rectangle.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_rounded_rectangle.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_spraycan.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/16x16/actions/tool_text.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_brush.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_color_picker.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_color_washer.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_curve.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_ellipse.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_elliptical_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_eraser.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_flood_fill.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_free_form_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_line.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_pen.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_polygon.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_polyline.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rect_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rectangle.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_rounded_rectangle.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_spraycan.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/22x22/actions/tool_text.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_brush.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_color_picker.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_color_washer.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_curve.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_ellipse.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_elliptical_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_eraser.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_flood_fill.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_free_form_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_line.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_pen.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_polygon.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_polyline.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rect_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rectangle.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_rounded_rectangle.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_spraycan.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/32x32/actions/tool_text.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_brush.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_color_picker.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_color_washer.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_curve.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_ellipse.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_elliptical_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_eraser.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_flood_fill.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_free_form_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_line.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_pen.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_polygon.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_polyline.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rect_selection.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rectangle.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_rounded_rectangle.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_spraycan.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/48x48/actions/tool_text.png
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_brush.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_color_picker.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_color_washer.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_curve.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_ellipse.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_elliptical_selection.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_eraser.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_flood_fill.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_free_form_selection.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_line.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_pen.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_polygon.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_polyline.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rect_selection.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rectangle.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_rounded_rectangle.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_spraycan.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/crystalsvg/scalable/actions/tool_text.svgz
+debian/tmp/usr/share/apps/kolourpaint/icons/hicolor/16x16/apps/kolourpaint.png
+debian/tmp/usr/share/apps/kolourpaint/icons/hicolor/22x22/apps/kolourpaint.png
+debian/tmp/usr/share/apps/kolourpaint/icons/hicolor/32x32/apps/kolourpaint.png
+debian/tmp/usr/share/apps/kolourpaint/icons/hicolor/48x48/apps/kolourpaint.png
+debian/tmp/usr/share/apps/kolourpaint/icons/hicolor/scalable/apps/kolourpaint.svgz
+debian/tmp/usr/share/apps/kolourpaint/kolourpaintui.rc
+debian/tmp/usr/share/apps/kolourpaint/pics/color_transparent_26x26.png
+debian/tmp/usr/share/apps/kolourpaint/pics/colorbutton_swap_16x16.png
+debian/tmp/usr/share/apps/kolourpaint/pics/image_rotate_anticlockwise.png
+debian/tmp/usr/share/apps/kolourpaint/pics/image_rotate_clockwise.png
+debian/tmp/usr/share/apps/kolourpaint/pics/image_skew_horizontal.png
+debian/tmp/usr/share/apps/kolourpaint/pics/image_skew_vertical.png
+debian/tmp/usr/share/apps/kolourpaint/pics/option_opaque.png
+debian/tmp/usr/share/apps/kolourpaint/pics/option_transparent.png
+debian/tmp/usr/share/apps/kolourpaint/pics/resize.png
+debian/tmp/usr/share/apps/kolourpaint/pics/scale.png
+debian/tmp/usr/share/apps/kolourpaint/pics/smooth_scale.png
+debian/tmp/usr/share/apps/kolourpaint/pics/tool_spraycan_17x17.png
+debian/tmp/usr/share/apps/kolourpaint/pics/tool_spraycan_29x29.png
+debian/tmp/usr/share/apps/kolourpaint/pics/tool_spraycan_9x9.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/kolourpaint-main.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/view_thumbnails.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/brush_shapes.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/color_box.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/common
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/eraser_shapes.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/fcc_std_text.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/fcc_trans_text.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/fill_color_similarity.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/fill_style.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_balance.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_emboss.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_flatten.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_flip.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_invert.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_reduce_colors.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_resize_scale.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_rotate.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_skew.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/image_soften_sharpen.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/line_width.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/lines_30_45_deg.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/lines_30_deg.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/lines_45_deg.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/rotate_image_30.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/rotate_selection_30.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/selections_opaque_transparent.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/spraycan_patterns.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/text_zoom_grid.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_brush.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_color_picker.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_color_washer.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_curve.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_ellipse.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_elliptical_selection.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_eraser.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_flood_fill.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_free_form_selection.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_line.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_pen.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_polygon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_polyline.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_polystar.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_rect_selection.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_rectangle.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_rectangles.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_rounded_rectangle.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_selections.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_spraycan.png
+debian/tmp/usr/share/doc/kde/HTML/en/kolourpaint/tool_text.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kolourpaint.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kolourpaint.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kolourpaint.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kolourpaint.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kolourpaint.svgz
+
+debian/icons/kolourpaint.xpm		/usr/share/pixmaps
+debian/icons/kolourpaint-16.xpm		/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kooka.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kooka.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kooka.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+debian/tmp/etc/kde3/kookarc
+debian/tmp/usr/bin/kooka
+debian/tmp/usr/share/applications/kde/kooka.desktop
+debian/tmp/usr/share/apps/kooka/kookaui.rc
+debian/tmp/usr/share/apps/kooka/pics/gocr.png
+debian/tmp/usr/share/apps/kooka/pics/lockzoom.png
+debian/tmp/usr/share/apps/kooka/pics/mirror-both.png
+debian/tmp/usr/share/apps/kooka/pics/mirror-horiz.png
+debian/tmp/usr/share/apps/kooka/pics/mirror-vert.png
+debian/tmp/usr/share/apps/kooka/pics/newfromselect.png
+debian/tmp/usr/share/apps/kooka/pics/ocr-select.png
+debian/tmp/usr/share/apps/kooka/pics/ocr.png
+debian/tmp/usr/share/apps/kooka/pics/ocrad.png
+debian/tmp/usr/share/apps/kooka/pics/scaleorig.png
+debian/tmp/usr/share/apps/kooka/pics/scaletoheight.png
+debian/tmp/usr/share/apps/kooka/pics/scaletowidth.png
+debian/tmp/usr/share/apps/kooka/pics/thumbviewtile.png
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/common
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/kooka_gocr.png
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/kooka_gocr_result.png
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/kooka_mainctrl.png
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/ocr-select.png
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/shortcut0.png
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/shortcut1.png
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/toolbar.png
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/toolbar1.png
+debian/tmp/usr/share/doc/kde/HTML/en/kooka/toolbar2.png
+
+debian/icons/kooka.xpm		/usr/share/pixmaps
+debian/icons/kooka-16.xpm	/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kooka.menu
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kooka.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kooka.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+?package(kooka):\
+	needs="X11"\
+	section="Apps/Graphics"\
+	hints="KDE"\
+	title="Kooka"\
+	icon32x32="/usr/share/pixmaps/kooka.xpm"\
+	icon16x16="/usr/share/pixmaps/kooka-16.xpm"\
+	command="/usr/bin/kooka"
+
+# Icon 32x32 /usr/share/icons/crystalsvg/32x32/devices/scanner.png kooka.xpm
+# Icon 16x16 /usr/share/icons/crystalsvg/16x16/devices/scanner.png kooka-16.xpm

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kpdf.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kpdf.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kpdf.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+debian/tmp/usr/bin/kpdf
+debian/tmp/usr/lib/kde3/libkpdfpart.la
+debian/tmp/usr/lib/kde3/libkpdfpart.so
+debian/tmp/usr/share/applications/kde/kpdf.desktop
+debian/tmp/usr/share/apps/kpdf/shell.rc
+debian/tmp/usr/share/apps/kpdfpart/part.rc
+debian/tmp/usr/share/config.kcfg/kpdf.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kpdf/common
+debian/tmp/usr/share/doc/kde/HTML/en/kpdf/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kpdf/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kpdf/configure.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kpdf.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kpdf.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kpdf.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kpdf.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kpdf.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kpdf.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kpdf.svgz
+debian/tmp/usr/share/services/kpdf_part.desktop
+
+debian/icons/kpdf.xpm		/usr/share/pixmaps
+debian/icons/kpdf-16.xpm	/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kpdf.mime
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kpdf.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kpdf.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+application/pdf;	kpdf %s;	nametemplate=%s.pdf;	test=test "$DISPLAY" != "";	priority=5

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kpovmodeler.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kpovmodeler.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kpovmodeler.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,426 @@
+debian/tmp/usr/bin/kpovmodeler
+debian/tmp/usr/lib/kde3/libkpovmodelerpart.la
+debian/tmp/usr/lib/kde3/libkpovmodelerpart.so
+debian/tmp/usr/lib/libkpovmodeler.so.0
+debian/tmp/usr/lib/libkpovmodeler.so.0.0.0
+debian/tmp/usr/share/applications/kde/kpovmodeler.desktop
+debian/tmp/usr/share/apps/kpovmodeler/baseinsertrules.xml
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/chars.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/finish.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/glass.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/golds.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/metals.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/shapes.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/shapes2.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/shapesq.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/skies.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/stars.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/stones1.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/stones2.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/textures.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/inlined/woods.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/chars.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/finish.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/glass.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/golds.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/metals.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/shapes.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/shapes2.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/shapesq.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/skies.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/stars.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/stones1.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/stones2.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/textures.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/includes/original/woods.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/advanced/ants.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/advanced/bee.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/advanced/ink.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/advanced/table.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/csg/cheese.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/csg/emptybox.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/csg/heightfield.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/interior/cubes.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/interior/media1.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/interior/media2.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/interior/media3.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/interior/spheres.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/lights/arealight.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/lights/arealight2.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/lights/spotlight.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/objects/allobjects.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/objects/fractals.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/objects/lathe.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/objects/prism.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/objects/sor.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/objects/superellipsoid.kpm
+debian/tmp/usr/share/apps/kpovmodeler/examples/scenes/objects/text.kpm
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddpoint.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddpointabove.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmaddsubprism.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbicubicpatch.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblendmapmodifiers.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblob.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblobcylinder.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmblobsphere.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmboundedby.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbox.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmbumpmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcamera.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmclippedby.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcolorlist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcolormap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcolormapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcomment.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcone.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmcylinder.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensity.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitydeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitylist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitymap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdensitymapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdialogview.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdifference.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdisc.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmdrag.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfinish.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfinishdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfog.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmfogdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglobalphotons.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglobalsettings.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmglview.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmheightfield.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmimagemap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminserterrors.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertfirstchild.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertlastchild.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminsertsibling.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminterior.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriordeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriortexture.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pminteriortexturedeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmintersection.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmisosurface.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmjuliafractal.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlathe.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlight.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlightgroup.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlistpattern.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmlookslike.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterial.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterialdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmaterialmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmatrix.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmedia.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmediadeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmerge.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmmesh.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormal.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormaldeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormallist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormalmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmnormalmapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmobjectdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmobjectlink.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpattern.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmphotons.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigment.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentlist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpigmentmapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmplane.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmpolynom.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmprism.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmprojectedthrough.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmquickcolor.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmradiosity.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrainbow.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrainbowdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmraw.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmremovepoint.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrender.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrenderpreview.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrendersettings.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmrotate.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmscale.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmscene.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmskysphere.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmskyspheredeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslope.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslopemap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmslopemapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsolidcolor.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsor.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsphere.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmspheresweep.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmsqe.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtext.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexture.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturedeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturelist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturemap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtexturemapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtorus.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtranslate.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtreeview.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmtriangle.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmunion.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/16x16/actions/pmwarp.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmbicubicpatch.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblendmapmodifiers.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblob.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblobcylinder.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmblobsphere.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmboundedby.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmbox.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmbumpmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcamera.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmclippedby.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolorlist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolormap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcolormapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcomment.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcone.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigurecolors.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguredialogview.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguregraphicalview.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguregrid.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureobjectlibrary.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureobjects.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureopengl.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigurepovray.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfiguretexturepreview.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmconfigureviewlayout.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmcylinder.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensity.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitydeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitylist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitymap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdensitymapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdifference.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdisc.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmdrag.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfinish.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfinishdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfog.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmfogdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmglobalphotons.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmglobalsettings.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmheightfield.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmimagemap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminserterrors.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminterior.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriordeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriortexture.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pminteriortexturedeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmintersection.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmisosurface.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmjuliafractal.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlathe.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlight.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlightgroup.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlistpattern.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmlookslike.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterial.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterialdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmaterialmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmatrix.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmedia.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmediadeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmerge.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmmesh.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormal.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormaldeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormallist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormalmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmnormalmapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmobjectdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmobjectlink.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpattern.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmphotons.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigment.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentlist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpigmentmapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmplane.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmpolynom.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmprism.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmprojectedthrough.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmquickcolor.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmradiosity.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrainbow.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrainbowdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmraw.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrender.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrenderpreview.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrendersettings.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmrotate.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmscale.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmscene.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmskysphere.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmskyspheredeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslope.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslopemap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmslopemapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsolidcolor.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsor.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsphere.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmspheresweep.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmsqe.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtext.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexture.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturedeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturelist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturemap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtexturemapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtorus.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtranslate.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmtriangle.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmunion.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/crystalsvg/22x22/actions/pmwarp.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddpoint.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddpointabove.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmaddsubprism.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmbicubicpatch.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmblendmapmodifiers.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmblob.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmblobcylinder.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmblobsphere.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmboundedby.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmbox.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmbumpmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmcamera.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmclippedby.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmcomment.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmcone.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmcylinder.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensity.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitydeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitylist.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitymap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdensitymapdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdifference.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdisc.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmdrag.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmfog.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmfogdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmglobalsettings.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmheightfield.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmimagemap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pminserterrors.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pminsertfirstchild.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pminsertlastchild.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pminsertsibling.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmintersection.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmjuliafractal.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmlathe.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmlight.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmlistpattern.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmlookslike.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmmaterialmap.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmmatrix.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmmerge.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmobjectdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmobjectlink.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmpigment.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmpigmentdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmplane.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmpolynom.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmprism.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmquickcolor.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrainbow.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrainbowdeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmraw.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmremovepoint.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrender.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrenderpreview.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrendersettings.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmrotate.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmscale.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmscene.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmskysphere.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmskyspheredeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmsolidcolor.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmsor.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmsphere.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmsqr.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtext.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtexture.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtexturedeclare.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtorus.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtranslate.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmtriangle.png
+debian/tmp/usr/share/apps/kpovmodeler/icons/locolor/16x16/actions/pmunion.png
+debian/tmp/usr/share/apps/kpovmodeler/kpovmodelerbrowser.rc
+debian/tmp/usr/share/apps/kpovmodeler/kpovmodelershell.rc
+debian/tmp/usr/share/apps/kpovmodeler/kpovmodelerui.rc
+debian/tmp/usr/share/apps/kpovmodeler/povraydocmap.xml
+debian/tmp/usr/share/apps/kpovmodeler/questionmark.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cameraview.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/common
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/controlpoints.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmcamera.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmcolorlist.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmfinish.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pminterior.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmlight.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmpigment.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmplane.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmrender.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmsolidcolor.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/cr22-action-pmsphere.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/defaultviewlayout.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/dockwidget.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/dockwidgettab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/insertaspopup.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/objectpropertiesview.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/objecttree.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/rendericon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/rendermodeoutput.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/rendermodequality.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/rendermodesize.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/rendermodesselection.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/rendermodestoolbar.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/rendersettingsicon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/renderwindow.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/texturepreview.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/topview.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-camera-dialog.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-camera-graphic.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-final-render.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-color-list.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-pigment.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-render.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-1.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-solid-color-2.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-ground-wrong-colors-render.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-light-dialog.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-light-graphic.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-dialog.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-graphic.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-tree-expanded.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-plane-tree-translate.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-dialog.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-finish-dialog.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-finish.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-nocolor.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-render-solidcolor.png
+debian/tmp/usr/share/doc/kde/HTML/en/kpovmodeler/tutorial01-sphere-solid-color.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kpovmodeler.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kpovmodeler.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kpovmodeler.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kpovmodeler.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kpovmodeler_doc.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kpovmodeler_doc.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kpovmodeler_doc.png
+
+debian/icons/kpovmodeler.xpm		/usr/share/pixmaps
+debian/icons/kpovmodeler-16.xpm		/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kruler.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kruler.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kruler.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,19 @@
+debian/tmp/usr/bin/kruler
+debian/tmp/usr/share/applications/kde/kruler.desktop
+debian/tmp/usr/share/applnk/Graphics/kruler.desktop
+debian/tmp/usr/share/apps/kruler/eventsrc
+debian/tmp/usr/share/apps/kruler/pics/kruler-east.png
+debian/tmp/usr/share/apps/kruler/pics/kruler-north.png
+debian/tmp/usr/share/apps/kruler/pics/kruler-south.png
+debian/tmp/usr/share/apps/kruler/pics/kruler-west.png
+debian/tmp/usr/share/apps/kruler/sounds/move.wav
+debian/tmp/usr/share/doc/kde/HTML/en/kruler/common
+debian/tmp/usr/share/doc/kde/HTML/en/kruler/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kruler/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kruler.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kruler.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kruler.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kruler.png
+
+debian/icons/kruler.xpm		/usr/share/pixmaps
+debian/icons/kruler-16.xpm	/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/ksnapshot.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/ksnapshot.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/ksnapshot.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+debian/tmp/usr/bin/ksnapshot
+debian/tmp/usr/share/applications/kde/ksnapshot.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/ksnapshot/common
+debian/tmp/usr/share/doc/kde/HTML/en/ksnapshot/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/ksnapshot/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/ksnapshot/preview.png
+debian/tmp/usr/share/doc/kde/HTML/en/ksnapshot/window.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/ksnapshot.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/ksnapshot.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/ksnapshot.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/ksnapshot.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/ksnapshot.svgz
+
+debian/icons/ksnapshot.xpm		/usr/share/pixmaps
+debian/icons/ksnapshot-16.xpm		/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/ksvg.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/ksvg.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/ksvg.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+debian/tmp/usr/bin/printnodetest
+debian/tmp/usr/bin/svgdisplay
+debian/tmp/usr/lib/kde3/libksvgplugin.la
+debian/tmp/usr/lib/kde3/libksvgplugin.so
+debian/tmp/usr/lib/kde3/libksvgrendererlibart.la
+debian/tmp/usr/lib/kde3/libksvgrendererlibart.so
+debian/tmp/usr/lib/kde3/svgthumbnail.la
+debian/tmp/usr/lib/kde3/svgthumbnail.so
+debian/tmp/usr/lib/libksvg.so.0
+debian/tmp/usr/lib/libksvg.so.0.0.1
+debian/tmp/usr/lib/libtext2path.so.0
+debian/tmp/usr/lib/libtext2path.so.0.0.0
+debian/tmp/usr/share/apps/ksvg/ksvgplugin.rc
+debian/tmp/usr/share/services/ksvglibartcanvas.desktop
+debian/tmp/usr/share/services/ksvgplugin.desktop
+debian/tmp/usr/share/services/svgthumbnail.desktop
+debian/tmp/usr/share/servicetypes/ksvgrenderer.desktop

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+debian/tmp/usr/bin/kuickshow
+debian/tmp/usr/lib/kde3/kuickshow.la
+debian/tmp/usr/lib/kde3/kuickshow.so
+debian/tmp/usr/lib/libkdeinit_kuickshow.so
+debian/tmp/usr/share/applications/kde/kuickshow.desktop
+debian/tmp/usr/share/apps/kuickshow/im_palette.pal
+debian/tmp/usr/share/apps/kuickshow/pics/about.png
+debian/tmp/usr/share/apps/kuickshow/pics/calibrate.png
+debian/tmp/usr/share/apps/kuickshow/pics/handcursor.png
+debian/tmp/usr/share/apps/kuickshow/pics/imageviewer-medium.png
+debian/tmp/usr/share/apps/kuickshow/pics/imageviewer-small.png
+debian/tmp/usr/share/apps/kuickshow/pics/ksslide.png
+debian/tmp/usr/share/apps/kuickshow/pics/kuickshow-day.jpg
+debian/tmp/usr/share/apps/kuickshow/pics/kuickshow-night.jpg
+debian/tmp/usr/share/apps/kuickshow/pics/logo.png
+debian/tmp/usr/share/doc/kde/HTML/en/kuickshow/common
+debian/tmp/usr/share/doc/kde/HTML/en/kuickshow/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kuickshow/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kuickshow/screenshot.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kuickshow.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kuickshow.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kuickshow.png
+
+debian/icons/kuickshow.xpm		/usr/share/pixmaps
+debian/icons/kuickshow-16.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kuickshow.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+kuickshow: no-shlibs-control-file usr/lib/libkdeinit_kuickshow.so
+kuickshow: postinst-must-call-ldconfig usr/lib/libkdeinit_kuickshow.so
+kuickshow: postrm-should-call-ldconfig usr/lib/libkdeinit_kuickshow.so

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kview.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kview.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kview.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,66 @@
+debian/tmp/usr/bin/kview
+debian/tmp/usr/lib/kde3/kcm_kviewcanvasconfig.la
+debian/tmp/usr/lib/kde3/kcm_kviewcanvasconfig.so
+debian/tmp/usr/lib/kde3/kcm_kviewgeneralconfig.la
+debian/tmp/usr/lib/kde3/kcm_kviewgeneralconfig.so
+debian/tmp/usr/lib/kde3/kcm_kviewpluginsconfig.la
+debian/tmp/usr/lib/kde3/kcm_kviewpluginsconfig.so
+debian/tmp/usr/lib/kde3/kcm_kviewviewerpluginsconfig.la
+debian/tmp/usr/lib/kde3/kcm_kviewviewerpluginsconfig.so
+debian/tmp/usr/lib/kde3/kview.la
+debian/tmp/usr/lib/kde3/kview.so
+debian/tmp/usr/lib/kde3/kview_browserplugin.la
+debian/tmp/usr/lib/kde3/kview_browserplugin.so
+debian/tmp/usr/lib/kde3/kview_effectsplugin.la
+debian/tmp/usr/lib/kde3/kview_effectsplugin.so
+debian/tmp/usr/lib/kde3/kview_presenterplugin.la
+debian/tmp/usr/lib/kde3/kview_presenterplugin.so
+debian/tmp/usr/lib/kde3/kview_scannerplugin.la
+debian/tmp/usr/lib/kde3/kview_scannerplugin.so
+debian/tmp/usr/lib/kde3/libkviewcanvas.la
+debian/tmp/usr/lib/kde3/libkviewcanvas.so
+debian/tmp/usr/lib/kde3/libkviewviewer.la
+debian/tmp/usr/lib/kde3/libkviewviewer.so
+debian/tmp/usr/lib/libkdeinit_kview.so
+debian/tmp/usr/lib/libkimageviewer.so.0
+debian/tmp/usr/lib/libkimageviewer.so.0.0.0
+debian/tmp/usr/lib/kde3/libphotobook.la
+debian/tmp/usr/lib/kde3/libphotobook.so
+debian/tmp/usr/share/applications/kde/kview.desktop
+debian/tmp/usr/share/apps/kview/kpartplugins/kvieweffects.desktop
+debian/tmp/usr/share/apps/kview/kpartplugins/kvieweffects.rc
+debian/tmp/usr/share/apps/kview/kpartplugins/kviewpresenter.desktop
+debian/tmp/usr/share/apps/kview/kpartplugins/kviewpresenter.rc
+debian/tmp/usr/share/apps/kview/kpartplugins/kviewscanner.desktop
+debian/tmp/usr/share/apps/kview/kpartplugins/kviewscanner.rc
+debian/tmp/usr/share/apps/kview/kview.setdlg
+debian/tmp/usr/share/apps/kview/kviewui.rc
+debian/tmp/usr/share/apps/kview/photobookui.rc
+debian/tmp/usr/share/apps/kviewviewer/kpartplugins/kviewbrowser.desktop
+debian/tmp/usr/share/apps/kviewviewer/kpartplugins/kviewbrowser.rc
+debian/tmp/usr/share/apps/kviewviewer/kviewpopup.rc
+debian/tmp/usr/share/apps/kviewviewer/kviewviewer.rc
+debian/tmp/usr/share/apps/kviewviewer/kviewviewer_ro.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kview/common
+debian/tmp/usr/share/doc/kde/HTML/en/kview/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kview/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kview/kview-viewer-configuration.png
+debian/tmp/usr/share/doc/kde/HTML/en/kview/kview-application-configuration.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/photobook.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/photobook.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kview.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kview.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kview.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kview.png
+debian/tmp/usr/share/services/kconfiguredialog/kviewcanvasconfig.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kviewgeneralconfig.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kviewpluginsconfig.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
+debian/tmp/usr/share/services/kviewcanvas.desktop
+debian/tmp/usr/share/services/kviewviewer.desktop
+debian/tmp/usr/share/services/photobook.desktop
+debian/tmp/usr/share/servicetypes/kimageviewer.desktop
+debian/tmp/usr/share/servicetypes/kimageviewercanvas.desktop
+
+debian/icons/kview.xpm		/usr/share/pixmaps
+debian/icons/kview-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kview.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kview.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kview.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+kview: shlib-missing-in-control-file libphotobook.so usr/lib/libphotobook.so
+kview: shlib-missing-in-control-file libkdeinit_kview.so usr/lib/libkdeinit_kview.so

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kview.mime
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kview.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kview.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+image/bmp;	kview %s;	nametemplate=%s.bmp;	test=test "$DISPLAY" != "";	priority=5
+image/gif;	kview %s;	nametemplate=%s.gif;	test=test "$DISPLAY" != "";	priority=5
+image/jpeg;	kview %s;	nametemplate=%s.jpg;	test=test "$DISPLAY" != "";	priority=5
+image/png;	kview %s;	nametemplate=%s.png;	test=test "$DISPLAY" != "";	priority=5
+image/x-ms-bmp;	kview %s;	nametemplate=%s.bmp;	test=test "$DISPLAY" != "";	priority=5
+image/x-jng;	kview %s;	nametemplate=%s.jng;	test=test "$DISPLAY" != "";	priority=5
+image/x-xbm;	kview %s;	nametemplate=%s.xbm;	test=test "$DISPLAY" != "";	priority=5
+image/x-xpm;	kview %s;	nametemplate=%s.xpm;	test=test "$DISPLAY" != "";	priority=5
+video/x-mng;	kview %s;	nametemplate=%s.mng;	test=test "$DISPLAY" != "";	priority=5

Added: people/jriddell/KDE/3.5/kdegraphics/debian/kviewshell.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/kviewshell.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/kviewshell.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,28 @@
+debian/tmp/usr/bin/kviewshell
+debian/tmp/usr/lib/libdjvu.la
+debian/tmp/usr/lib/libdjvu.so
+debian/tmp/usr/lib/kde3/djvuviewpart.so
+debian/tmp/usr/lib/kde3/djvuviewpart.la
+debian/tmp/usr/lib/kde3/emptymultipagepart.la
+debian/tmp/usr/lib/kde3/emptymultipagepart.so
+debian/tmp/usr/lib/kde3/kviewerpart.la
+debian/tmp/usr/lib/kde3/kviewerpart.so
+debian/tmp/usr/lib/libkmultipage.so.0
+debian/tmp/usr/lib/libkmultipage.so.0.0.0
+debian/tmp/usr/share/apps/djvumultipage.rc
+debian/tmp/usr/share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png
+debian/tmp/usr/share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png
+debian/tmp/usr/share/apps/kviewerpart/icons/hicolor/22x22/actions/movetool.png
+debian/tmp/usr/share/apps/kviewerpart/icons/hicolor/22x22/actions/selectiontool.png
+debian/tmp/usr/share/apps/kviewerpart/icons/hicolor/32x32/actions/movetool.png
+debian/tmp/usr/share/apps/kviewerpart/icons/hicolor/48x48/actions/movetool.png
+debian/tmp/usr/share/apps/kviewerpart/kviewerpart.rc
+debian/tmp/usr/share/apps/kviewshell/kviewshell.rc
+debian/tmp/usr/share/config.kcfg/djvumultipage.kcfg
+debian/tmp/usr/share/config.kcfg/kviewshell.kcfg
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kviewshell.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kviewshell.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kviewshell.png
+debian/tmp/usr/share/services/emptymultipage.desktop
+debian/tmp/usr/share/services/djvumultipage.desktop
+debian/tmp/usr/share/servicetypes/kmultipage.desktop

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

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

Added: people/jriddell/KDE/3.5/kdegraphics/debian/libkscan1.install
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/libkscan1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/libkscan1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+debian/tmp/usr/lib/libkscan.la
+debian/tmp/usr/lib/libkscan.so.1
+debian/tmp/usr/lib/libkscan.so.1.0.0
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/palette_color.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/palette_gray.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/palette_halftone.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/palette_lineart.png
+debian/tmp/usr/share/services/scanservice.desktop

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kcolorchooser.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kcolorchooser.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kcolorchooser.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,54 @@
+.TH KCOLORCHOOSER "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kcolorchooser \- KDE Color Chooser
+.SH SYNOPSIS
+.B kcolorchooser
+[\fIQt-options\fR] [\fIKDE-options\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kcolorchooser
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+KDE Color Chooser
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH AUTHOR
+KColorChooser was written by
+.nh
+Waldo Bastian <bastian at kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kcoloredit.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kcoloredit.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kcoloredit.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,67 @@
+.TH KCOLOREDIT "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kcoloredit \- KDE Color Palette Editor
+.SH SYNOPSIS
+.B kcoloredit
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIFile\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kcoloredit
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B KColorEdit
+is a palette files editor. It can be used for editing color palettes and for color choosing and naming.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+File
+file to open
+.SH "SEE ALSO"
+The full documentation for
+.B kcoloredit
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kcoloredit
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KColorEdit was written by
+.nh
+Artur Rataj <art at zeus.polsl.gliwice.pl>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kdvi.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kdvi.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kdvi.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,99 @@
+.TH KDVI "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kdvi \- KDE DVI Viewer
+.SH SYNOPSIS
+.B kviewshell
+[\fIQt-options\fR] [\fIKDE-options\fR] \fIpart file(s)\fR
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kdvi
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KDVI
+is a plugin for the KViewshell program which allows KViewshell to
+display DVI-files (.dvi) which are produced by the TeX typesetting
+system. KDVI supports many extensions of the DVI standard, for
+instance the inclusion of PostScript graphics or hyperlinks. More
+details, examples and all the technical specifications can be found in
+the file KDVI-features.dvi (or see KDVI-features.tex for the TeX
+source of that file). 
+.P
+For up-to-date information, consult KDVI's home page. 
+.P
+TeX is a high-end typesetting system geared towards scientific, and in
+particular mathematical typesetting. More information about TeX and
+DVI can be found on the homepage of the TeX user group or the German
+German DANTE e.V..  
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+part
+The part to use
+.SH OPTIONS
+.TP
+\fB\-\-unique\fR
+Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
+.TP
+\fB\-\-paper\fR
+Sets paper size (not implemented at the moment, only for compatibility with lyx)
+.TP
+file(s)
+Files to load
+.SH "SEE ALSO"
+The full documentation for
+.B kdvi
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kdvi
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KViewShell was written by
+.nh
+Matthias Hoelzer-Kluepfel <mhk at caldera.de>,
+David Sweet <dsweet at kde.org>,
+Mark Donohoe,
+Markku Hihnala,
+David Faure,
+Daniel Duley,
+Espen Sand and
+Stefan Kebekus <kebekus at kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kfax.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kfax.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kfax.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,102 @@
+.TH KFAX "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kfax \- KDE Fax Viewer
+.SH SYNOPSIS
+.B kfax
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR] \fIfile(s)\fR
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kfax
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+A program to display raw and tiffed fax images (g3, g3-2d, g4).
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH OPTIONS
+.TP
+\fB\-f\fR, \fB\-\-fine\fR
+Fine resolution
+.TP
+\fB\-n\fR, \fB\-\-normal\fR
+Normal resolution
+.TP
+\fB\-\-height\fR
+Height (number of fax lines)
+.TP
+\fB\-w\fR, \fB\-\-width\fR
+Width (dots per fax line)
+.TP
+\fB\-l\fR, \fB\-\-landscape\fR
+Turn image 90 degrees (landscape mode)
+.TP
+\fB\-u\fR, \fB\-\-upsidedown\fR
+Turn image upside down
+.TP
+\fB\-i\fR, \fB\-\-invert\fR
+Invert black and white.
+.TP
+\fB\-m\fR, \fB\-\-mem\fR <bytes>
+Limit memory use to 'bytes'. [8M]
+.TP
+\fB\-r\fR, \fB\-\-reverse\fR
+Fax data is packed lsb first
+.TP
+\fB\-2\fR
+Raw files are g3-2d
+.TP
+\fB\-4\fR
+Raw files are g4
+.SS "Arguments:"
+.TP
+file(s)
+Fax file(s) to show
+.SH "SEE ALSO"
+The full documentation for
+.B kfax
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kfax
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KFax was written by
+.nh
+Bernd Johannes Wuebben <wuebben at kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kghostview.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kghostview.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kghostview.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,89 @@
+.TH KGHOSTVIEW "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kghostview \- KDE PS/PDF Viewer
+.SH SYNOPSIS
+.B kghostview
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIURL\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KGhostView
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B  KGhostView
+displays and prints PostScript (.ps, .eps) and Portable
+Document Format (.pdf) files. It a port to KDE of Tim Theisen's
+Ghostview program which uses Alladin Ghostscript to view documents
+prepared in Adobe's PostScript page description
+language. PostScript is the major page description language for
+printing on UNIX(rg systems and this application can be used to preview
+material intended for printing or for reading documents online.  
+.P
+You can use KGhostView with all recent versions of Ghostscript. Newer
+versions offer much improved performance which you can take advantage
+of with KGhostView.  
+.P
+If a document does not conform to the Adobe document structuring
+convention the functionality of the viewer is limited. For example, if
+there is no table of contents, skipping around the document and
+marking pages is not possible. 
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+URL
+Location to open
+.SH "SEE ALSO"
+The full documentation for
+.B KGhostView
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kghostview
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KGhostView was written by
+.nh
+Wilco Greven <greven at kde.org>,
+David Sweet <dsweet at kde.org>,
+Mark Donohoe <donohoe at kde.org>,
+David Faure <faure at kde.org>,
+Daniel Duley <mosfet at kde.org> and
+Espen Sand <espen at kde.org>
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kiconedit.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kiconedit.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kiconedit.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,89 @@
+.TH KICONEDIT "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kiconedit \- KDE Icon Editor
+.SH SYNOPSIS
+.B kiconedit
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile(s)\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KIconEdit
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KIconEdit
+is designed to help create icons for KDE using the standard
+icon palette.  
+.PP
+KDE Icon Editor
+.SH AUTHOR
+KIconEdit was written by
+.nh
+Thomas Tanghus <tanghus at kde.org>,
+John Califf <jcaliff at compuzone.net>,
+Laurent Montel <lmontel at mandrakesoft.com> and
+Aaron J. Seigo <aseigo at olympusproject.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+file(s)
+Icon file(s) to open
+.SH "SEE ALSO"
+The full documentation for
+.B KIconEdit
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kiconedit
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KIconEdit was written by
+.nh
+Thomas Tanghus <tanghus at kde.org>,
+John Califf <jcaliff at compuzone.net>,
+Laurent Montel <lmontel at mandrakesoft.com>
+and Aaron J. Seigo <aseigo at olympusproject.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kolourpaint.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kolourpaint.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kolourpaint.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,75 @@
+.TH KPAINT "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kolourpaint \- KDE Paint Program
+.SH SYNOPSIS
+.B kolourpaint
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KPaint
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KPaint
+is a simple bitmap drawing program that can also be used to modify
+existing image files and convert between image file formats. 
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+file
+File or URL to open
+.SH "SEE ALSO"
+The full documentation for
+.B KPaint
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kolourpaint
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KPaint was written by
+.nh
+Richard J. Moore <rich at kde.org>,
+Robert Williams <rwilliams at jrcmaui.com>,
+Mario Weilguni <mweilguni at kde.org>,
+Christian Oppel <uzs84g at uni-bonn.de>,
+John Califf <jcaliff at compuzone.net> and
+Laurent Montel <lmontel at mandrakesoft.com>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kooka.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kooka.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kooka.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,89 @@
+.TH KOOKA "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kooka \- KDE Scan & OCR Program
+.SH SYNOPSIS
+.B kooka
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B Kooka
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B Kooka
+is a KDE application which provides access to scanner
+hardware using the SANE library.
+.P
+Kooka helps you scan, save your
+image in the correct image format and perform \fBO\fRptical
+\fBC\fRharacter \fBR\fRecognition on it,using \fIgocr\fR, Joerg
+Schulenburg's and friends' Open Source ocr program.
+.P
+Kooka is a KDE application that enables easy scanning using SANE
+libraries. Therefore, SANE the package must be installed to use
+Kooka. Clear and concise use was the focus of its development. 
+.P
+Character recognition is also provided by the built-in text
+recognition program gocr. Install gocr to use this
+functionality. After character recognition is complete, the recognized
+material can be opened in the text editor Kate with just one click,
+where you can edit the contents. 
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH OPTIONS
+.TP
+\fB\-d\fR
+the SANE compatible device specification (e.g. umax:/dev/sg0) []
+.TP
+\fB\-g\fR
+gallery mode - do not connect to scanner []
+.SH "SEE ALSO"
+The full documentation for
+.B Kooka
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kooka
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+Kooka was written by
+.nh
+Klaas Freitag <freitag at suse.de> and
+Mat Colton <mat at colton.de>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kpovmodeler.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kpovmodeler.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kpovmodeler.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,82 @@
+.TH KPOVMODELER "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kpovmodeler \- KDE Povray Modeler
+.SH SYNOPSIS
+.B kpovmodeler
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIfile\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B Povray Modeler
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KPovModeler
+is a 3D modeling application to generate POV-Ray scenes.
+.P
+While it is not necessary to fully understand the POV-Ray application
+in order to make good use of KPovModeler, it is highly recommended
+that you read and try to understand the POV-Ray documentation. 
+.P
+To find out more about POV-Ray go to www.povray.org.
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+file
+File to open
+.SH OPTIONS
+.TP
+\fB\-\-no\-opengl\fR
+Disables OpenGL rendering
+.SH "SEE ALSO"
+The full documentation for
+.B Povray Modeler
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kpovmodeler
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KPovModeler was written by
+.nh
+Andreas Zehender <zehender at kde.org>,
+Luis Passos Carvalho <lpassos at mail.telepac.pt>,
+Philippe Van Hecke <lephiloux at tiscalinet.be> and
+.hy
+Leonardo Skorianez <skorianez at bol.com.br>.
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kruler.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kruler.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kruler.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,81 @@
+.TH KRULER "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kruler \- KDE Screen Ruler
+.SH SYNOPSIS
+.B kruler
+[\fIQt-options\fR] [\fIKDE-options\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KRuler
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B KRuler
+is a very simple application, with only one aim in life. To
+measure distances on your screen. 
+.P
+To start KRuler, choose Graphics->KDE Screen Ruler from your K menu.
+.P
+left mouse button clicking on the KRuler will turn the cursor into a
+hand icon, and enable you to drag KRuler around the screen. 
+.P
+When you move the mouse over KRuler, your cursor will turn into an
+elongated arrow, with a circle at one end. As you move the cursor,
+KRuler will display how far from the point marked 0 the circle on the
+end of the cursor currently is. KRuler will also display the HTML
+color code of the color currently under the circle. This is very
+useful for picking out colors from an image. If you move the mouse far
+enough that the arrow cursor is no longer touching KRuler, the cursor
+will revert to normal, allowing you to carry on working with your
+other applications. 
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH "SEE ALSO"
+The full documentation for
+.B KRuler
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kruler
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KDE Screen Ruler was written by
+.nh
+Till Krech <till at snafu.de>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/ksnapshot.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/ksnapshot.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/ksnapshot.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,71 @@
+.TH KSNAPSHOT "1" "September 2002" KDE "KDE Application"
+.SH NAME
+ksnapshot \- KDE Screen Capture Program
+.SH SYNOPSIS
+.B ksnapshot
+[\fIQt-options\fR] [\fIKDE-options\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KSnapshot
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KSnapshot
+is a simple applet for taking screenshots. It is capable of
+capturing images of either the whole desktop or just a single
+window. The images can then be saved in a variety of formats. 
+.PP
+KDE Screenshot utility
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH "SEE ALSO"
+The full documentation for
+.B KSnapshot
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/ksnapshot
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KSnapshot was written by
+.nh
+Richard J. Moore <rich at kde.org>,
+Matthias Ettrich <ettrich at kde.org> and
+Aaron J. Seigo <aseigo at olympusproject.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kuickshow.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kuickshow.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kuickshow.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,99 @@
+.TH KUICKSHOW "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kuickshow \- KDE Image Viewer
+.SH SYNOPSIS
+.B kuickshow
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR] [\fIfiles\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B Kuickshow
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KuickShow
+is a comfortable image browser/viewer. It displays a
+filebrowser where you can select images which are then shown.
+.P
+The following image formats are supported:
+.P
+.RS 
+\(bu jpg
+.br
+\(bu gif
+.br
+\(bu tiff
+.br
+\(bu png
+.br
+\(bu bmp
+.br
+\(bu psd
+.br
+\(bu xmp
+.br
+\(bu xbm
+.br
+\(bu eim
+.RE
+.P
+Images can be displayed either in their own window, as large as the
+image, or fullscreen. 
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH OPTIONS
+.TP
+\fB\-\-lastdir\fR
+Start in the last visited directory, not the current working directory
+.SS "Arguments:"
+.TP
+files
+Optional image filenames/urls to show
+.SH "SEE ALSO"
+The full documentation for
+.B Kuickshow
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kuickshow
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KuickShow was written by
+.nh
+Carsten Pfeiffer <pfeiffer at kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kview.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kview.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kview.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,78 @@
+.TH KVIEW "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kview \- KDE Image Viewer
+.SH SYNOPSIS
+.B kview
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIURL\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KView
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.P
+.B KView
+is an image viewer for the KDE desktop. You can view graphics of
+many different formats such as PostScript, TIFF etc. By saving your
+files in a different format than the original you can easily convert
+images to other graphics formats. In addition, KView provides some
+nice little features for doing simple image processing, like
+stretching/shrinking, rotation and filtering. You can tile your images
+directly onto the desktop as a background picture, or arrange them in
+a little slideshow. 
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+URL
+Image to open
+.SH "SEE ALSO"
+The full documentation for
+.B KView
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kview
+.PP
+should give you access to the complete manual.
+.SH AUTHOR
+KView was written by
+.nh
+Matthias Kretz <kretz at kde.org>,
+Sirtaj Singh Kang <taj at kde.org>
+and Simon Hausmann <hausmann at kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/man/kviewshell.1
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/man/kviewshell.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/man/kviewshell.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,75 @@
+.TH KVIEWSHELL "1" "September 2002" KDE "KDE Application"
+.SH NAME
+kviewshell \- Generic framework for viewer applications
+.SH SYNOPSIS
+.B kviewshell
+[\fIQt-options\fR] [\fIKDE-options\fR] \fIpart file(s)\fR
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kviewshell
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+Generic framework for viewer applications.
+.P
+This program is part of the official KDE graphics module.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SS "Arguments:"
+.TP
+part
+The part to use
+.SH OPTIONS
+.TP
+\fB\-\-unique\fR
+Check if the file is loaded in another kviewshell. If it is, bring up the other kviewshell. Otherwise, load the file.
+.TP
+\fB\-\-paper\fR
+Sets paper size (not implemented at the moment, only for compatibility with lyx)
+.TP
+file(s)
+Files to load
+.SH AUTHOR
+KViewShell was written by
+.nh
+Matthias Hoelzer-Kluepfel <mhk at caldera.de>,
+David Sweet <dsweet at kde.org>,
+Mark Donohoe,
+Markku Hihnala,
+David Faure,
+Daniel Duley,
+Espen Sand,
+and Stefan Kebekus <kebekus at kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).

Added: people/jriddell/KDE/3.5/kdegraphics/debian/patches/10_correct-nedit-invocation.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/10_correct-nedit-invocation.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/patches/10_correct-nedit-invocation.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+--- kdegraphics-orig/kdvi/optionDialogSpecialWidget.cpp
++++ kdegraphics-patched/kdvi/optionDialogSpecialWidget.cpp
+@@ -46,7 +46,7 @@
+   editorDescriptionString += i18n("Kile works very well");
+   
+   editorNameString        += "NEdit";
+-  editorCommandString     += "ncl -noask -line %l %f || nc -noask -line %l %f";
++  editorCommandString     += "nedit-nc -noask -line %l %f";
+   editorDescriptionString += i18n("NEdit perfectly supports inverse search.");
+   
+   editorNameString        += "VIM - Vi IMproved / GUI";

Added: people/jriddell/KDE/3.5/kdegraphics/debian/patches/11_djvu-lib.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/11_djvu-lib.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/patches/11_djvu-lib.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+--- kde.orig/kviewshell/plugins/djvu/libdjvu/Makefile.am
++++ kde.patched/kviewshell/plugins/djvu/libdjvu/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I$(top_srcdir) $(all_includes)
+ 
+-kde_module_LTLIBRARIES = libdjvu.la
++lib_LTLIBRARIES = libdjvu.la
+ libdjvu_la_LDFLAGS = -avoid-version $(all_libraries)
+ libdjvu_la_LIBADD = $(LIBJPEG)
+ libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \

Added: people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/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/kdegraphics/debian/patches/kubuntu_03_kmenu_tidy_kghostview.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_03_kmenu_tidy_kghostview.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_03_kmenu_tidy_kghostview.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+--- kdegraphics-3.4.0/kghostview/kghostview.desktop	2005-04-06 03:11:21.800333336 +0100
++++ kdegraphics-3.4.0/kghostview/kghostview.desktop	2005-04-06 03:11:56.048126880 +0100
+@@ -82,3 +82,4 @@
+ X-KDE-StartupNotify=true
+ X-DCOP-ServiceType=Multi
+ Categories=Qt;KDE;Graphics;
++NoDisplay=true

Added: people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_04_kpdf_dont_overwrite_file.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_04_kpdf_dont_overwrite_file.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_04_kpdf_dont_overwrite_file.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+--- kdegraphics/kpdf/part.cpp	2006/01/18 21:57:05	499855
++++ kdegraphics/kpdf/part.cpp	2006/01/23 23:11:54	501814
+@@ -697,6 +697,11 @@
+     KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
+     if ( saveURL.isValid() && !saveURL.isEmpty() )
+     {
++        if (saveURL == url())
++        {
++            KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
++            return;
++        }
+         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
+         {
+             if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)

Added: people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_05_poppler.diff
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_05_poppler.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/patches/kubuntu_05_poppler.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,468 @@
+diff -Nur kdegraphics-3.5.1/kpdf/core/generator_pdf/generator_pdf.cpp kdegraphics-3.5.1.new/kpdf/core/generator_pdf/generator_pdf.cpp
+--- kdegraphics-3.5.1/kpdf/core/generator_pdf/generator_pdf.cpp	2005-10-10 15:56:39.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/core/generator_pdf/generator_pdf.cpp	2006-01-30 16:03:16.000000000 +0000
+@@ -25,18 +25,20 @@
+ #include <kmessagebox.h>
+ #include <kdebug.h>
+ 
+-// xpdf includes
+-#include "xpdf/Object.h"
+-#include "xpdf/Dict.h"
+-#include "xpdf/Annot.h"
+-#include "xpdf/PSOutputDev.h"
+-#include "xpdf/TextOutputDev.h"
+-#include "xpdf/Link.h"
+-#include "xpdf/ErrorCodes.h"
+-#include "xpdf/UnicodeMap.h"
+-#include "xpdf/Outline.h"
+-#include "xpdf/UGString.h"
+-#include "goo/GList.h"
++// poppler includes
++#include "poppler/poppler-page-transition.h"
++#include "poppler/Object.h"
++#include "poppler/Dict.h"
++#include "poppler/Annot.h"
++#include "poppler/PSOutputDev.h"
++#include "poppler/TextOutputDev.h"
++#include "poppler/Link.h"
++#include "poppler/ErrorCodes.h"
++#include "poppler/UnicodeMap.h"
++#include "poppler/Outline.h"
++#include "poppler/goo/GooString.h"
++#include "poppler/goo/GooList.h"
++//#include "poppler/poppler-qt.h"
+ 
+ // local includes
+ #include "generator_pdf.h"
+@@ -48,6 +50,8 @@
+ 
+ #include <config.h>
+ 
++using namespace Poppler;
++
+ // id for DATA_READY PDFPixmapGeneratorThread Event
+ #define TGE_DATAREADY_ID 6969
+ 
+@@ -103,7 +107,7 @@
+     }
+ #endif
+     // create PDFDoc for the given file
+-    pdfdoc = new PDFDoc( new GString( QFile::encodeName( filePath ) ), 0, 0 );
++    pdfdoc = new PDFDoc( new GooString( QFile::encodeName( filePath ) ), 0, 0 );
+ 
+     // if the file didn't open correctly it might be encrypted, so ask for a pass
+     bool firstInput = true;
+@@ -149,9 +153,9 @@
+         }
+ 
+         // 2. reopen the document using the password
+-        GString * pwd2 = new GString( password.data() );
++        GooString * pwd2 = new GooString( password.data() );
+             delete pdfdoc;
+-        pdfdoc = new PDFDoc( new GString( QFile::encodeName( filePath ) ), pwd2, pwd2 );
++        pdfdoc = new PDFDoc( new GooString( QFile::encodeName( filePath ) ), pwd2, pwd2 );
+             delete pwd2;
+ 
+         // 3. if the password is correct, store it to the wallet
+@@ -240,7 +244,7 @@
+     if ( !outline )
+         return NULL;
+ 
+-    GList * items = outline->getItems();
++    GooList * items = outline->getItems();
+     if ( !items || items->getLength() < 1 )
+         return NULL;
+ 
+@@ -429,28 +433,28 @@
+     }
+ 
+     KTempFile tf( QString::null, ".ps" );
+-    PSOutputDev *psOut = new PSOutputDev(tf.name().latin1(), pdfdoc->getXRef(), pdfdoc->getCatalog(), 1, pdfdoc->getNumPages(), psModePS);
++    PSOutputDev *psOut = new PSOutputDev((char*) tf.name().latin1(), pdfdoc->getXRef(), pdfdoc->getCatalog(), 1, pdfdoc->getNumPages(), psModePS);
+ 
+     if (psOut->isOk())
+     {
+-        std::list<int> pages;
+-
+         if (!printer.previewOnly())
+         {
+             QValueList<int> pageList = printer.pageList();
+             QValueList<int>::const_iterator it;
+ 
+-            for(it = pageList.begin(); it != pageList.end(); ++it) pages.push_back(*it);
++	    docLock.lock();
++            for(it = pageList.begin(); it != pageList.end(); ++it)
++		pdfdoc->displayPages(psOut, *it, *it, 72, 72, 0, false, globalParams->getPSCrop(), gFalse);
++	    docLock.unlock();
+         }
+         else
+         {
+-            for(int i = 1; i <= pdfdoc->getNumPages(); i++) pages.push_back(i);
++	    docLock.lock();
++            for(int i = 1; i <= pdfdoc->getNumPages(); i++)
++		pdfdoc->displayPages(psOut, i, i, 72, 72, 0, false, globalParams->getPSCrop(), gFalse);
++	    docLock.unlock();
+         }
+ 
+-        docLock.lock();
+-        pdfdoc->displayPages(psOut, pages, 72, 72, 0, false, globalParams->getPSCrop(), gFalse);
+-        docLock.unlock();
+-
+         // needs to be here so that the file is flushed, do not merge with the one
+         // in the else
+         delete psOut;
+@@ -464,12 +468,14 @@
+     }
+ }
+ 
+-static UGString *QStringToUGString(const QString &s) {
++static GooString *QStringToUGString(const QString &s) {
++    /*
+     int len = s.length();
+     Unicode *u = (Unicode *)gmallocn(s.length(), sizeof(Unicode));
+     for (int i = 0; i < len; ++i)
+       u[i] = s.at(i).unicode();
+-    return new UGString(u, len);
++    */
++    return new GooString(strdup(s.utf8()));
+ }
+ 
+ QString PDFGenerator::getMetaData( const QString & key, const QString & option )
+@@ -477,7 +483,7 @@
+     if ( key == "StartFullScreen" )
+     {
+         // asking for the 'start in fullscreen mode' (pdf property)
+-        if ( pdfdoc->getCatalog()->getPageMode() == Catalog::FullScreen )
++        if ( pdfdoc->getCatalog()->getPageMode() == Catalog::pageModeFullScreen )
+             return "yes";
+     }
+     else if ( key == "NamedViewport" && !option.isEmpty() )
+@@ -485,7 +491,7 @@
+         // asking for the page related to a 'named link destination'. the
+         // option is the link name. @see addSynopsisChildren.
+         DocumentViewport viewport;
+-        UGString * namedDest = QStringToUGString( option );
++        GooString * namedDest = QStringToUGString( option );
+         docLock.lock();
+         LinkDest * destination = pdfdoc->findDest( namedDest );
+         if ( destination )
+@@ -596,7 +602,7 @@
+ {
+     Ref fontRef, embRef;
+     Object fontObj, toUnicodeObj;
+-    GString *name;
++    GooString *name;
+     GBool emb;
+     int i;
+ 
+@@ -635,7 +641,7 @@
+         sName = name->getCString();
+         if (!emb)
+         {
+-            DisplayFontParam *dfp = globalParams->getDisplayFont(name);
++            DisplayFontParam *dfp = globalParams->getDisplayFont(font);
+             if (dfp)
+             {
+                 if (dfp -> kind == displayFontT1) sPath = dfp->t1.fileName->getCString();
+@@ -676,13 +682,13 @@
+ 
+     QString result;
+     Object obj;
+-    GString *s1;
++    GooString *s1;
+     GBool isUnicode;
+     Unicode u;
+     int i;
+     Dict *infoDict = info.getDict();
+ 
+-    if ( infoDict->lookup( data.latin1(), &obj )->isString() )
++    if ( infoDict->lookup( (char*) data.latin1(), &obj )->isString() )
+     {
+         s1 = obj.getString();
+         if ( ( s1->getChar(0) & 0xff ) == 0xfe && ( s1->getChar(1) & 0xff ) == 0xff )
+@@ -740,7 +746,7 @@
+     if ( !uMap )
+         return i18n( "Unknown Date" );
+ 
+-    if ( infoDict->lookup( data.latin1(), &obj )->isString() )
++    if ( infoDict->lookup( (char*) data.latin1(), &obj )->isString() )
+     {
+         s = obj.getString()->getCString();
+         if ( s[0] == 'D' && s[1] == ':' )
+@@ -765,7 +771,7 @@
+     return result;
+ }
+ 
+-void PDFGenerator::addSynopsisChildren( QDomNode * parent, GList * items )
++void PDFGenerator::addSynopsisChildren( QDomNode * parent, GooList * items )
+ {
+     int numItems = items->getLength();
+     for ( int i = 0; i < numItems; ++i )
+@@ -796,8 +802,8 @@
+                 // get the destination for the page now, but it's VERY time consuming,
+                 // so better storing the reference and provide the viewport as metadata
+                 // on demand
+-                UGString *s = g->getNamedDest();
+-                QString aux = unicodeToQString( s->unicode(), s->getLength() );
++                GooString *s = g->getNamedDest();
++                QString aux = QString(s->getCString());
+                 item.setAttribute( "ViewportName", aux );
+             }
+             else if ( destination->isOk() )
+@@ -815,7 +821,7 @@
+ 
+         // 3. recursively descend over children
+         outlineItem->open();
+-        GList * children = outlineItem->getKids();
++        GooList * children = outlineItem->getKids();
+         if ( children )
+             addSynopsisChildren( &item, children );
+     }
+@@ -872,12 +878,13 @@
+     if ( !pdfPage )
+         return;
+ 
+-    PageTransition *pdfTransition = pdfPage->getTransition();
+-    if ( !pdfTransition || pdfTransition->getType() == PageTransition::Replace )
++    PageTransition *pdfTransition = NULL;
++    //PageTransition *pdfTransition = pdfPage->getTransition();
++    if ( !pdfTransition || pdfTransition->type() == PageTransition::Replace )
+         return;
+ 
+     KPDFPageTransition *transition = new KPDFPageTransition();
+-    switch ( pdfTransition->getType() ) {
++    switch ( pdfTransition->type() ) {
+         case PageTransition::Replace:
+             // won't get here, added to avoid warning
+             break;
+@@ -916,9 +923,9 @@
+             break;
+     }
+ 
+-    transition->setDuration( pdfTransition->getDuration() );
++    transition->setDuration( pdfTransition->duration() );
+ 
+-    switch ( pdfTransition->getAlignment() ) {
++    switch ( pdfTransition->alignment() ) {
+         case PageTransition::Horizontal:
+             transition->setAlignment( KPDFPageTransition::Horizontal );
+             break;
+@@ -927,7 +934,7 @@
+             break;
+     }
+ 
+-    switch ( pdfTransition->getDirection() ) {
++    switch ( pdfTransition->direction() ) {
+         case PageTransition::Inward:
+             transition->setDirection( KPDFPageTransition::Inward );
+             break;
+@@ -936,8 +943,8 @@
+             break;
+     }
+ 
+-    transition->setAngle( pdfTransition->getAngle() );
+-    transition->setScale( pdfTransition->getScale() );
++    transition->setAngle( pdfTransition->angle() );
++    transition->setScale( pdfTransition->scale() );
+     transition->setIsRectangular( pdfTransition->isRectangular() == gTrue );
+ 
+     page->setTransition( transition );
+diff -Nur kdegraphics-3.5.1/kpdf/core/generator_pdf/generator_pdf.h kdegraphics-3.5.1.new/kpdf/core/generator_pdf/generator_pdf.h
+--- kdegraphics-3.5.1/kpdf/core/generator_pdf/generator_pdf.h	2005-09-10 09:18:41.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/core/generator_pdf/generator_pdf.h	2006-01-30 16:03:16.000000000 +0000
+@@ -24,7 +24,7 @@
+ class LinkDest;
+ class Ref;
+ class PDFDoc;
+-class GList;
++class GooList;
+ class TextPage;
+ 
+ class ObjectRect;
+@@ -95,7 +95,7 @@
+         QString getDocumentInfo( const QString & data ) const;
+         QString getDocumentDate( const QString & data ) const;
+         // private function for creating the document synopsis hieracy
+-        void addSynopsisChildren( QDomNode * parent, GList * items );
++        void addSynopsisChildren( QDomNode * parent, GooList * items );
+         // private function for creating the transition information
+         void addTransition( int pageNumber, KPDFPage * page );
+         // (async related) receive data from the generator thread
+diff -Nur kdegraphics-3.5.1/kpdf/core/generator_pdf/gp_outputdev.cpp kdegraphics-3.5.1.new/kpdf/core/generator_pdf/gp_outputdev.cpp
+--- kdegraphics-3.5.1/kpdf/core/generator_pdf/gp_outputdev.cpp	2005-09-10 09:18:41.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/core/generator_pdf/gp_outputdev.cpp	2006-01-30 16:03:16.000000000 +0000
+@@ -28,9 +28,9 @@
+ #include "core/document.h" // for DocumentViewport
+ #include "core/page.h"
+ #include "core/link.h"
+-#include "xpdf/Link.h"
+-#include "xpdf/GfxState.h"
+-#include "xpdf/TextOutputDev.h"
++#include "poppler/Link.h"
++#include "poppler/GfxState.h"
++#include "poppler/TextOutputDev.h"
+ #include "splash/SplashBitmap.h"
+ 
+ //NOTE: XPDF/Splash *implementation dependant* code is marked with '###'
+@@ -263,7 +263,7 @@
+         case actionLaunch:
+             {
+             LinkLaunch * e = (LinkLaunch *)a;
+-            GString * p = e->getParams();
++            GooString * p = e->getParams();
+             link = new KPDFLinkExecute( e->getFileName()->getCString(), p ? p->getCString() : 0 );
+             }
+             break;
+@@ -321,7 +321,7 @@
+     return link;
+ }
+ 
+-DocumentViewport KPDFOutputDev::decodeViewport( UGString * namedDest, LinkDest * dest )
++DocumentViewport KPDFOutputDev::decodeViewport( GooString * namedDest, LinkDest * dest )
+ // note: this function is called when processing a page, when the MUTEX is already LOCKED
+ {
+     DocumentViewport vp( -1 );
+diff -Nur kdegraphics-3.5.1/kpdf/core/generator_pdf/gp_outputdev.h kdegraphics-3.5.1.new/kpdf/core/generator_pdf/gp_outputdev.h
+--- kdegraphics-3.5.1/kpdf/core/generator_pdf/gp_outputdev.h	2005-09-10 09:18:41.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/core/generator_pdf/gp_outputdev.h	2006-01-30 16:03:16.000000000 +0000
+@@ -20,8 +20,8 @@
+ #endif
+ 
+ #include <qvaluelist.h>
+-#include "xpdf/PDFDoc.h" // for 'Object'
+-#include "xpdf/SplashOutputDev.h"
++#include "poppler/PDFDoc.h" // for 'Object'
++#include "poppler/SplashOutputDev.h"
+ 
+ class QPixmap;
+ class KPDFLink;
+@@ -71,7 +71,7 @@
+         // generate a valid KPDFLink subclass (or null) from a xpdf's LinkAction
+         KPDFLink * generateLink( LinkAction * a );
+         // fills up a Viewport structure out of a given LinkGoto link
+-        DocumentViewport decodeViewport( UGString *, class LinkDest * );
++        DocumentViewport decodeViewport( GooString *, class LinkDest * );
+ 
+         // generator switches and parameters
+         bool m_qtThreadSafety;
+diff -Nur kdegraphics-3.5.1/kpdf/core/generator_pdf/Makefile.am kdegraphics-3.5.1.new/kpdf/core/generator_pdf/Makefile.am
+--- kdegraphics-3.5.1/kpdf/core/generator_pdf/Makefile.am	2005-09-10 09:18:41.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/core/generator_pdf/Makefile.am	2006-01-30 16:03:16.000000000 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/../../xpdf -I$(srcdir)/../../xpdf/goo -I$(srcdir)/../../xpdf/splash -I$(top_builddir)/kpdf $(all_includes)
++INCLUDES = -I$(srcdir)/../.. -I/usr/include/poppler -I/usr/include/poppler/goo -I/usr/include/poppler/splash -I$(top_builddir)/kpdf $(all_includes)
+ 
+ libgeneratorpdf_la_LDFLAGS = $(all_libraries)
+ libgeneratorpdf_la_SOURCES = generator_pdf.cpp gp_outputdev.cpp
+diff -Nur kdegraphics-3.5.1/kpdf/core/Makefile.am kdegraphics-3.5.1.new/kpdf/core/Makefile.am
+--- kdegraphics-3.5.1/kpdf/core/Makefile.am	2005-09-10 09:18:42.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/core/Makefile.am	2006-01-30 16:03:16.000000000 +0000
+@@ -1,6 +1,6 @@
+ SUBDIRS = generator_pdf generator_kimgio
+ 
+-INCLUDES = -I$(srcdir)/generator_pdf -I$(srcdir)/.. -I$(srcdir)/../xpdf -I$(srcdir)/../xpdf/goo -I$(top_builddir)/kpdf $(all_includes)
++INCLUDES = -I$(srcdir)/generator_pdf -I$(srcdir)/.. -I/usr/include/poppler -I/usr/include/poppler/goo -I$(top_builddir)/kpdf $(all_includes)
+ 
+ METASOURCES = AUTO
+ 
+diff -Nur kdegraphics-3.5.1/kpdf/core/page.cpp kdegraphics-3.5.1.new/kpdf/core/page.cpp
+--- kdegraphics-3.5.1/kpdf/core/page.cpp	2005-09-10 09:18:42.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/core/page.cpp	2006-01-30 16:03:16.000000000 +0000
+@@ -18,7 +18,7 @@
+ #include "pagetransition.h"
+ #include "link.h"
+ #include "conf/settings.h"
+-#include "xpdf/TextOutputDev.h"
++#include "poppler/TextOutputDev.h"
+ 
+ 
+ /** class KPDFPage **/
+@@ -157,7 +157,7 @@
+         top = (int)( rect.top * m_height ),
+         right = (int)( rect.right * m_width ),
+         bottom = (int)( rect.bottom * m_height );
+-    GString * text = m_text->getText( left, top, right, bottom );
++    GooString * text = m_text->getText( left, top, right, bottom );
+     QString result = QString::fromUtf8( text->getCString() );
+     delete text;
+     return result; 
+diff -Nur kdegraphics-3.5.1/kpdf/error.cpp kdegraphics-3.5.1.new/kpdf/error.cpp
+--- kdegraphics-3.5.1/kpdf/error.cpp	2005-09-10 09:18:43.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/error.cpp	2006-01-30 16:03:16.000000000 +0000
+@@ -15,8 +15,8 @@
+ #include <stdio.h>
+ #include <stddef.h>
+ #include <stdarg.h>
+-#include "xpdf/GlobalParams.h"
+-#include "xpdf/Error.h"
++#include "poppler/GlobalParams.h"
++#include "poppler/Error.h"
+ 
+ #include <qstring.h>
+ 
+diff -Nur kdegraphics-3.5.1/kpdf/Makefile.am kdegraphics-3.5.1.new/kpdf/Makefile.am
+--- kdegraphics-3.5.1/kpdf/Makefile.am	2005-09-10 09:18:43.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/Makefile.am	2006-01-30 16:03:16.000000000 +0000
+@@ -1,6 +1,6 @@
+-SUBDIRS = xpdf conf core ui shell
++SUBDIRS = conf core ui shell
+ 
+-INCLUDES = -I$(srcdir)/xpdf -I$(srcdir)/xpdf/goo -I$(top_builddir)/kpdf $(all_includes) $(FREETYPE_CFLAGS)
++INCLUDES = -I/usr/include/poppler -I$(srcdir)/xpdf/goo -I$(top_builddir)/kpdf $(all_includes) $(FREETYPE_CFLAGS)
+ 
+ METASOURCES = AUTO
+ 
+@@ -17,9 +17,9 @@
+ 
+ libkpdfpart_la_SOURCES = dcop.skel error.cpp part.cpp
+ libkpdfpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-libkpdfpart_la_LIBADD  = xpdf/xpdf/libxpdf.la conf/libkpdfconf.la \
++libkpdfpart_la_LIBADD  = conf/libkpdfconf.la \
+                          core/libkpdfcore.la ui/libkpdfui.la $(LIB_KPARTS) \
+-                         $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KUTILS) -lm
++                         $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KUTILS) -lm -lpoppler
+ 
+ partdesktopdir   = $(kde_servicesdir)
+ partdesktop_DATA = kpdf_part.desktop
+diff -Nur kdegraphics-3.5.1/kpdf/part.cpp kdegraphics-3.5.1.new/kpdf/part.cpp
+--- kdegraphics-3.5.1/kpdf/part.cpp	2006-01-30 16:02:55.000000000 +0000
++++ kdegraphics-3.5.1.new/kpdf/part.cpp	2006-01-30 16:03:16.000000000 +0000
+@@ -56,7 +56,7 @@
+ #include <kxmlguifactory.h>
+ 
+ // local includes
+-#include "xpdf/GlobalParams.h"
++#include "poppler/GlobalParams.h"
+ #include "part.h"
+ #include "ui/pageview.h"
+ #include "ui/thumbnaillist.h"
+@@ -99,7 +99,7 @@
+ 	//if ( m_count ) TODO check if we need to insert these lines..
+ 	//	delete globalParams;
+ 	globalParams = new GlobalParams("");
+-	globalParams->setupBaseFonts(NULL);
++	//globalParams->setupBaseFonts(NULL); // TODOPitti
+ 	m_count++;
+ 
+ 	// we need an instance
+@@ -697,11 +697,6 @@
+     KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
+     if ( saveURL.isValid() && !saveURL.isEmpty() )
+     {
+-        if (saveURL == url())
+-        {
+-            KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
+-            return;
+-        }
+         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
+         {
+             if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)
+diff -Nur kdegraphics-3.5.1/kpdf/shell/Makefile.am kdegraphics-3.5.1.new/kpdf/shell/Makefile.am
+--- kdegraphics-3.5.1/kpdf/shell/Makefile.am	2005-09-10 09:18:43.000000000 +0100
++++ kdegraphics-3.5.1.new/kpdf/shell/Makefile.am	2006-01-30 16:03:16.000000000 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(srcdir)/xpdf -I$(srcdir)/xpdf/goo -I$(top_builddir)/kpdf $(all_includes) $(FREETYPE_CFLAGS)
++INCLUDES = -I/usr/include/poppler -I/usr/include/poppler/goo -I$(top_builddir)/kpdf $(all_includes) $(FREETYPE_CFLAGS)
+ 
+ METASOURCES = AUTO
+ 

Added: people/jriddell/KDE/3.5/kdegraphics/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdegraphics/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdegraphics/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,23 @@
+#! /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 := --disable-kpdf-drm
+
+DEB_DH_STRIP_ARGS  := --dbg-package=kdegraphics-dbg
+
+PACKAGES_WITH_LIBS := kfaxview kghostview kmrml kpovmodeler ksvg \
+			kuickshow kview kviewshell libkscan1
+
+DEB_DH_MAKESHLIBS_ARGS_kghostview	:= -V'kghostview (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_kpovmodeler	:= -V'kpovmodeler (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksvg		:= -V'ksvg (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_kview		:= -V'kview (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_kviewshell	:= -V'kviewshell (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_libkscan1	:= -V'libkscan1 (>= 4:3.5.0-1)'
+
+#shlibs_ver = 4:3.5.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))


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

Modified: people/jriddell/KDE/3.5/kdelibs/debian/KUBUNTU-DEBIAN-CHANGES
===================================================================
--- people/jriddell/KDE/3.5/kdelibs/debian/KUBUNTU-DEBIAN-CHANGES	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdelibs/debian/KUBUNTU-DEBIAN-CHANGES	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1,3 +1,6 @@
 rules has Kubuntu version
 binary-install/kdelibs-data installs aboutkde-kubuntu.png.uu and cr*-device-system.png.uu
 libgamin-dev not libfam-dev
+  * Do not install kdnssd library files, they now come from
+    libkdnssd1-avahi package.  Development files stay in kdelibs4-dev.
+  * Add depends on kdelibs4-dev for libkdnssd1-avahi

Modified: people/jriddell/KDE/3.5/kdelibs/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdelibs/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdelibs/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/kdelibs/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdelibs/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdelibs/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1,3 +1,170 @@
+kdelibs (4:3.5.1-0ubuntu5) dapper; urgency=low
+
+  * Add kubuntu_32_autostart_onlykde.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  9 Feb 2006 12:55:35 +0000
+
+kdelibs (4:3.5.1-0ubuntu4) dapper; urgency=low
+
+  * Add kubuntu_31_onlyshowin_autostart.diff to respect OnlyShowIn and
+    NotShowIn for autostart files
+  * Change kdelibs4c2a-dbg to kdelibs-dbg (sync with debian)
+  * Change debian/compat to 5 for dapper to fix -dbg package
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  7 Feb 2006 12:57:52 +0000
+
+kdelibs (4:3.5.1-0ubuntu3) dapper; urgency=low
+
+  * Add back kdelibs4c2.install for backports
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  7 Feb 2006 00:43:24 +0000
+
+kdelibs (4:3.5.1-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_30_kurllabel.diff fix Konqueror status bar icons
+  * Add configure option --with-lua-includes=/usr/include/lua50
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed,  1 Feb 2006 14:27:16 +0000
+
+kdelibs (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Sync 27_kdnssd_avahi.diff with Debian
+  * Use control-dapper and control-breezy for to allow for backports
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 15:04:54 +0000
+
+kdelibs (4:3.5.0-0ubuntu11) dapper; urgency=low
+
+  * Remove netpbm from kdelibs-bin depends,
+    it is no longer used by kimgio
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Jan 2006 18:10:28 +0000
+
+kdelibs (4:3.5.0-0ubuntu10) dapper; urgency=low
+
+  * Add kubuntu_28_fix_sudo.diff to set home directory when 
+    run as root via sudo, stops KDE apps settings wrong permissions on 
+    files in users home directory
+  * Add kubuntu_29_quiet_kbuildsycoca.diff stop kbuildsycoca complaining
+    about unknown mimetypes
+  * SECURITY UPDATE: kjs encodeuri/decodeuri heap overflow vulnerability
+  * Add kubuntu_20_post_3.4.3_kdelibs_kjs.diff
+  * An incorrect bounds check in kjs, the Javascript interpreter
+    engine used by Konqueror and other parts of KDE, that allows
+    a heap based buffer overflow when decoding invalid utf8 encoded
+    URI sequences.
+  * References:
+     CVE-2006-0019
+     http://www.kde.org/info/security/advisory-20060119-1.txt
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2006 14:39:41 +0000
+
+kdelibs (4:3.5.0-0ubuntu9) dapper; urgency=low
+
+  * Make kdelibs4-dev depend on libavahi-client-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 17:25:14 +0000
+
+kdelibs (4:3.5.0-0ubuntu8) dapper; urgency=low
+
+  * Make kdelibs4-dev depend on libavahi-common-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 13:47:03 +0000
+
+kdelibs (4:3.5.0-0ubuntu7) dapper; urgency=low
+
+  * Make kdelibs4-dev depend on libavahi-qt3-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 11:50:47 +0000
+
+kdelibs (4:3.5.0-0ubuntu6) dapper; urgency=low
+
+  * Remove libkdnssd depend from kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 09:09:29 +0000
+
+kdelibs (4:3.5.0-0ubuntu5) dapper; urgency=low
+
+  * Add kubuntu_27_kdnssd_avahi.diff for avahi support directly in
+    kdelibs
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 11 Jan 2006 21:14:20 +0000
+
+kdelibs (4:3.5.0-0ubuntu4) dapper; urgency=low
+
+  * Do not install kdnssd library files, they now come from
+    libkdnssd1-avahi package.  Development files stay in kdelibs4-dev.
+  * Add depends on libkdnssd1-avahi from kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 11 Jan 2006 01:25:52 +0000
+
+kdelibs (4:3.5.0-0ubuntu3) dapper; urgency=low
+
+  * Build-dep on latest qt
+  * Un-apply patch before uploading
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 16 Dec 2005 17:48:30 +0000
+
+kdelibs (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Add back updated kubuntu_06_kwallet_simplify_string.diff
+    and kubuntu_03_applications_menu_entries_move.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 15 Dec 2005 14:34:41 +0000
+
+kdelibs (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Make kdelibs4-dev depend on gamin not fam
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 29 Nov 2005 19:50:37 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu6) dapper; urgency=low
+
+  * Add gettext-kde, kdesdk-scripts, hspell, liblualib50-dev as
+    depends to kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 26 Nov 2005 00:30:51 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu5) dapper; urgency=low
+
+  * Add libattr1-dev and libacl1-dev as depends to kdelibs4-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 26 Nov 2005 00:20:02 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu4) dapper; urgency=low
+
+  * Add debian/patches/kubuntu_06_fix_kdeprint_cups12_fix.diff, fix kdeprint compile error properly
+  * Add common/kubuntu_01_kdepot.diff and common/kde.pot, fix .pot generation
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 25 Nov 2005 22:11:51 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu3) dapper; urgency=low
+
+  * Fix broken kubuntu_06_fix_kdeprint_compile_hack.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 25 Nov 2005 18:44:54 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_06_fix_kdeprint_compile_hack.diff, quick patch until I
+    work out how to fix it properly
+  * Fix kdelibs4-doc.install for correct path of files
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 25 Nov 2005 17:08:31 +0000
+
+kdelibs (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * libstdc++ transition.  Rename kdelibs4c2 to kdelibs4c2a
+    http://lists.ubuntu.com/archives/ubuntu-devel-announce/2005-November/000016.html
+  * Tighten build-dep on arts, qt and openexr to pick up libstd++ transition
+  * build-dep on libattr1-dev and libacl1-dev
+  * Generate .pot files
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 17:29:53 +0000
+
 kdelibs (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release

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

Modified: people/jriddell/KDE/3.5/kdelibs/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdelibs/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdelibs/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 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.0), libasound2-dev [!kfreebsd-i386 !hurd-i386], libaspell-dev, libbz2-dev, libcupsys2-dev, libgamin-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
+Build-Depends: g++-3.4 [hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5.1), libasound2-dev [!kfreebsd-i386 !hurd-i386], libaspell-dev, libbz2-dev, libcupsys2-dev, libgamin-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.5), libavahi-qt3-dev (>= 0.5), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo, libacl1-dev, libattr1-dev, gettext-kde, kdesdk-scripts, lsb-release, base-files
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.6.2
 
 Package: kdelibs
 Section: kde
 Architecture: all
-Depends: kdelibs4c2 (>= ${Source-Version}), kdelibs-bin (>= ${Source-Version}), kdelibs-data (>= ${Source-Version})
+Depends: kdelibs4c2a (>= ${Source-Version}), kdelibs-bin (>= ${Source-Version}), kdelibs-data (>= ${Source-Version})
 Description: core libraries 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,
@@ -24,7 +24,7 @@
 Package: kdelibs-bin
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, menu-xdg, netpbm, perl, python
+Depends: ${shlibs:Depends}, menu-xdg, perl, python
 Recommends: perl-suid
 Replaces: kcontrol (<< 4:3.4.0)
 Description: core binaries for all KDE applications
@@ -42,7 +42,7 @@
 Architecture: all
 Depends: hicolor-icon-theme
 Conflicts: kdelibs4
-Replaces: kdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0), ksvg (<< 4:3.4.0), kpackage (<< 4:3.4.2), kttsd (<< 4:3.4.90), kdevelop3-data (<< 4:3.3.0)
+Replaces: kdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0), ksvg (<< 4:3.4.0), kpackage (<< 4:3.4.2), kttsd (<< 4:3.4.90), kdevelop3-data (<< 4:3.3.0), kicker (<< 4:3.5.0)
 Description: core shared data for all KDE applications
  This package contains all the architecture independent data files
  commonly used by KDE applications. You need these data files to run
@@ -51,12 +51,12 @@
  This package is part of KDE, and a component of the KDE libraries module.
  See the 'kde' and 'kdelibs' packages for more information.
 
-Package: kdelibs4c2
+Package: kdelibs4c2a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, kdelibs-bin (= ${Source-Version}), kdelibs-data (>> ${KDE-Version3}), kdelibs-data (<< ${KDE-Version2}.90), xbase-clients
-Conflicts: kdelibs4
-Replaces: kdelibs4, kdeartwork-style (<< 4:3.4.0)
+Depends: ${shlibs:Depends}, kdelibs-bin (= ${Source-Version}), kdelibs-data (>> ${KDE-Version3}), kdelibs-data (<< ${KDE-Version2}.90), iceauth
+Conflicts: kdelibs4, kdelibs4c2
+Replaces: kdelibs4, kdeartwork-style (<< 4:3.4.0), kdelibs4c2
 Description: core libraries for all KDE applications
  This package contains all the shared libraries used by all KDE
  applications. You need these libraries to run KDE applications.
@@ -67,7 +67,7 @@
 Package: kdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: kdelibs4c2 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.2), ${libasound2-dev}, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev
+Depends: kdelibs4c2a (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.5-rc1), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libcupsys2-dev, libgamin-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, liblualib50-dev, libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, gettext-kde, kdesdk-scripts, libavahi-qt3-dev, libavahi-common-dev, libavahi-client-dev
 Provides: kdelibs-dev
 Replaces: kdebase-dev (<< 4:3.4.0)
 Description: development files for the KDE core libraries
@@ -90,14 +90,14 @@
  This package is part of KDE, and a component of the KDE libraries module.
  See the 'kde' and 'kdelibs' packages for more information.
 
-Package: kdelibs4c2-dbg
+Package: kdelibs-dbg
 Section: libdevel
 Architecture: any
 Priority: extra
-Conflicts: kdelibs4-dbg
-Replaces: kdelibs4-dbg
-Depends: kdelibs4c2 (= ${Source-Version})
-Description: debugging symbols for kdelibs4c2
- This package contains the debugging symbols associated with kdelibs4c2.
+Conflicts: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg
+Replaces: kdelibs4-dbg, kdelibs4c2-dbg, kdelibs4c2a-dbg
+Depends: kdelibs4c2a (= ${Source-Version})
+Description: debugging symbols for kdelibs
+ This package contains the debugging symbols associated with kdelibs.
  They will automatically be used by gdb for debugging kdelibs-related
  issues.

Modified: people/jriddell/KDE/3.5/kdelibs/debian/kdelibs4-doc.install
===================================================================
--- people/jriddell/KDE/3.5/kdelibs/debian/kdelibs4-doc.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdelibs/debian/kdelibs4-doc.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1 +1 @@
-debian/tmp/usr/share/doc/kde/HTML/en/kdelibs-rc1-apidocs/*
\ No newline at end of file
+debian/tmp/usr/share/doc/kde/HTML/en/kdelibs*-apidocs/* /usr/share/doc/kde/HTML/en/kdelibs-apidocs

Modified: people/jriddell/KDE/3.5/kdelibs/debian/kdelibs4c2.install
===================================================================
--- people/jriddell/KDE/3.5/kdelibs/debian/kdelibs4c2.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdelibs/debian/kdelibs4c2.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -160,8 +160,8 @@
 debian/tmp/usr/lib/libkdesu.so.4.2.0
 debian/tmp/usr/lib/libkdeui.so.4
 debian/tmp/usr/lib/libkdeui.so.4.2.0
+debian/tmp/usr/lib/libkdnssd.so.1.0.0
 debian/tmp/usr/lib/libkdnssd.so.1
-debian/tmp/usr/lib/libkdnssd.so.1.0.0
 debian/tmp/usr/lib/libkhtml.so.4
 debian/tmp/usr/lib/libkhtml.so.4.2.0
 debian/tmp/usr/lib/libkimproxy.so.0

Modified: people/jriddell/KDE/3.5/kdelibs/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdelibs/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdelibs/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -13,22 +13,23 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-mitshm --with-alsa --enable-dnotify \
-	--with-distribution="$(version)"
+	--with-distribution="$(version)" \
+	--with-lua-includes=/usr/include/lua50
 
 DEB_FIXPERMS_EXCLUDE := \
 	usr/bin/fileshareset	\
 	usr/bin/kgrantpty	\
 	usr/bin/kpac_dhcp_helper
 
-DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs4c2
+DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs-dbg
 
 PACKAGES_WITH_LIBS := kdelibs4c2
 
-DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2 := -V'kdelibs4c2 (>= 4:3.4.3-1)'
+DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2 := -V'kdelibs4c2 (>= 4:3.5.1)'
 
 ###
 
-GCC4_ICES_HERE := arm m68k hppa
+GCC4_ICES_HERE := hppa
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
@@ -61,3 +62,9 @@
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 	echo "libasound2-dev=libasound2-dev" >>debian/kdelibs4-dev.substvars
 endif
+
+debian/control::
+	cp debian/control-dapper debian/control
+	-grep -q breezy /etc/lsb-release && cp debian/control-breezy debian/control
+	echo 4 > debian/compat
+	-grep -q dapper /etc/lsb-release && echo 5 > debian/compat

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+build-dep on libxaw-headers not libxaw8-dev

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/artsbuilder.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/artsbuilder.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/artsbuilder.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,351 @@
+debian/tmp/usr/bin/artsbuilder
+debian/tmp/usr/bin/artscontrol
+debian/tmp/usr/bin/midisend
+debian/tmp/usr/lib/libartsbuilder.la
+debian/tmp/usr/lib/libartsbuilder.so.0
+debian/tmp/usr/lib/libartsbuilder.so.0.0.0
+debian/tmp/usr/lib/libartscontrolapplet.la
+debian/tmp/usr/lib/libartscontrolapplet.so.1
+debian/tmp/usr/lib/libartscontrolapplet.so.1.0.0
+debian/tmp/usr/lib/libartscontrolsupport.la
+debian/tmp/usr/lib/libartscontrolsupport.so.1
+debian/tmp/usr/lib/libartscontrolsupport.so.1.0.0
+debian/tmp/usr/lib/libartsgui_idl.so.0
+debian/tmp/usr/lib/libartsgui_idl.so.0.0.0
+debian/tmp/usr/lib/libartsgui_kde.la
+debian/tmp/usr/lib/libartsgui_kde.so.0
+debian/tmp/usr/lib/libartsgui_kde.so.0.0.0
+debian/tmp/usr/lib/libartsgui.la
+debian/tmp/usr/lib/libartsgui.so.0
+debian/tmp/usr/lib/libartsgui.so.0.0.0
+debian/tmp/usr/lib/libartsmidi_idl.so.0
+debian/tmp/usr/lib/libartsmidi_idl.so.0.0.0
+debian/tmp/usr/lib/libartsmidi.la
+debian/tmp/usr/lib/libartsmidi.so.0
+debian/tmp/usr/lib/libartsmidi.so.0.0.0
+debian/tmp/usr/lib/libartsmodulescommon.la
+debian/tmp/usr/lib/libartsmodulescommon.so.0
+debian/tmp/usr/lib/libartsmodulescommon.so.0.0.0
+debian/tmp/usr/lib/libartsmoduleseffects.la
+debian/tmp/usr/lib/libartsmoduleseffects.so.0
+debian/tmp/usr/lib/libartsmoduleseffects.so.0.0.0
+debian/tmp/usr/lib/libartsmodulesmixers.la
+debian/tmp/usr/lib/libartsmodulesmixers.so.0
+debian/tmp/usr/lib/libartsmodulesmixers.so.0.0.0
+debian/tmp/usr/lib/libartsmodules.so.0
+debian/tmp/usr/lib/libartsmodules.so.0.0.0
+debian/tmp/usr/lib/libartsmodulessynth.la
+debian/tmp/usr/lib/libartsmodulessynth.so.0
+debian/tmp/usr/lib/libartsmodulessynth.so.0.0.0
+debian/tmp/usr/lib/mcop/Arts/ArtsBuilderLoader.mcopclass
+debian/tmp/usr/lib/mcop/artsbuilder.mcopclass
+debian/tmp/usr/lib/mcop/artsbuilder.mcoptype
+debian/tmp/usr/lib/mcop/Arts/Button.mcopclass
+debian/tmp/usr/lib/mcop/Arts/EffectRackGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Effect_WAVECAPTURE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/Container.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/EffectRackItem.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/InstrumentItem.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Environment/MixerItem.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Fader.mcopclass
+debian/tmp/usr/lib/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/FiveBandMonoComplexEQ.mcopclass
+debian/tmp/usr/lib/mcop/Arts/FreeverbGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/GenericGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/GraphLine.mcopclass
+debian/tmp/usr/lib/mcop/artsgui.mcopclass
+debian/tmp/usr/lib/mcop/artsgui.mcoptype
+debian/tmp/usr/lib/mcop/Arts/HBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Label.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LayoutBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LevelMeter.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LineEdit.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LittleStereoMixerChannel.mcopclass
+debian/tmp/usr/lib/mcop/Arts/LocalFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/MidiManager.mcopclass
+debian/tmp/usr/lib/mcop/artsmidi.mcopclass
+debian/tmp/usr/lib/mcop/artsmidi.mcoptype
+debian/tmp/usr/lib/mcop/Arts/MixerGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/artsmodulescommon.mcopclass
+debian/tmp/usr/lib/mcop/artsmodulescommon.mcoptype
+debian/tmp/usr/lib/mcop/artsmoduleseffects.mcopclass
+debian/tmp/usr/lib/mcop/artsmoduleseffects.mcoptype
+debian/tmp/usr/lib/mcop/artsmodules.mcopclass
+debian/tmp/usr/lib/mcop/artsmodules.mcoptype
+debian/tmp/usr/lib/mcop/artsmodulesmixers.mcopclass
+debian/tmp/usr/lib/mcop/artsmodulesmixers.mcoptype
+debian/tmp/usr/lib/mcop/artsmodulessynth.mcopclass
+debian/tmp/usr/lib/mcop/artsmodulessynth.mcoptype
+debian/tmp/usr/lib/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/MonoSimpleMixerChannel.mcopclass
+debian/tmp/usr/lib/mcop/Arts/MonoToStereo.mcopclass
+debian/tmp/usr/lib/mcop/Arts/PopupBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Poti.mcopclass
+debian/tmp/usr/lib/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/SimpleMixerChannel.mcopclass
+debian/tmp/usr/lib/mcop/Arts/SpinBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoBalanceGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoBalance.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoCompressorGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoToMono.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StereoVolumeControlGui.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StructureBuilder.mcopclass
+debian/tmp/usr/lib/mcop/Arts/StructureDesc.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_ATAN_SATURATE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_AUTOPANNER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_CAPTURE_WAV.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_CDELAY.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_COMPRESSOR.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_DATA.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_DEBUG.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_DELAY.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_DIV.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_FM_SOURCE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_FREEVERB.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_FX_CFLANGER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_MIDI_DEBUG.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_MIDI_TEST.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_MOOG_VCF.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_NIL.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_NOISE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_OSC.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_PITCH_SHIFT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_PLAY_PAT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_PSCALE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_RC.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_SEQUENCE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STD_EQUALIZER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_TREMOLO.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_WAVE_PULSE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_WAVE_SQUARE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_WAVE_TRI.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Synth_XFADE.mcopclass
+debian/tmp/usr/lib/mcop/Arts/VBox.mcopclass
+debian/tmp/usr/lib/mcop/Arts/VoiceRemovalGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Arts/Widget.mcopclass
+debian/tmp/usr/share/applications/kde/artsbuilder.desktop
+debian/tmp/usr/share/applications/kde/artscontrol.desktop
+debian/tmp/usr/share/apps/artsbuilder/artsbuilderui.rc
+debian/tmp/usr/share/apps/artsbuilder/examples/example_adsr.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_atan_saturate.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_autopanner.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_brickwall.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_bus.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_capture_wav.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_cdelay.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_cflanger.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_data.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_delay.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_dtmf1.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_equalizer.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_fm.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_freeverb.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_moog.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_multi_add.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_noise.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_pitchshift.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_play_wave.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_pscale.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_pulse.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_rc.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_record.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_sequence.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_shelve_cutoff.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_sine.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_softsaw.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_square.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_stereobeep.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_tremolo.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_tri.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/example_xfade.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_arts_all.arts-map
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_chirpdrum.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_deepdrum.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_full_square.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_hihat.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_neworgan.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_nokind.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_organ2.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_simple_sin.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_simple_square.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_simple_tri.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_slide1.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_slide.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_square.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/instrument_tri.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/README
+debian/tmp/usr/share/apps/artsbuilder/examples/template_Empty_Structure.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/template_Instrument.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/effect_delay_alone.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/effect_delay.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/effect_flanger_alone.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_flexible_slide.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_flexible_slide_GUI.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_fm_horn.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/instrument_moog_vcf_tune_GUI.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/mixer_element_eq.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/mixer_element_eqfx.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/mixer_element_simple.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/template_Instrument_GUI.arts
+debian/tmp/usr/share/apps/artsbuilder/examples/todo/template_Mixer_Element.arts
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_ADD.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_AMAN_PLAY.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_ATAN_SATURATE.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_BUS_DOWNLINK.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_BUS_UPLINK.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_DEBUG.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_DIV.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_ENVELOPE_ADSR.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_FILEPLAY.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_MIDI_DEBUG.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_MOOG_VCF.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_MULTI_ADD.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_MUL.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_PLAY_WAV.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_PLAY.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_PSCALE.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_RC.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_SEQUENCE_FREQ.png
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_SEQUENCE.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_SHELVE_CUTOFF.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_WAVE_SAW.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_WAVE_SIN.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_WAVE_SQUARE.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_WAVE_TRI.xpm
+debian/tmp/usr/share/apps/artsbuilder/pics/Synth_XFADE.xpm
+debian/tmp/usr/share/apps/artscontrol/artscontrol.rc
+debian/tmp/usr/share/apps/artscontrol/artsmidimanagerview.rc
+debian/tmp/usr/share/apps/kicker/applets/artscontrolapplet.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/apis.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/artsbuilder.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/arts-structure.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/common
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/detail.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/digitalaudio.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/faq.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/future.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/glossary.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/gui.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/helping.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Doc_MODUL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_AUDIO_MANAGER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_INSTRUMENT_MAPPER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_LABEL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_MIXER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_PANEL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_POTI.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_SLIDER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_SUBPANEL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Gui_WINDOW.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Interface_MIDI_NOTE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/schema1.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/schema2.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/schema3.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/schema4.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_ADD.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_ATAN_SATURATE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_DOWNLINK.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_BUS_UPLINK.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_CDELAY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_COMPRESSOR.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_DEBUG.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_DELAY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_DIV.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_ENVELOPE_ADSR.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_FILEPLAY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_FM_SOURCE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_FREQUENCY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_DEBUG.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_MIDI_ROUTER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_MUL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_NIL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAI.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_AKAIS.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PLAY_WAV.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_PSCALE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_RC.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE_FREQ.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_SEQUENCE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_SHELVE_CUTOFF.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_STD_EQUALIZER.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_STRUCT_KILL.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SIN.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_SQUARE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_WAVE_TRI.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/images/Synth_XFADE.png
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/mcop.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/midi.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/midiintro.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/modules.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/porting.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/references.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/artsbuilder/tools.docbook
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsbuilderexecute.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsbuilderexecute.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsaudiomanager.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsenvironment.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsfftscope.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsmediatypes.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/artsmidimanager.png
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsenvironment.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsfftscope.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
+debian/tmp/usr/share/icons/hicolor/128x128/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/artsbuilder.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/artscontrol.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/artsbuilder.svgz
+debian/tmp/usr/share/icons/hicolor/scalable/apps/artscontrol.svgz
+debian/tmp/usr/share/mimelnk/application/x-artsbuilder.desktop
+
+debian/icons/artsbuilder.xpm		/usr/share/pixmaps
+debian/icons/artscontrol.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/artsbuilder.menu
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/artsbuilder.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/artsbuilder.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+?package(artsbuilder):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="aRts Builder"\
+	icon="/usr/share/pixmaps/artsbuilder.xpm"\
+	command="/usr/bin/artsbuilder"
+
+?package(artsbuilder):\
+	needs="X11"\
+	section="Apps/Sound"\
+	hints="KDE"\
+	title="aRts Control"\
+	icon="/usr/share/pixmaps/artscontrol.xpm"\
+	command="/usr/bin/artscontrol"
+	
+# Icon 16x16 arts/builder/pics/cr16-app-artsbuilder.png artsbuilder.xpm
+# Icon 16x16 arts/builder/pics/cr16-app-artscontrol.png artscontrol.xpm

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,1025 @@
+kdemultimedia (4:3.5.1-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_03_autostart_kdeonly.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  9 Feb 2006 13:00:21 +0000
+
+kdemultimedia (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
+
+kdemultimedia (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Tighten version of Replaces on kdemultimedia-kfile-plugins
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  6 Jan 2006 18:33:11 +0000
+
+kdemultimedia (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:28:19 +0000
+
+kdemultimedia (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:58:10 +0000
+
+kdemultimedia (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 19:15:18 +0000
+
+kdemultimedia (4:3.5-rc1-1) alioth; urgency=low
+
+  * New upstream pre-release.
+
+  +++ Changes by Christopher Martin:
+
+  * aKode has been dropped from kdemultimedia, and is now a separate source
+    package. To use arts with akode, install the libarts1-akode package,
+    which contains a plug-in that links the two systems.
+
+  * Add a manpage for kaudiocreator, courtesy of Francois Wendling.
+    (Closes: #337166)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 12 Nov 2005 08:43:06 -0500
+
+kdemultimedia (4:3.4.3-3) experimental; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Patch mpeglib's mmxidct_asm.S to set PT_GNU_STACK, so that
+    libmpeg-0.3.0.so is not marked as requiring an executable stack. Tests
+    with an exec-shield kernel didn't uncover any problems.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Oct 2005 10:02:42 -0400
+
+kdemultimedia (4:3.4.3-2) experimental; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Move libartscontrol .la files from kdemultimedia-dev to artsbuilder,
+    allowing the artsbuilder kicker applet to start without kdemultimedia-dev
+    being installed. (Closes: #334716)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Oct 2005 09:50:13 -0400
+
+kdemultimedia (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch which disables MMX optimizations in the mpeglib package for
+    the i386 architecture. These were causing the library to contain non-PIC
+    code.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Oct 2005 11:27:27 -0400
+
+kdemultimedia (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Build with g++-3.4 on arm, m68k and hppa; kdemultimedia also makes gcc 4.0
+    ICE as described in #323133.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 04 Sep 2005 22:42:25 +0200
+
+kdemultimedia (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  
+  * Rebuild closes: #317423, #317205
+
+  +++ Changes by Christopher Martin:
+
+  * Remove 07_xlibs-static-pic.diff and the xlibs-static-pic build-dependency,
+    and add a build-dependency on libxxf86dga-dev, for the X.Org transition.
+
+  * Improve libkcddb1 package description. (Closes: #312191)
+
+  +++ Changes by Luk Claes:
+  
+  * Added me to uploaders
+
+  * Updated FSF's address
+  
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Aug 2005 19:18:45 +0200
+
+kdemultimedia (4:3.4.3-0ubuntu2) dapper; urgency=low
+
+  * Build with GCC 3.4 on arches which fail using GCC 4.0
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 30 Oct 2005 01:42:26 +0100
+
+kdemultimedia (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  7 Oct 2005 18:45:40 +0000
+
+kdemultimedia (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build using unsermake
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 26 Jul 2005 12:37:36 +0000
+
+kdemultimedia (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+  * Add all packages back to meta-package
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 00:41:30 +0000
+
+kdemultimedia (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
+
+  * Add build-dep on automake1.9
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 25 May 2005 23:08:10 +0000
+
+kdemultimedia (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+
+  * Sync with Debian
+  * Change kubuntu_02_hide_arts_menu_entries.diff to use NoDisplay
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 25 May 2005 12:49:46 +0000
+
+kdemultimedia (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
+
+kdemultimedia (4:3.4.0-0ubuntu3) hoary; urgency=low
+
+  * Add kubuntu_02_hide_arts_menu_entries.diff to hide artsbuilder and artscontrol k-menu entries
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 24 Mar 2005 04:48:58 +0000
+
+kdemultimedia (4:3.4.0-0ubuntu2) hoary; urgency=low
+
+  * Remove artsbuilder, kmid, krec depends from kdemultimedia meta-package.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 16 Mar 2005 22:37:33 +0000
+
+kdemultimedia (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * Add patch kubuntu_01_tracksimp_fix.diff to fix 
+    slow KAudioCreator problem
+    http://bugs.kde.org/show_bug.cgi?id=98477
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 16 Mar 2005 03:02:41 +0000
+
+kdemultimedia (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+  * Sync with Debian
+  * Separate akode's mpeg support into new package akode-mpeg.
+  * Remove mpeg dependencies from kdemultimedia metapackage.
+  * Remove noatun and kaboodle from meta-package
+
+ -- Jonathan Riddell <jr at jriddell.org>  Tue,  8 Mar 2005 02:13:08 +0000
+
+kdemultimedia (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: #287095)
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Switch to CDBS for packaging.
+
+  * Add the following build-dependencies: libgstreamer-plugins0.8-dev,
+    libltdl3-dev, libtheora-dev. Require libspeex-dev at (>> 1.1.5).
+
+  * 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 kdebase-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>  Sat, 14 May 2005 13:00:44 -0400
+
+kdemultimedia (4:3.3.2-1ubuntu4) hoary; urgency=low
+
+  * changed a depends for akode, libflac4 to libflac6 which isnt anymore 
+    in archive. Hoary has libflac6 at the moment which comes
+    from package flac. Thanks to SÃ©bastien Filleul reporting this problem.
+    
+
+ -- Andreas Mueller <amu at canonical.com>  Sat, 15 Jan 2005 13:25:04 +0100
+
+kdemultimedia (4:3.3.2-1ubuntu3) hoary; urgency=low
+
+  *  added missing builddepends libxinerama-dev 
+
+ -- Andreas Mueller <amu at canonical.com>  Sun, 26 Dec 2004 18:40:55 +0100
+
+kdemultimedia (4:3.3.2-1ubuntu2) hoary; urgency=low
+
+  * added missing builddepends libxinerama1 
+
+ -- Andreas Mueller <amu at canonical.com>  Sun, 26 Dec 2004 03:03:14 +0100
+
+kdemultimedia (4:3.3.2-1ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+  * Remove patches:
+    - 01_kdemultimedia_branch
+    - 02_autotools_update
+    - 05_pedantic-errors
+    - 06_xlibs-static-pic
+  * Don't run cvs-clean.pl if debian/patches exists
+
+ -- Chris Halls <chris.halls at credativ.co.uk>  Mon, 13 Dec 2004 13:30:17 +0000
+
+kdemultimedia (4:3.3.2-1) unstable; urgency=low
+
+  * This upload is compiled against libflac6, so akode 3.3.2 is now
+    installable in sid (was broken in experimental). Closes: #295485
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update.
+
+  * Fix debian/copyright to refer to License rather than to Copyright
+    when discussing KDE's licenses.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 01 Mar 2005 22:02:05 +0100
+
+kdemultimedia (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_3_BRANCH update.
+
+  * New man pages:
+    - kaboodle.1 by Karolina Lindqv. (Closes: #192567)
+    - kmix.1 and kmixctrl.1 by ClÃ©ment Stenac. (Closes: #207128)
+    - krec.1 by Ryan Waye. (Closes: #258812)
+      [Forgot to include krec.manpages in previous upload.]
+
+  * debian/control:
+    - make kaudiocreator recommend vorbis-tools. (Closes: #285236)
+    - improve the akode package description. (Closes: #264624, #277822)
+    - make akode Enhance: libarts1.
+    - removed build-dependency on automake1.9.
+    - drop the 'KDE is a powerful...' blurb from juk's description, since
+      it has an appropriate long description.
+
+ -- Adeodato SimÃ³ <asp16 at alu.ua.es>  Mon, 20 Dec 2004 03:20:59 +0100
+
+kdemultimedia (4:3.3.1-2) unstable; urgency=high
+
+  * Upload to rebuild against libflac6. Urgency set to high since there are
+    packages fixing RC bugs that can't enter sarge due to the transition not
+    being ready. (Closes: #289343)
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * debian/control:
+    - version Build-Dependency on libflac-dev to (>= 1.1.1-3).
+    - version Build-Dependency on libtunepimp2-dev to (>= 0.3.0-2.1).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 13 Jan 2005 05:17:03 +0100
+
+kdemultimedia (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+  * debian/control:
+    - fix indentation in juk's description. (Closes: #216642)
+    - replace trm with libtunepimp-bin. (Closes: #266050)
+    - remove Build-Depends on libkdegst0.6-dev. (Closes: #257497)
+  * debian/noatun.mime:
+    - Pass --nofork option to noatun. (Closes: #278113)
+  * debian/man/krec.1
+    - new manpage by Ryan Waye. (Closes: #258812)
+  * debian/patches/10_dont-define-__u64.diff
+    - new patch by Peter Reinholdtsen to fix FTBFS on alpha and ia64.
+      (Closes: #270502)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon,  8 Nov 2004 03:30:00 -0600
+
+kdemultimedia (4:3.3.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat, 14 Aug 2004 06:00:00 -0500
+
+kdemultimedia (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * Added libkcddb/configbase.h to kdemultimedia-dev. (Closes: #258649)
+  * Build-Depends: xlibs-static-pic. (Closes: #260749)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue,  3 Aug 2004 19:00:00 -0500
+
+kdemultimedia (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/*.menu: remove the obsolete kderemove tag.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 16 Apr 2004 02:00:00 -0500
+
+kdemultimedia (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated noatun ogg mimetype entry. (Closes: #235265)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat,  6 Mar 2004 01:00:00 -0600
+
+kdemultimedia (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Thu, 19 Feb 2004 16:00:00 -0600
+
+kdemultimedia (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 27 Jan 2004 03:00:00 -0600
+
+kdemultimedia (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added libtool arm patch.
+  * Updated kaboodle Description. (Closes: #181548)
+  * Added cdromAccess_Linux.cpp __u64 removal patch. (Closes: #226371)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 13 Jan 2004 18:00:00 -0600
+
+kdemultimedia (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Document how to use timidity with kmid. (Closes: #195019)
+  * kaudiocreator Depends kdemultimedia-kio-plugins. (Closes: #196686)
+  * kaboodle Recommends libarts1-xine. (Closes: #214118)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon, 05 Jan 2004 19:23:22 -0600
+
+kdemultimedia (4:3.1.2-1.4) unstable; urgency=low
+
+  * NMU
+  * Complete patch to stop including <linux/cdrom.h>.  I forgot a few
+    places.  The replacement <linux-cdrom.h> is placed in debian/.
+    Store the changes as debian/patches/no-cdrom-h.diff.
+  * Moved C++ fixes into debian/patches/no-varsize-arr.diff and
+    debian/patches/correct-cplusplus.diff.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 12 Nov 2003 23:04:27 +0100
+
+kdemultimedia (4:3.1.2-1.3) unstable; urgency=low
+
+  * NMU.
+  * Stop using <linux/cdrom.h>, and move the parts needed into
+    a standalone <linux-cdrom.h> instead. (Closes: #220310)
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 11 Nov 2003 23:14:06 +0000
+
+kdemultimedia (4:3.1.2-1.2) unstable; urgency=low
+
+  * NMU
+  * Fix code errors to get this compiling with gcc 3.3.  Patches in BTS.
+    - Swap QString.insert() arguments to get them to make
+      sense. (Closes: #220174)
+    - Comment out inline assembly macro. (Closes: #220176)
+    - Make sure subclasses inherit publicly from class
+      KListViewItem. (Closes: #220179)
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 11 Nov 2003 16:31:46 +0000
+
+kdemultimedia (4:3.1.2-1.1) unstable; urgency=low
+
+  * NMU
+  * Fix g++ 3 compile error, patch in bts.  Closes: #203919
+
+ -- LaMont Jones <lamont at debian.org>  Wed, 27 Aug 2003 07:11:30 -0600
+
+kdemultimedia (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 23 May 2003 11:00:00 -0500
+
+kdemultimedia (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #180616)
+  * Add 'chmod +x configure' to rules. (Closes: #181205, #181355, #181561)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed, 12 Mar 2003 13:00:00 -0600
+
+kdemultimedia (4:3.1.0-1) unstable; urgency=low
+
+  * New Upstream.
+  * Redo Debian dir.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 04 Feb 2003 23:00:00 -0600
+
+kdemultimedia (4:2.2.2-8.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, 22 Jan 2003 15:00:51 +0100
+
+kdemultimedia (4:2.2.2-8.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>  Mon,  6 Jan 2003 08:53:19 +0100
+
+kdemultimedia (4:2.2.2-8) unstable; urgency=high
+
+  * Updated Build-Depends (Closes: #132015)
+  * Actually apply the PowerPC fix that Daniel thought he did.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed,  6 Mar 2002 14:00:00 -0600
+
+kdemultimedia (4:2.2.2-7) unstable; urgency=high
+
+  * Changing Maintainer to Chris.
+  * De-b0rking PowerPC stuff.
+
+ -- Daniel Stone <daniel at sfarc.net>  Wed, 27 Feb 2002 21:35:53 +1100
+
+kdemultimedia (4:2.2.2-6) unstable; urgency=low
+
+  * Adopting orphaned package; thanks to Ivan for all his work.
+    (closes: #127707)
+  * debian/control:
+    - Make kdemultimedia-dev depend on libesd0-dev. (closes: #127806)
+
+ -- Daniel Stone <daniel at sfarc.net>  Fri,  4 Jan 2002 09:28:30 -0500
+
+kdemultimedia (4:2.2.2-5) unstable; urgency=low
+
+  * Build with new png
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 28 Dec 2001 13:32:00 -0700
+
+kdemultimedia (4:2.2.2-4) unstable; urgency=low
+
+  * Don't disable the alsa test (Closes: #124132)
+  * Change recommends to depends for kdebase-libs
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 16 Dec 2001 04:53:00 -0700
+
+kdemultimedia (4:2.2.2-3) unstable; urgency=low
+
+  * Build cleanup
+  * Documentation updates for freeze
+  * Dep/Build-dep/etc cleanup
+  * Sync with upstream
+  * Add -ffunction-sections to CXXFLAGS for hppa
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 30 Nov 2001 02:30:00 -0700
+
+kdemultimedia (4:2.2.2-2) unstable; urgency=low
+
+  * Add missing build-depend - libasound2-dev
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 25 Nov 2001 01:53:00 -0700
+
+kdemultimedia (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version
+  * Change maintainer
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 07 Nov 2001 19:30:00 -0700
+
+kdemultimedia (4:2.2.1-1.4) unstable; urgency=low
+
+  * don't check for auto* as it hoses things
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 08 Oct 2001 19:30:00 -0700
+
+kdemultimedia (4:2.2.1-1.3) unstable; urgency=low
+
+  * Fix configure (Closes: #114577)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 05 Oct 2001 09:35:00 -0700
+
+kdemultimedia (4:2.2.1-1.2) unstable; urgency=low
+
+  * don't worry about automake 1.5
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 03 Oct 2001 09:35:00 -0700
+
+kdemultimedia (4:2.2.1-1.1) unstable; urgency=low
+
+  * Fix conflicts
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 23 Sep 2001 18:51:00 -0700
+
+kdemultimedia (4:2.2.1-1) unstable; urgency=low
+ 
+  * New upstream version 2.2.1
+  * Change maintainer
+  * Lintian error cleanup
+  * PIC vs. non-PIC code cleanup
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 25 Aug 2001 14:41:00 -0700
+
+kdemultimedia (4:2.2.0-final-1) unstable; urgency=low
+  
+  * New upstream version 2.2
+  * Fix build issues (Closes: #107281)
+  * Don't link to Xv (Closes: #108261)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 12 Aug 2001 02:03:00 -0700
+
+kdemultimedia (4:2.2.0-0.2beta1-1) unstable; urgency=low
+ 
+  * sync with upstream
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 25 Jul 2001 03:51:00 -0700
+
+kdemultimedia (4:2.2.0-0.1beta1-1) unstable; urgency=low
+ 
+  * sync with upstream
+  * More Build-Depends and Depends work
+  * More alpha build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 18 Jul 2001 00:24:00 -0700
+
+kdemultimedia (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * sync with upstream
+  * More alpha build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 07 Jul 2001 03:40:00 -0700
+
+kdemultimedia (4:2.2.0-0beta1-2) unstable; urgency=low
+ 
+  * sync with upstream
+  * Autobuild for alpha
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 03 Jul 2001 02:25:00 -0700
+
+kdemultimedia (4:2.2.0-0beta1-1) unstable; urgency=low
+ 
+  * sync with upstream
+  * Fix seg (Closes: #102647)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 30 Jun 2001 19:15:00 -0700
+
+kdemultimedia (4:2.2-cvs20010622-1) unstable; urgency=low
+ 
+  * New upstream pull
+  * 2.2 beta1
+  * Adding: Enhances: tags
+  * Adding in notation in kscd README.Debian about the fact that CDDB is
+    not supported due to licensing issues. (Closes: #96435)
+  * Rename libmpeglib0 to mpeglib and remove libmpeglib-dev
+  * Rename arts to artsbuilder as it's less likely to confuse people plus
+    is the proper name for it.
+  * rename timidity to ktimidity and provide timidity yet we don't conflict
+    with it. Move timidity.cfg to /etc/kde2/ktimidity.cfg and move conf files
+    for timidity/kmidi to /etc/kde2/kmidi and conffile them all.  kmidi and
+    ktimidity both seem to work find for me here now...hopefully it will do
+    the same for you folks.
+  * Build kmidi/ktimidity with support for most of it's different interfaces. 
+    Not sure if this is how it'll end up being in the end.  This includes the
+    default Xaw, Ncurses, and Slang.
+  * Fixes these problems: 
+        noatun segfaults (Closes: #88585)
+  * Fix formatting (Closes: #99945)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
+
+kdemultimedia (4:2.1.1-2) unstable; urgency=low
+ 
+  * Update menu bits to include new kde menu removal tag
+  * a few upstream fixes
+  * Update build-depends to recognize real | virtual
+  * Adding menu entry for kmid...oops
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 08 Apr 2001 15:34:00 -0700
+
+kdemultimedia (4:2.1.1-1.0.1) unstable; urgency=low
+ 
+  * Rebuild with old libc
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 26 Mar 2001 15:44:00 -0700
+
+kdemultimedia (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Mar 2001 22:07:00 -0700
+
+kdemultimedia (4:2.1.0-2) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Update shlibs and overrides
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 07 Mar 2001 21:48:00 -0700
+
+kdemultimedia (4:2.1.0-1) unstable; urgency=low
+ 
+   * Re-pulling from CVS instead of using the official tarballs.  The
+     official tarballs had problems which made it hard to handle patches
+   * Version changed to 2.1.0 instead of 2.1-final as we are post 2.1-final
+     and pre 2.1.1 which will be released in about a month.  This also allows
+     for the source upload.
+   * Update build-depends
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 01 Mar 2001 01:49:00 -0700
+
+kdemultimedia (4:2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Upping standards version
+  * Adding in mp3-decoder provides for noatun
+  * Fixing confliction (Closes: #84880)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdemultimedia (4:2.1-beta2-0128-1) unstable; urgency=low
+ 
+  * More upstream fixes to noatun
+  * Removing old --enable-debug
+  * Removing guid stuff from kscd as upstream disabled suid execution
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 28 Jan 2001 01:42:00 -0700
+
+kdemultimedia (4:2.1-beta2-2) unstable; urgency=low
+ 
+  * Fixing Build-Depends
+  * More upstream fixes for noatun
+  * not --enable'ng esd as it doesn't seem to work and ends up forcing esd
+    libs for packages that don't work with it.
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 24 Jan 2001 00:12:00 -0700
+
+kdemultimedia (4:2.1-beta2-1) unstable; urgency=low
+ 
+  * New upstream beta
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 22 Jan 2001 01:30:00 -0700
+
+kdemultimedia (4:2.1-20010115-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * kaiman removed.  (Closes: #77449)
+    noatun now kde2.1 media player
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
+
+kdemultimedia (4:2.1-20010106-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More dependency fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 06 Jan 2001 23:16:00 -0700
+
+kdemultimedia (4:2.1-20010101-2) unstable; urgency=low
+ 
+  * Fixing file placement for noatun
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 04 Jan 2001 11:37:00 -0700
+
+kdemultimedia (4:2.1-20010101-1) unstable; urgency=low
+ 
+  * More upstream fixes
+	  
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 01 Jan 2001 17:00:00 -0700
+
+kdemultimedia (4:2.1-20001218-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More dependency cleanup..we don't need kdebase-libs and arts for 
+    most of these apps
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Dec 2000 23:00:00 -0700
+
+kdemultimedia (4:2.1-20001216-1) unstable; urgency=low
+ 
+  * New upstream beta version
+  * i18n patch for kaimam applied
+  * new noatun package
+  * Migrating mpeglib packages back into kdemultimedia
+  * Adding in missing conflicts for kdemultimedia
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 16 Dec 2000 18:46:00 -0700
+
+kdemultimedia (4:2.0-final-7) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing a packaging problem with task package
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 22 Nov 2000 06:16:00 -0700
+
+kdemultimedia (4:2.0-final-6) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing shlibs
+  * Adding lintian overrides
+  * Fixing build rules
+  * documentation work
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 21 Nov 2000 08:20:00 -0700
+
+kdemultimedia (4:2.0-final-5) unstable; urgency=low
+ 
+  * building with --enable-debug as it seems kmidi croaks if built without
+    debug
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 16 Nov 2000 01:10:00 -0700
+
+kdemultimedia (4:2.0-final-4.2) unstable; urgency=low
+ 
+  * more dependency work
+  * fixing build pieces for non-i386 systems
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 12 Nov 2000 03:30:00 -0700
+
+kdemultimedia (4:2.0-final-4.1) unstable; urgency=low
+ 
+  * minor upstream fixes
+  * adding in menu hints
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
+
+kdemultimedia (4:2.0-final-4) unstable; urgency=low
+ 
+  * minor upstream fixes
+  * more i18n fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 08 Nov 2000 17:30:00 -0700
+                                                                                
+kdemultimedia (4:2.0-final-3.1) unstable; urgency=low
+ 
+  * minor upstream fixes
+  * more work on kmidi, kmid, and kaiman
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 07 Nov 2000 00:30:00 -0700
+                                                                                
+kdemultimedia (4:2.0-final-3) unstable; urgency=low
+ 
+  * more upstream fixes
+  * Fixes mp3 playing with aRTs (Closes: #76141)
+  * Fixes mime types (Closes: #75975)
+  * build against new xlibs
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
+                                                                                
+kdemultimedia (4:2.0-final-2) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
+
+kdemultimedia (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
+
+kdemultimedia (4:2.0-20001011-2) unstable; urgency=low
+ 
+  * Trying to fix up kmidi
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 13 Oct 2000 19:30:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20001006-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 06 Oct 2000 18:00:00 -0700
+                                                                                
+kdemultimedia (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
+                                                                                
+kdemultimedia (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
+                                                                                
+kdemultimedia (4:2.0-20000925-2) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More work on kmidi - Moving timidity patches into the proper dir
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 28 Sep 2000 06:00:00 -0700
+
+kdemultimedia (4:2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Kmid should build properly now
+  * Should build out of the box now
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdemultimedia (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
+
+kdemultimedia (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Sep 2000 22:30:00 -0700
+
+kdemultimedia (4:2.0-20000911-1) unstable; urgency=low
+ 
+  * Removing aktion from package since it depends on non-free xanim
+  * Adding more information to copyright file
+  * More shlibs fixups for arts and kscd
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 12 Sep 2000 09:45:00 -0700
+
+kdemultimedia (4:2.0-20000911-0) unstable; urgency=low
+ 
+  * more upstream fixes
+  * More kmidi fixes
+  * Breaking kdemultimedia down
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 11 Sep 2000 04:30:00 -0700
+
+kdemultimedia (4:2.0-20000909-0) unstable; urgency=low
+
+  * more upstream fixes
+  * Not providing TIMIDITY 
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 09 Sep 2000 22:30:00 -0700
+
+kdemultimedia (4:2.0-20000901-0) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Sep 2000 16:00:00 -0700
+
+kdemultimedia (4:2.0-20000827-0) experimental; urgency=low
+ 
+  * more upstream fixes
+  * more build fixes 
+  * merging package changes with upstream cvs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 27 Aug 2000 19:30:00 -0700     
+
+kdemultimedia (4:2.0-20000825-1.0) experimental; urgency=low
+ 
+  * Build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
+
+kdemultimedia (4:2.0-20000823-1.0) experimental; urgency=low
+ 
+  * KDE 2.0 beta 4
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 23 Aug 2000 16:30:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20000820-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 20 Aug 2000 17:00:00 -0700
+                                                                                
+kdemultimedia (4:2.0-20000623-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 23 Jun 2000 07:10:00 -0700
+                                                                                
+kdemultimedia-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 21 May 2000 18:15:00 -0700
+
+kdemultimedia-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 12 May 2000 22:00:00 -0700
+
+kdemultimedia-cvs (4:2.0-20000303-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 03 Mar 2000 22:00:00 -0700
+
+kdemultimedia-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+
+  * new cvs version
+  * Adding in build-depends
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
+
+kdemultimedia-cvs (4:2.0-19991001-1) experimental; urgency=low
+
+  * new version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Oct 1999 14:00:42 -0400
+
+kdemultimedia-cvs (4:2.0-19990822-1) experimental; urgency=low
+
+  * new version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 22 Aug 1999 08:00:42 -0400
+
+kdemultimedia-cvs (4:2.0-19990626-1) experimental; urgency=low
+
+  * new version
+  * making paths completly configurable via debianrules
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 27 Jun 1999 18:54:42 +0200
+
+kdemultimedia-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * new upstream CVS version 
+  * migrating out of /opt to /
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 24 May 1999 07:30:09 -0400
+
+kdemultimedia (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo at kde.org>  Wed, 17 Feb 1999 19:09:42 +0100
+
+kdemultimedia (4:1.1-19990207-3) unstable; urgency=low
+
+  * install kscd setgrp cdrom
+
+ -- Stephan Kulow <coolo at kde.org>  Wed, 17 Feb 1999 00:49:47 +0100
+
+kdemultimedia (4:1.1-19990207-2) unstable; urgency=low
+
+  * fixed a bug with the wrong libjpeg version
+  * depend on cddb for kscd
+
+ -- Stephan Kulow <coolo at kde.org>  Tue,  9 Feb 1999 10:43:44 +0100
+
+kdemultimedia (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:59 +0100
+
+kdemultimedia (2:980710-1.0-1) unstable; urgency=low
+
+  * new upstream version 1.0
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 12 Jul 1998 10:12:19 +0200
+
+kdemultimedia (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 19 Apr 1998 18:01:56 +0200
+
+kdemultimedia (2:980331-1) frozen; urgency=low
+
+  * let it depend on kdebase for the help system
+  * fixed old fsf-address
+  * new upstream version with bugfixes
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 31 Mar 1998 23:17:10 +0200
+
+kdemultimedia (2:980311-2) frozen; urgency=low
+
+  * new compile cycle with qt-1.33 and libstdc++-2.8
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 24 Mar 1998 21:55:40 +0100
+
+kdemultimedia (2:980311-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 12 Mar 1998 21:43:02 +0100

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

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,282 @@
+Source: kdemultimedia
+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), debhelper (>= 4.2.30), autotools-dev, cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.1), libcdparanoia0-dev, libesd0-dev, libflac-dev (>= 1.1.1-3), libgstreamer-plugins0.8-dev, libltdl3-dev, liboggflac-dev (>= 1.1.1-3), libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libtunepimp-bin, libtunepimp2-dev (>= 0.3.0-2), libxaw-headers, libxine-dev, sharutils, texinfo, libxxf86dga-dev, libakode-dev
+Standards-Version: 3.6.2
+
+Package: kdemultimedia
+Section: kde
+Architecture: all
+Depends: artsbuilder (>= ${Source-Version}), juk (>= ${Source-Version}), kaboodle (>= ${Source-Version}), kaudiocreator (>= ${Source-Version}), kdemultimedia-kappfinder-data (>= ${Source-Version}), kdemultimedia-kfile-plugins (>= ${Source-Version}), kdemultimedia-kio-plugins (>= ${Source-Version}), kmid (>= ${Source-Version}), kmix (>= ${Source-Version}), krec (>= ${Source-Version}), kscd (>= ${Source-Version}), libarts1-akode (>= ${Source-Version}), libarts1-audiofile (>= ${Source-Version}), libarts1-mpeglib (>= ${Source-Version}), libarts1-xine (>= ${Source-Version}), mpeglib (>= ${Source-Version}), noatun (>= ${Source-Version})
+Suggests: kdemultimedia-doc-html (>= ${Source-Version})
+Description: multimedia apps from the official KDE release 
+ KDE (the K Desktop Environment) is a powerful Open Source graphical
+ 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 multimedia applications
+ (such as sound and movie player, mixers and plugins) provided with
+ the official release of KDE.
+ .
+ Homepage: http://www.kde.org/areas/multimedia
+
+Package: kdemultimedia-dev
+Section: devel
+Architecture: any
+Depends: kdelibs4-dev (>= 4:3.5-rc2), artsbuilder (= ${Source-Version}), kdemultimedia-kio-plugins (= ${Source-Version}), kmid (= ${Source-Version}), kmix (= ${Source-Version}), krec (= ${Source-Version}), kscd (= ${Source-Version}), libarts1-akode (= ${Source-Version}), libarts1-mpeglib (= ${Source-Version}), libkcddb1 (= ${Source-Version}), mpeglib (= ${Source-Version}), noatun (= ${Source-Version})
+Conflicts: libmpeg-dev
+Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
+Description: development files for the KDE multimedia module
+ Development files and headers for the KDE multimedia module.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kdemultimedia-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdebase
+Description: KDE multimedia 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 multimedia 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/juk/. Documentation is provided for most
+ KDE multimedia packages.
+ .
+ This package is part of KDE, and a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: artsbuilder
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase-data (<< 4:3.3.91), kdemultimedia-dev (<< 4:3.4.3-2)
+Description: synthesizer designer for aRts
+ This is the analog Realtime synthesizer's graphical design tool.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: juk
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}, libtunepimp-bin
+Suggests: khelpcenter
+Description: music organizer and player for KDE
+ JuK (pronounced "jook") is a jukebox and music manager for the KDE
+ desktop similar to jukebox software on other platforms such as
+ iTunes or RealOne.
+ .
+ Some of JuK's features include:
+  * Support for Ogg Vorbis and MP3 formats
+  * Tag editing support for both formats, including ID3v2 for MP3 files.
+    Multitagging or editing a selection of multiple files at once is also
+    supported
+  * Output to either the aRts, default KDE sound system, or GStreamer
+  * Managment of your "collection" and multiple playlists
+  * Import and export to m3u playlists
+  * Binary caching of audio meta-data and playlist information for faster
+    load times (starting with the second time you run JuK)
+  * Integration into KDE that allows drag-and-drop and clipboard usage
+    with other KDE and X apps
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kaboodle
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: libarts1-xine
+Suggests: khelpcenter
+Description: light, embedded media player for KDE
+ Kaboodle is a light, embedded media player, supporting both video and audio,
+ for KDE. It uses the aRts framework for playing media files.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kaudiocreator
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}, kdemultimedia-kio-plugins (= ${Source-Version})
+Recommends: vorbis-tools, flac
+Suggests: lame
+Description: CD ripper and audio encoder frontend for KDE
+ KAudioCreator is a tool for audio extraction (ripping) and encoding. It can
+ keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also
+ searches CDDB to retrieve the information of the disk.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kdemultimedia-kfile-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdemultimedia-kio-plugins (<< 4:3.5.0)
+Description: au/avi/m3u/mp3/ogg/wav plugins for kfile
+ au/avi/m3u/mp3/ogg/wav file metainformation plugins for KDE.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kdemultimedia-kappfinder-data
+Section: kde
+Architecture: any
+Depends: kappfinder
+Description: multimedia data for kappfinder
+ This package provides data on multimedia applications for kappfinder.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kdemultimedia-kio-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: lame
+Conflicts: kdebase-audiolibs (<< 4:3.0.0)
+Replaces: kdebase-audiolibs (<< 4:3.0.0)
+Description: enables the browsing of audio CDs under Konqueror
+ This package allow audio CDs to be browsed like a file system using
+ Konqueror and the audiocd:/ URL.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kmid
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: MIDI/karaoke player for KDE
+ This package provides a MIDI and karaoke player for KDE.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kmix
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Provides: x-audio-mixer
+Description: sound mixer applet for KDE
+ This package includes KDE's dockable sound mixer applet.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: krec
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: sound recorder utility for KDE
+ This is a sound recording utility for KDE.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: kscd
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: audio CD player for KDE
+ This is KDE's audio CD player.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: libarts1-akode
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: akode plugin for aRts
+ This package contains akode plugins for aRts.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information
+
+Package: libarts1-audiofile
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: audiofile plugin for aRts
+ This package contains audiofile plugins for aRts.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: libarts1-mpeglib
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libarts-mpeglib (<< 4:3.0.0)
+Replaces: libarts-mpeglib (<< 4:3.0.0)
+Description: mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
+ This package contains the mpeglib aRts plugin, supporting mp3 and mpeg
+ audio and video.
+ .
+ This is the arts (KDE Sound daemon) plugin.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: libarts1-xine
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: aRts plugin enabling xine support
+ This package contains aRts' xine plugin, allowing the use of the xine
+ multimedia engine though aRts.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: libkcddb1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: CDDB library for KDE
+ The KDE native CDDB (CD Data Base) library, providing easy access to Audio
+ CD meta-information (track titles, artist information, etc.) from on-line
+ databases, for KDE applications.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: mpeglib
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: libarts1-mpeglib (= ${Source-Version})
+Description: mp3 and mpeg I audio and video library
+ mpeglib is a mpeg I and mp3 audio and video library. It supports
+ mpeg I audio (layers I, II, III), mpeg I video, mpeg I system layer,
+ and wav playback.
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.
+
+Package: noatun
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter, noatun-plugins
+Description: media player for KDE
+ Noatun is an aRts-based audio and video player for KDE. It supports all
+ formats supported by your installation of aRts (including aRts plugins).
+ .
+ This package is part of KDE, as a component of the KDE multimedia module.
+ See the 'kde' and 'kdemultimedia' packages for more information.

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,508 @@
+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: Stephan Kulow <coolo at kde.org> and many others.
+
+License:
+
+All programs are either under the BSD, GPL or LGPL licenses. On Debian
+systems, the complete text of the BSD, GPL and LGPL licenses can be found
+in the /usr/share/common-licenses/BSD, /usr/share/common-licenses/GPL and
+/usr/share/common-licenses/LGPL files.
+
+
+aktion, arts/builder, arts/runtime, arts/tools,
+kfile-plugins, kmid, kmidi, koncd, kscd
+-----------------------------------------------
+GPL
+
+arts/gui, arts/midi, arts/modules,
+kmix, mpeglib, mpeglib_artsplug
+----------------------------------
+LGPL
+
+audiofile_artsplugin, kaboodle, noatun
+--------------------------------------
+various bsd derivative licenses - see below
+
+
+audiofile_artsplugin
+--------------------
+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).
+---
+
+kaboodle
+--------
+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
+------
+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 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.
+
+--------------------
+
+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/kdemultimedia/debian/icons/artsbuilder.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/artsbuilder.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/artsbuilder.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,155 @@
+/* XPM */
+static char *artsbuilder[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 133 2",
+"   c black",
+".  c gray2",
+"X  c #060606",
+"o  c #070707",
+"O  c #090909",
+"+  c gray4",
+"@  c #161616",
+"#  c #181818",
+"$  c gray11",
+"%  c gray12",
+"&  c gray13",
+"*  c #222222",
+"=  c #282828",
+"-  c gray19",
+";  c #323232",
+":  c gray20",
+">  c gray25",
+",  c gray26",
+"<  c #434343",
+"1  c #444444",
+"2  c #464646",
+"3  c gray28",
+"4  c #484848",
+"5  c #494949",
+"6  c gray29",
+"7  c gray31",
+"8  c #535353",
+"9  c gray33",
+"0  c #585858",
+"q  c #5A5A5A",
+"w  c gray36",
+"e  c #5F5F5F",
+"r  c #626262",
+"t  c #646464",
+"y  c #686868",
+"u  c #6A6A6A",
+"i  c gray42",
+"p  c #6C6C6C",
+"a  c #6D6D6D",
+"s  c #6F6F6F",
+"d  c #727272",
+"f  c #747474",
+"g  c gray46",
+"h  c #777777",
+"j  c gray48",
+"k  c #7B7B7B",
+"l  c #7C7C7C",
+"z  c gray49",
+"x  c #7E7E7E",
+"c  c #818181",
+"v  c #838383",
+"b  c #848484",
+"n  c gray53",
+"m  c gray54",
+"M  c #8B8B8B",
+"N  c gray55",
+"B  c #8D8D8D",
+"V  c #8E8E8E",
+"C  c gray56",
+"Z  c #909090",
+"A  c gray57",
+"S  c #929292",
+"D  c #939393",
+"F  c gray58",
+"G  c #959595",
+"H  c gray59",
+"J  c gray60",
+"K  c #9B9B9B",
+"L  c gray61",
+"P  c #9D9D9D",
+"I  c #A0A0A0",
+"U  c gray63",
+"Y  c #A2A2A2",
+"T  c gray64",
+"R  c gray65",
+"E  c #A7A7A7",
+"W  c #A9A9A9",
+"Q  c gray67",
+"!  c #ACACAC",
+"~  c gray68",
+"^  c #AFAFAF",
+"/  c gray69",
+"(  c #B2B2B2",
+")  c gray70",
+"_  c #B4B4B4",
+"`  c gray71",
+"'  c #B6B6B6",
+"]  c #B7B7B7",
+"[  c #B9B9B9",
+"{  c gray73",
+"}  c #BCBCBC",
+"|  c gray74",
+" . c gray",
+".. c gray75",
+"X. c #C1C1C1",
+"o. c gray77",
+"O. c #C5C5C5",
+"+. c gray78",
+"@. c #C8C8C8",
+"#. c gray79",
+"$. c #CACACA",
+"%. c #CBCBCB",
+"&. c gray80",
+"*. c #CDCDCD",
+"=. c #CECECE",
+"-. c gray81",
+";. c #D0D0D0",
+":. c #D2D2D2",
+">. c LightGray",
+",. c gray83",
+"<. c gray84",
+"1. c #D7D7D7",
+"2. c gray85",
+"3. c gray86",
+"4. c gainsboro",
+"5. c #DDDDDD",
+"6. c #DFDFDF",
+"7. c gray88",
+"8. c #E6E6E6",
+"9. c #E7E7E7",
+"0. c gray91",
+"q. c #E9E9E9",
+"w. c gray92",
+"e. c #ECECEC",
+"r. c #EFEFEF",
+"t. c gray94",
+"y. c #F3F3F3",
+"u. c gray96",
+"i. c gray98",
+"p. c #FDFDFD",
+"a. c #FEFEFE",
+"s. c gray100",
+"d. c None",
+/* pixels */
+"d.d.d.  6 h V K K M q @ d.d.d.d.",
+"d.d.$ c o.E V k l V ( ..8   d.d.",
+"d.o V +.c i i i a i i Z >.a   d.",
+"  d 1.c l c l k l c c k Z 2.3 d.",
+"$ %.W V Z Z ( -.%.E Z D M ..~ + ",
+"q >.E P P %.u.i.y.6.{ P P ~ 1.- ",
+"k >.( ( { 2.6.5.2.%.+.( ( { >.5 ",
+"d -.%.o...) ) { ( ~ W ..o.%.-.< ",
+"3 ..5.2.-.J D D D V P 1.1.2.( = ",
+"@ V 1.w.9.>.Z l l J 2.0.w.-.k o ",
+"  5 K 5.s.s.w.2.5.u.s.i.1.Z -   ",
+"d.o 8 V +.w.s.s.s.s.9.{ n 3   d.",
+"d.d.o : a l D E K V d a -   d.d.",
+"d.d.d.+ q r r t d M ) h   d.d.d.",
+"d.d.d.d.$ w c ) 9.9.J @ d.d.d.d.",
+"d.d.d.d.d.o & < 3 &   d.d.d.d.d."
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/artscontrol.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/artscontrol.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/artscontrol.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,183 @@
+/* XPM */
+static char *artscontrol[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 161 2",
+"   c black",
+".  c gray2",
+"X  c #070707",
+"o  c #090909",
+"O  c gray5",
+"+  c gray6",
+"@  c #1A0B03",
+"#  c #1A0F00",
+"$  c #1D1207",
+"%  c #121217",
+"&  c #191919",
+"*  c gray12",
+"=  c #211607",
+"-  c gray17",
+";  c #2F2F3A",
+":  c gray20",
+">  c #343442",
+",  c #4A2F0D",
+"<  c #573605",
+"1  c #52310C",
+"2  c #74450E",
+"3  c #494946",
+"4  c gray30",
+"5  c gray31",
+"6  c #4B4B56",
+"7  c #565656",
+"8  c gray34",
+"9  c gray35",
+"0  c #5B5B5B",
+"q  c gray38",
+"w  c #626262",
+"e  c #646464",
+"r  c #60606B",
+"t  c #6C666D",
+"y  c #6A6A6A",
+"u  c gray42",
+"i  c #6F6F6F",
+"p  c #727272",
+"a  c gray45",
+"s  c #747474",
+"d  c gray46",
+"f  c #777777",
+"g  c gray47",
+"h  c #797979",
+"j  c #7C7C7C",
+"k  c gray50",
+"l  c #7F7F80",
+"z  c #7E7E8A",
+"x  c #89847E",
+"c  c #C78017",
+"v  c #CE951C",
+"b  c #C2962C",
+"n  c #CA9B25",
+"m  c #FD9D13",
+"M  c #FAA40E",
+"N  c #FFA111",
+"B  c #FFA810",
+"V  c #FDAC11",
+"C  c #FFAD14",
+"Z  c #FFB919",
+"A  c #DDAE49",
+"S  c #E1B343",
+"D  c #E9BA57",
+"F  c #EEBD5C",
+"G  c #FFC125",
+"H  c #FFC625",
+"J  c #FFCC28",
+"K  c #808080",
+"L  c #8E8985",
+"P  c gray54",
+"I  c #8B8B8A",
+"U  c #8B8B8B",
+"Y  c #8A8A8D",
+"T  c gray55",
+"R  c #8D8D8D",
+"E  c #8E8E8E",
+"W  c gray56",
+"Q  c #898992",
+"!  c #8C8E93",
+"~  c #909090",
+"^  c #929291",
+"/  c #929292",
+"(  c #939393",
+")  c #9B9B9B",
+"_  c #9B9B9C",
+"`  c gray62",
+"'  c #9F9F9F",
+"]  c #9393A4",
+"[  c #A39D95",
+"{  c #A1A1A0",
+"}  c gray63",
+"|  c gray64",
+" . c #A4A4A4",
+".. c #A5A5A5",
+"X. c #A5A5A7",
+"o. c gray65",
+"O. c #A7A7A7",
+"+. c gray66",
+"@. c #AAAAAA",
+"#. c gray68",
+"$. c #AEAEAE",
+"%. c #AEAEB3",
+"&. c #AEAEB4",
+"*. c gray69",
+"=. c #B5B5B7",
+"-. c #B6B6B6",
+";. c #B7B7B7",
+":. c #B4B4BC",
+">. c gray72",
+",. c #BBBBBB",
+"<. c #B9BABC",
+"1. c gray74",
+"2. c gray",
+"3. c gray75",
+"4. c #C0C0BF",
+"5. c #C1C1C1",
+"6. c gray77",
+"7. c #C5C5C5",
+"8. c #C6C6C6",
+"9. c #C6C6C7",
+"0. c #C8C5CA",
+"q. c #CAC6C8",
+"w. c #CCCCCB",
+"e. c gray80",
+"r. c #CECECE",
+"t. c gray81",
+"y. c #C5C5D0",
+"u. c #CFCFD3",
+"i. c #CED0DE",
+"p. c #D0D0D0",
+"a. c gray82",
+"s. c LightGray",
+"d. c gray84",
+"f. c #D2D2DE",
+"g. c #D8D8D8",
+"h. c #D1D3E2",
+"j. c #D5D5E1",
+"k. c #D7D9E2",
+"l. c #DADAE2",
+"z. c #DBDBE2",
+"x. c #DCDCE1",
+"c. c #DFE0E2",
+"v. c #E2E2E2",
+"b. c #E4E4E4",
+"n. c #E6E6EA",
+"m. c #E6E6EB",
+"M. c #E7E7EB",
+"N. c gray91",
+"B. c #E9E9ED",
+"V. c #EAEAEF",
+"C. c #FBF6EB",
+"Z. c gray94",
+"A. c #F1F1F1",
+"S. c #F1F1F9",
+"D. c #F6F6F8",
+"F. c #F9F9F9",
+"G. c #F8F8FA",
+"H. c #F9F9FB",
+"J. c gray99",
+"K. c gray100",
+"L. c None",
+/* pixels */
+"L.L.L.L.: q ~ | #.#.o.f * L.L.L.",
+"L.L.L.O R >.W p y u f ` 1.8   L.",
+"L.L.  E 6.j d f d d f d R t.8   ",
+"L.L.4 s.W R W X.1.>.) E P o.9.& ",
+"L.  ~ 9._ { 4.A.H.A.g.$.{ | s.8 ",
+"L.X &.B.u.=.w.g.d.t.6.1.=.=.s.i ",
+"L.  Y M.K.x.X.X.o.o.' *.w.t.s.0 ",
+"r   3 :.H.H.%.P k x ~ t.b.v.*.- ",
+"y.Q 6 z.G.m.g.c.1.9.N.J.Z.1.w   ",
+"z S.z.B.M.i.0.C.K.K.G.g. .e O L.",
+"% ] j.h.i.0.A S [ ! k j 5 o L.L.",
+"L.X ; > t D M V b L <. at .& L.L.L.",
+"L.L.L.L.$ v J G Z F x &   L.L.L.",
+"L.L.L.L.L.= n H N B < L.L.L.L.L.",
+"L.L.L.L.L.L.$ c C m , L.L.L.L.L.",
+"L.L.L.L.L.L.L.@ 2 1   L.L.L.L.L."
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/juk-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/juk-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/juk-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,144 @@
+/* XPM */
+static char *juk-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 122 2",
+"   c black",
+".  c #000100",
+"X  c #010102",
+"o  c #020202",
+"O  c #030404",
+"+  c #040405",
+"@  c #040406",
+"#  c #00140B",
+"$  c #00180E",
+"%  c #101015",
+"&  c #121216",
+"*  c #131317",
+"=  c #131318",
+"-  c #1A1A1F",
+";  c #002410",
+":  c #0C2E1B",
+">  c #00300A",
+",  c #03310C",
+"<  c #00370F",
+"1  c #02331F",
+"2  c #013A29",
+"3  c #23232A",
+"4  c #29292F",
+"5  c #292931",
+"6  c #2B2B34",
+"7  c #2B2B35",
+"8  c #313D40",
+"9  c #393943",
+"0  c #393949",
+"q  c #3F384A",
+"w  c #3E3E48",
+"e  c #004108",
+"r  c #004906",
+"t  c #024F11",
+"y  c #04550F",
+"u  c #075312",
+"i  c #045319",
+"p  c #006E08",
+"a  c #08661F",
+"s  c #037A12",
+"d  c #156523",
+"f  c #247939",
+"g  c #44444F",
+"h  c #4F4F5E",
+"j  c #555561",
+"k  c #545462",
+"l  c #545469",
+"z  c #575768",
+"x  c #5B5B6A",
+"c  c #5F5F6C",
+"v  c #5D5D71",
+"b  c #476956",
+"n  c #58776B",
+"m  c #63636D",
+"M  c #616171",
+"N  c #626276",
+"B  c #636377",
+"V  c #666673",
+"C  c #666677",
+"Z  c #676779",
+"A  c #757585",
+"S  c #79798A",
+"D  c #79798B",
+"F  c #18832F",
+"G  c #1A842B",
+"H  c #1C9B2D",
+"J  c #00A601",
+"K  c #00A60D",
+"L  c #01A118",
+"P  c #00AF12",
+"I  c #00AF18",
+"U  c #09AC17",
+"Y  c #258E39",
+"T  c #308D3B",
+"R  c #30B539",
+"E  c #308A40",
+"W  c #3EA247",
+"Q  c #00E406",
+"!  c #19E721",
+"~  c #38F33B",
+"^  c #4D8D5A",
+"/  c #4AA75B",
+"(  c #4DA65D",
+")  c #58A665",
+"_  c #698B7B",
+"`  c #79A886",
+"'  c #807A99",
+"]  c #8D8E9D",
+"[  c #8E88A3",
+"{  c #9595AA",
+"}  c #9C9CAE",
+"|  c #9E9EB1",
+" . c #A1A0B3",
+".. c #A1A1B4",
+"X. c #A6A6BC",
+"o. c #AAAABB",
+"O. c #ADADC2",
+"+. c #B1B1C5",
+"@. c #B4B4C7",
+"#. c #B5B5C6",
+"$. c #B7B5C6",
+"%. c #B5B5C8",
+"&. c #BABACC",
+"*. c #85EE8C",
+"=. c #C3C4CA",
+"-. c #C2C2D2",
+";. c #C4C4D1",
+":. c #C4C4D4",
+">. c #CEC4D8",
+",. c #CAC9DA",
+"<. c #D1C9DC",
+"1. c #D2C8DE",
+"2. c #D1CEDF",
+"3. c #E2D7EE",
+"4. c #E0DFED",
+"5. c #E7E3E7",
+"6. c #E8E6F4",
+"7. c #F2EEF2",
+"8. c #F5ECF9",
+"9. c #FCFBFF",
+"0. c gray100",
+"q. c None",
+/* pixels */
+"q.q.q.q.q.q.q.q.q.q.q.q.q.q.q.q.",
+"q.q.q.2 ;     q.q.q.q.q.q.q.q.q.",
+"q.q.q.1 ( :     q.q.q.z Z h     ",
+"q.q.q.# / *.f $   q.N c 4 m w   ",
+"q.q.q.  a d T G     D     5 V   ",
+"q.q.q.q.i u   t , q D - 3   A   ",
+"q.q.q.q.< s O 8 _ $.o.| 7 N j   ",
+"q.q.q.e > p b 1.2.%...} v j +   ",
+"q.q.u W R J ) 3.-.+.X.{ 7       ",
+"q.r U ~ ! Q H >.:.%.O.Z *       ",
+"q.n L P I K T 1.,.&.x         q.",
+"q.D ` Y F ^ =.4.#.9 +       q.q.",
+"q.= [ 7.5.8.6.] =           q.q.",
+"q.  0 ..0.-.g           q.q.q.q.",
+"q.q.  z M *           q.q.q.q.q.",
+"q.q.q.              q.q.q.q.q.q."
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/juk.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/juk.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/juk.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,256 @@
+/* XPM */
+static char *juk[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 218 2",
+"   c #000000",
+".  c #060508",
+"X  c #000A04",
+"o  c #000E0A",
+"O  c #0A0A0C",
+"+  c #0D0D11",
+"@  c #00140A",
+"#  c #001A0B",
+"$  c #001210",
+"%  c #111115",
+"&  c #18181D",
+"*  c #1C1C22",
+"=  c #002108",
+"-  c #002315",
+";  c #00231F",
+":  c #00320B",
+">  c #003808",
+",  c #003216",
+"<  c #023A14",
+"1  c #003B1D",
+"2  c #002523",
+"3  c #002F27",
+"4  c #002B29",
+"5  c #003323",
+"6  c #003128",
+"7  c #003C21",
+"8  c #003A2A",
+"9  c #003431",
+"0  c #003A31",
+"q  c #25252C",
+"w  c #292932",
+"e  c #302B38",
+"r  c #32323C",
+"t  c #353541",
+"y  c #393342",
+"u  c #393943",
+"i  c #3E3E4B",
+"p  c #00410B",
+"a  c #004B0E",
+"s  c #004414",
+"d  c #00421B",
+"f  c #004B12",
+"g  c #024C1C",
+"h  c #005607",
+"j  c #00540D",
+"k  c #005B0D",
+"l  c #005312",
+"z  c #01511F",
+"x  c #005911",
+"c  c #004323",
+"v  c #00422A",
+"b  c #004A21",
+"n  c #005121",
+"m  c #0B5322",
+"M  c #085A21",
+"N  c #144F2C",
+"B  c #006D0D",
+"V  c #006C13",
+"C  c #026A19",
+"Z  c #057214",
+"A  c #06761A",
+"S  c #007C16",
+"D  c #09711E",
+"F  c #0E7D1A",
+"G  c #0F6825",
+"H  c #0F6D2B",
+"J  c #0E7629",
+"K  c #157526",
+"L  c #247C2E",
+"P  c #347E3B",
+"I  c #237D40",
+"U  c #356746",
+"Y  c #41404C",
+"T  c #444354",
+"R  c #4B465A",
+"E  c #494957",
+"W  c #4B4B5B",
+"Q  c #4D5460",
+"!  c #545464",
+"~  c #565669",
+"^  c #5B5B64",
+"/  c #59596A",
+"(  c #5D5D70",
+")  c #457852",
+"_  c #507A55",
+"`  c #64646E",
+"'  c #616174",
+"]  c #65647B",
+"[  c #6A6A7B",
+"{  c #71717D",
+"}  c #6B6B82",
+"|  c #747483",
+" . c #72728C",
+".. c #7A7A86",
+"X. c #7B7B8C",
+"o. c #757693",
+"O. c #7A7A95",
+"+. c #7D7C99",
+"@. c #00820C",
+"#. c #008312",
+"$. c #00871A",
+"%. c #028819",
+"&. c #0D881E",
+"*. c #0A931F",
+"=. c #048123",
+"-. c #0E8325",
+";. c #009226",
+":. c #00952A",
+">. c #148B27",
+",. c #14952B",
+"<. c #00A109",
+"1. c #00A612",
+"2. c #00A618",
+"3. c #00BF08",
+"4. c #00AA25",
+"5. c #00AC2A",
+"6. c #0DA621",
+"7. c #11AD29",
+"8. c #19BB2A",
+"9. c #31823A",
+"0. c #22A237",
+"q. c #29BE3B",
+"w. c #3FA256",
+"e. c #35B445",
+"r. c #3EB04D",
+"t. c #02C513",
+"y. c #00C11E",
+"u. c #0AC51C",
+"i. c #00D50E",
+"p. c #02DB0D",
+"a. c #00D413",
+"s. c #00DA16",
+"d. c #05DF18",
+"f. c #0BDB14",
+"g. c #03E50F",
+"h. c #02EC0C",
+"j. c #26CF36",
+"k. c #22DC2F",
+"l. c #26E629",
+"z. c #5A805E",
+"x. c #44B956",
+"c. c #4CB25E",
+"v. c #48BE56",
+"b. c #618B63",
+"n. c #6B9D6B",
+"m. c #4BCA57",
+"M. c #53CD5F",
+"N. c #47EB45",
+"B. c #42E94D",
+"V. c #5BF65D",
+"C. c #5CE763",
+"Z. c #77DE7F",
+"A. c #61EE5F",
+"S. c #6EF76A",
+"D. c #74E97A",
+"F. c #867FA3",
+"G. c #818193",
+"H. c #81819E",
+"J. c #8B8B9B",
+"K. c #889B91",
+"L. c #8686A0",
+"P. c #8D85AB",
+"I. c #8C8CA1",
+"U. c #9393A5",
+"Y. c #9494AA",
+"T. c #959CA5",
+"R. c #9999A7",
+"E. c #9A9AAD",
+"W. c #9B96B3",
+"Q. c #9C9CB2",
+"!. c #91A69B",
+"~. c #9DA5A5",
+"^. c #9CA5A9",
+"/. c #9EBEA1",
+"(. c #A6A9AE",
+"). c #A2A2B4",
+"_. c #A4A4BA",
+"`. c #ABA9B7",
+"'. c #ABABBD",
+"]. c #ABB2AF",
+"[. c #B2B2BF",
+"{. c #ADADC0",
+"}. c #B3AEC6",
+"|. c #B1B1C4",
+" X c #B6B6C8",
+".X c #BBBAC7",
+"XX c #BABACA",
+"oX c #80FF83",
+"OX c #9BF79F",
+"+X c #9AFB9B",
+"@X c #9FF5A2",
+"#X c #A1FFA0",
+"$X c #AEFFAD",
+"%X c #C2C1CE",
+"&X c #C3C3D3",
+"*X c #CCC7D4",
+"=X c #C9C9D6",
+"-X c #CDCDDA",
+";X c #D2CDDC",
+":X c #D2D2DD",
+">X c #D5D4E1",
+",X c #DAD7E5",
+"<X c #DADAE4",
+"1X c #DDDCE8",
+"2X c #CDFFCA",
+"3X c #D7E4D4",
+"4X c #DCFFD8",
+"5X c #E1DBE9",
+"6X c #E3E2EB",
+"7X c #E9E4EB",
+"8X c #E8E8EF",
+"9X c #EBE6F3",
+"0X c #ECECF2",
+"qX c #F0EAF6",
+"wX c #F2F1F5",
+"eX c #F5F5F9",
+"rX c #FEFEFE",
+"tX c None",
+/* pixels */
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtX0 4 tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXv =.$ tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtX3 x.w.@ tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtX3 I 2Xc.1 3 tXtXtXtXtXtXtXtXtXtX/ | J.J.[ ! tXtXtXtX",
+"tXtXtXtXtXtXtXn @X4XZ.G 5 tXtXtXtXtXtXtXtX' Y.J.` | '.U.W tXtXtX",
+"tXtXtXtXtXtXtX7 m.D.$X#Xx.b 5 tXtXtXtXtX( Q.{ .     * `.X.  tXtX",
+"tXtXtXtXtXtXtX5 0.,.G x.oXC.M   tXtXtXtXF.R.X tXtXtXtXW XXw tXtX",
+"tXtXtXtXtXtXtX1 J j.X X s e.B.g   tXtX] E.^ tXtXtXtXtX' ).` tXtX",
+"tXtXtXtXtXtXtXtXg j.< tX  X -.7.@ tXtX} '.Y tXtXtXtXtXtXU...tXtX",
+"tXtXtXtXtXtXtXtXd 8.J   tXtXd S m R ! / ^.[ ~ / / tXtX[ E.[ tXtX",
+"tXtXtXtXtXtXtXtXd *.6.X tXtXQ N m `..X[.XXXX|.J.i tXtX .{.u tXtX",
+"tXtXtXtXtXtXtXtXtXC u.= tX/ ] T.!.-X-X*X'.'.%XJ.u tX .W.J.. tXtX",
+"tXtXtXtXtXtXtXtXtXl t.l R X.&X0X>XXX X|.).J.=XG.[ L.Q.E.* tXtXtX",
+"tXtXtXtXtXtXj a a s 1.#.O.5X8X;X=X%XXX|.|.XX&XG.} G./ % tXtXtXtX",
+"tXtXtXtXa h A >.%.V #.<.K.9X:X-X=XXXXX|._.Q.{.O.i     tXtXtXtXtX",
+"tXtXtXj Z M.OX+XV.h.i.3.) 1X:X-X&X&XXX|.'.).{.X.( tXtXtXtXtXtXtX",
+"tXtXj B k.S.A.N.l.g.h.p.K &X<X-X=X&XXX}.'.'.'.} ( tXtXtXtXtXtXtX",
+"tXtXh 2.d.f.p.p.a.a.a.s.#.~.1X-X=XXXXX|. X'.[ u tXtXtXtXtXtXtXtX",
+"tXF.U 2.y.y.y.y.3.5.y.y.Z (.<X-X=XXXXX&X)./ & tXtXtXtXtXtXtXtXtX",
+"tX+.^.&.4.5.5.5.5.5.5.%._ ;X:X-X&X=X&XY./ % tXtXtXtXtXtXtXtXtXtX",
+"tXO.W./.F %.;.:.;.%.Z z.*X<X:X-X>XXXO.W E tXtXtXtXtXtXtXtXtXtXtX",
+"tXtXo.}.3Xn.9.L 9.b.].6X6X>X<X<X{.} t tXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtX+.o.=XrXqX7X7XqX0X6X<X6X-XU.W + tXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtX+.O.<XrXeXwX0X6X0X6X X} w tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXo.J.0XeX0X0X0X-XL.T + tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXo.Y.eXrX6XQ.( * tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXo.Q.|.} w   tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtX+.+.r .   tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX"
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaboodle-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaboodle-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaboodle-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,180 @@
+/* XPM */
+static char *kaboodle-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 158 2",
+"   c black",
+".  c #010102",
+"X  c #010103",
+"o  c #020203",
+"O  c #040406",
+"+  c #06060B",
+"@  c #07080B",
+"#  c #09090F",
+"$  c #090910",
+"%  c #15151F",
+"&  c #141426",
+"*  c #17172A",
+"=  c #181827",
+"-  c #1E1F2D",
+";  c #1E1F2F",
+":  c #292944",
+">  c #2D2E53",
+",  c #2F2F54",
+"<  c #36365A",
+"1  c #383856",
+"2  c #3C3C54",
+"3  c #393963",
+"4  c #3C3E63",
+"5  c #3F3F66",
+"6  c #3E3F74",
+"7  c #3F406B",
+"8  c #4A4A5F",
+"9  c #46476E",
+"0  c #47476F",
+"q  c #494A7F",
+"w  c #4E5071",
+"e  c #52526C",
+"r  c #4F4F8C",
+"t  c #52548D",
+"y  c #5B5B84",
+"u  c #585994",
+"i  c #5E5E91",
+"p  c #626286",
+"a  c #63648B",
+"s  c #6F6F8B",
+"d  c #606094",
+"f  c #737499",
+"g  c #74749C",
+"h  c #6769A0",
+"j  c #676AA3",
+"k  c #6769AA",
+"l  c #6868A7",
+"z  c #6B6CA1",
+"x  c #6C6FAB",
+"c  c #6F6FAB",
+"v  c #6D70AC",
+"b  c #7273A3",
+"n  c #7375A6",
+"m  c #7171AC",
+"M  c #7171AD",
+"N  c #7475A9",
+"B  c #7579AB",
+"V  c #7779A9",
+"C  c #7779AB",
+"Z  c #7377B7",
+"A  c #7477B6",
+"S  c #7579B4",
+"D  c #7579B7",
+"F  c #7579B9",
+"G  c #7779B8",
+"H  c #787CB8",
+"J  c #7B7EBA",
+"K  c #7C7DB8",
+"L  c #8384BB",
+"P  c #8E8EB4",
+"I  c #8C8DBD",
+"U  c #8185C3",
+"Y  c #878BC4",
+"T  c #858AC9",
+"R  c #868ACB",
+"E  c #8A90CF",
+"W  c #8C91CF",
+"Q  c #9697C3",
+"!  c #9698C3",
+"~  c #9B9BC5",
+"^  c #9C9CCA",
+"/  c #9C9ECA",
+"(  c #9C9FCA",
+")  c #9D9ECC",
+"_  c #9299D6",
+"`  c #959BD7",
+"'  c #9CA2D7",
+"]  c #9DA2D8",
+"[  c #A4A4C4",
+"{  c #A0A2C9",
+"}  c #A1A1CD",
+"|  c #A2A3CD",
+" . c #A5A7CE",
+".. c #A6A6CF",
+"X. c #A1A3D1",
+"o. c #A7AAD4",
+"O. c #A4A8D8",
+"+. c #A4A9DB",
+"@. c #A9AAD1",
+"#. c #ACAED5",
+"$. c #AFB0D5",
+"%. c #B5B5D6",
+"&. c #B2B4DC",
+"*. c #B3B6DD",
+"=. c #B8B9DB",
+"-. c #B9BBDE",
+";. c #BEBEDB",
+":. c #A7AFE7",
+">. c #A9B0E4",
+",. c #ACB2E4",
+"<. c #AFB4E3",
+"1. c #AFB6E7",
+"2. c #B2B8E6",
+"3. c #B5B9E2",
+"4. c #B0B8EE",
+"5. c #B3BBEE",
+"6. c #B8BDE7",
+"7. c #B3BCF2",
+"8. c #B7C0F5",
+"9. c #B9C3F5",
+"0. c #B8C2F6",
+"q. c #B9C3F7",
+"w. c #BEC8FB",
+"e. c #C0C0DC",
+"r. c #C1C2DD",
+"t. c #C1C2DF",
+"y. c #C3C3DC",
+"u. c #C7C7E3",
+"i. c #C0C5EA",
+"p. c #C3C7E9",
+"a. c #C0C5ED",
+"s. c #C9C9E1",
+"d. c #CBCCE8",
+"f. c #CBCEEC",
+"g. c #CCCFE9",
+"h. c #C4CBF6",
+"j. c #C2CBFB",
+"k. c #C1CCFD",
+"l. c #C3CEFF",
+"z. c #C7D1FF",
+"x. c #CAD2F9",
+"c. c #CCD5FF",
+"v. c #CDD6FF",
+"b. c #D2DAFF",
+"n. c #D2DBFF",
+"m. c #D7DEFF",
+"M. c #D8DFFE",
+"N. c #D8DFFF",
+"B. c #DFE3FC",
+"V. c #DDE4FF",
+"C. c #DFE5FF",
+"Z. c #E2E3F3",
+"A. c #E2E4F6",
+"S. c #E0E3F9",
+"D. c #E1E6FD",
+"F. c #E4E8FE",
+"G. c #EAEEFF",
+"H. c None",
+/* pixels */
+"H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.",
+"H.H.H.H.H.g ! #.;.t.$.! b 1 H.H.",
+"<.} ..} ^ ~ e.s.y.e.g.f.o.z = H.",
+"@.u.Z.d./ %.[ s 8 e g ( i.O.h < ",
+"=.A.G.C.*.P 2       O 0 C 2.] c ",
+"-.F.C.m.6.p   H.H.H.H.  4 Y 5.S ",
+"&.V.b.c.2.a   c d i 5   @ F 4.E ",
+"X.h.l.k.' w ; m {  .N : $ S 8.E ",
+"I O.q.>.V & 0 ^ S.C.3.u t _ 7.x ",
+"C L n y -   m p.V.m.x.D U :.D , ",
+"H.          K i.b.c.j.R Y l , + ",
+"H.H.        k ,.z.l.q.k 3 *     ",
+"H.H.H.H.H.  7 J q.w.` 6 o   H.H.",
+"H.H.H.      $ q Z F t &   H.H.H.",
+"H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.",
+"H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.H."
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaboodle.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaboodle.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaboodle.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,151 @@
+/* XPM */
+static char *kaboodle[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 113 2",
+"   c black",
+".  c #424297",
+"X  c #4B4B9D",
+"o  c #4F50A1",
+"O  c #5455A3",
+"+  c #5658A8",
+"@  c #5B5BA6",
+"#  c #5C5EAA",
+"$  c #5E61AD",
+"%  c #5F63B0",
+"&  c #6363AA",
+"*  c #6868AC",
+"=  c #6063B1",
+"-  c #6C6DB1",
+";  c #6A6DB9",
+":  c #6C71B7",
+">  c #6F74BE",
+",  c #7373B3",
+"<  c #7075BE",
+"1  c #777ABE",
+"2  c #7A7AB6",
+"3  c #7C7EBB",
+"4  c #6C79C3",
+"5  c #6E7FC9",
+"6  c #737DC1",
+"7  c #68BE79",
+"8  c #7E80BD",
+"9  c #7282CB",
+"0  c #7980C1",
+"q  c #7A86C8",
+"w  c #7589D2",
+"e  c #7D8CD0",
+"r  c #FE8235",
+"t  c #E99570",
+"y  c #FEDC66",
+"u  c #8282BC",
+"i  c #8487C3",
+"p  c #878AC7",
+"a  c #8188CD",
+"s  c #8A8BC1",
+"d  c #888DCE",
+"f  c #8C91CC",
+"g  c #8295D9",
+"h  c #8A9CDD",
+"j  c #9595C5",
+"k  c #9193C8",
+"l  c #9698CD",
+"z  c #9C9DCB",
+"x  c #959EDE",
+"c  c #989CD3",
+"v  c #989ED8",
+"b  c #989CFE",
+"n  c #9FA0CE",
+"m  c #9EA1D3",
+"M  c #9BA1DC",
+"N  c #9CABE6",
+"B  c #A3A3CD",
+"V  c #A8A8CF",
+"C  c #A3A4D1",
+"Z  c #A5AAD6",
+"A  c #A6ABDE",
+"S  c #AAABD3",
+"D  c #ABADD9",
+"F  c #AFB0D5",
+"G  c #ADB1DD",
+"H  c #B2B2D5",
+"J  c #B4B5D9",
+"K  c #BCBCDB",
+"L  c #A8A8FE",
+"P  c #A6B4FE",
+"I  c #AAB3FB",
+"U  c #B4BBEB",
+"Y  c #B2BCF2",
+"T  c #B3BFF8",
+"R  c #95C8B4",
+"E  c #A5D3BA",
+"W  c #A5D0C3",
+"Q  c #BDC1E7",
+"!  c #BEC3EA",
+"~  c #B7C3FA",
+"^  c #BCC3F0",
+"/  c #BBC7FE",
+"(  c #BDC8FD",
+")  c #DEBCA8",
+"_  c #CBBFDB",
+"`  c #E0CE94",
+"'  c #E7DBB6",
+"]  c #C0C0DC",
+"[  c #C3C6E7",
+"{  c #C5C4E9",
+"}  c #C6CBEC",
+"|  c #C8CCEA",
+" . c #C1CCFD",
+".. c #CED1ED",
+"X. c #C6D0FE",
+"o. c #CAD3FD",
+"O. c #CFD8FE",
+"+. c #D2D4EC",
+"@. c #D1D6F5",
+"#. c #D3DBFD",
+"$. c #D8DEFD",
+"%. c #DCE2FE",
+"&. c #E2E2EF",
+"*. c #E2E4F5",
+"=. c #E1E6FE",
+"-. c #E4E8FE",
+";. c #E8E8F2",
+":. c #E9ECFC",
+">. c #EDF0FE",
+",. c #F3F5FD",
+"<. c #F6F8FE",
+"1. c #FEFEFE",
+"2. c None",
+/* pixels */
+"2.2.2.2.2.2.2.2.2.2.2.2.2.2.w w w w w w w w w 2.2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.2.w w w 2.2.2.2.2.w w w 2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.2.2.2.2.2.w w w 2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.w 2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.S e 2.2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.B Z j 2.2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.z j D z s 2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.",
+"2.2.2.2.2.2.2.2.B z n k f ( m u 2.2.2.2.2.2.2.2.2.2.2.w 2.2.2.2.",
+"2.2.2.2.2.2.V B S { O.Y v o.#.j 2.2.2.2.2.2.2.2.2.2.2.w 2.2.2.2.",
+"2.2.2.2.S S H } $.#.#.O.#.:.<.z 2.2.2.2.2.2.2.2.2.2.2.w 2.2.2.2.",
+"2.2.2.H J +.=.%.$.$.$.=.>.:.*.u 2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.",
+"2.2.2.K :.-.=.=.%.%.=.=.#.$.$.u 2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.",
+"2.2.2.] 1.:.=.$.%.#.o.o.o.#...u 2.2.2.2.2.2.2.2.w w w 2.2.2.2.2.",
+"2.2.2.K <.<.#.o./ (  .O.;.+.U z 2.2.2.2.2.2.2.w w w 2.2.2.2.2.2.",
+"2.2.2.J ,.,.P I L  .o.{ J B n z 2.2.2.2.2.w w w w 2.2.2.2.2.2.2.",
+"2.2.2.J >.%.I { b R W J u * H z 2.2.2.w w w w 2.2.2.2.2.2.2.2.2.",
+"2.2.2.H :.%.t r o.7 E -.| *.&., 2.2.w w w 2.2.2.2.2.2.2.2.2.2.2.",
+"2.2.2.S -.#.] ) y ' #. .>.<.1.& 2.u q 8 2 , , * 2.2.2.2.2.2.2.2.",
+"2.2.2.S =.O. .+.` } / / -.1.<.u u s K ,.<.:.J , * 2.2.2.2.2.2.2.",
+"2.2.2.C %.O.o.( / / / Z z z K u z ] u 2 , 8 S @.i # 2.2.2.2.2.2.",
+"2.2.2.C $.#. .( / o.[ F <.-.C u j 8 2 2.2.2.* , ! p # w 2.2.2.2.",
+"2.2.2.z #.#.#.( =.=.z *.:.-. at .u 0 w 2.2.w w w 9 & U ; 4 2.2.2.2.",
+"2.2.2.l O.#.-. at . .#.m -.%.#.#.s 2.w w w w w w 2.% 6 Y o 2.2.2.2.",
+"2.2.2.l O.#.N g h g c %.#.O.( p 2.w w w w w w w w + ( ; 2.2.2.2.",
+"2.2.2.s  .#.h  .A , i  .o.( ~ , w w 4 & , @ + 2.2.# / > 2.2.2.2.",
+"2.2.2.2 u ^ h a & & u c ( ( f 6 w : * +.:.D O 2.X a T O 2.2.2.2.",
+"2.2.2.2., , * w w w w 0 8 3 : w 2.& D -.%.#.: X $ T > . 2.2.2.2.",
+"2.2.2.2.2.2.2.2.w w w w w w 2.2.2.& U #.#.o.d + x = . 2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.w w 2.2.2.2.+ U o. .( a # . . 2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.w w w w w w $ M  ./ / ; . 2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.w w w w w 6 # T ( x . 2.2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.X o = . . 2.2.2.2.2.2.2.2.2."
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaudiocreator-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaudiocreator-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaudiocreator-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,209 @@
+/* XPM */
+static char *kaudiocreator-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 187 2",
+"   c black",
+".  c #08080C",
+"X  c #0E0F16",
+"o  c #170231",
+"O  c #1B1D2D",
+"+  c #24293B",
+"@  c #282C42",
+"#  c #2A2E43",
+"$  c #2F334F",
+"%  c #323950",
+"&  c #41476B",
+"*  c #444A72",
+"=  c #002399",
+"-  c #00239C",
+";  c #02249C",
+":  c #3F2692",
+">  c #283EB7",
+",  c #122AC6",
+"<  c #1F3BE1",
+"1  c #2838DF",
+"2  c #3A31DC",
+"3  c #3E48D7",
+"4  c #3547EE",
+"5  c #3648FF",
+"6  c #3652E4",
+"7  c #46249F",
+"8  c #4337EB",
+"9  c #555C88",
+"0  c #5B6594",
+"q  c #655DB2",
+"w  c #606898",
+"e  c #656B9C",
+"r  c #636BA0",
+"t  c #626FA3",
+"y  c #6772AA",
+"u  c #6E7EB8",
+"i  c #7179AD",
+"p  c #747EB7",
+"a  c #4651C9",
+"s  c #4650D8",
+"d  c #5E57DE",
+"f  c #485BE2",
+"g  c #4653F6",
+"h  c #4454F8",
+"j  c #4C60CE",
+"k  c #5262CB",
+"l  c #596ADC",
+"z  c #586DDF",
+"x  c #5469E0",
+"c  c #5C6AE1",
+"v  c #615CC6",
+"b  c #664EFF",
+"n  c #6277D6",
+"m  c #676AEB",
+"M  c #6669ED",
+"N  c #6D76EC",
+"B  c #6B75FE",
+"V  c #7478EA",
+"C  c #7C7DE9",
+"Z  c #7284BE",
+"A  c #7D85B2",
+"S  c #7A83BA",
+"D  c #7D89BD",
+"F  c #6A81DB",
+"G  c #7A86C5",
+"H  c #7C8DCD",
+"J  c #7C8ECE",
+"K  c #7480E2",
+"L  c #7783FE",
+"P  c #808ABC",
+"I  c #8E98CA",
+"U  c #8695DE",
+"Y  c #8598DE",
+"T  c #948EDD",
+"R  c #9A99D1",
+"E  c #859DEC",
+"W  c #8893E2",
+"Q  c #8A9CE1",
+"!  c #8D99F2",
+"~  c #8D98F6",
+"^  c #9499EE",
+"/  c #96A0D9",
+"(  c #9EA5D7",
+")  c #9DA7DF",
+"_  c #90A6EF",
+"`  c #98A5E1",
+"'  c #95A0F2",
+"]  c #93A9F4",
+"[  c #9EA7F3",
+"{  c #98A1FE",
+"}  c #A698D9",
+"|  c #A8ADDA",
+" . c #A6A8EF",
+".. c #AEAFE9",
+"X. c #A7B4E9",
+"o. c #ACB6E6",
+"O. c #AFB9E2",
+"+. c #AFBBE7",
+"@. c #A7B1F2",
+"#. c #A5B6F2",
+"$. c #A7B1FB",
+"%. c #BABEFE",
+"&. c #B3C1EC",
+"*. c #BBC7EB",
+"=. c #B8C5EE",
+"-. c #BEC7EE",
+";. c #BDC1F1",
+":. c #C2BEE8",
+">. c #C7C7EC",
+",. c #C4CAE4",
+"<. c #C1C9EB",
+"1. c #C5CFEE",
+"2. c #CDC7ED",
+"3. c #CCC7EE",
+"4. c #C8CDE6",
+"5. c #C4C4F0",
+"6. c #C4CFF8",
+"7. c #C6D0EF",
+"8. c #CDD3ED",
+"9. c #C3D1FA",
+"0. c #C2D3FE",
+"q. c #C5D1FA",
+"w. c #C6D8FF",
+"e. c #CAD2F0",
+"r. c #CBD5F7",
+"t. c #CBD3F8",
+"y. c #C8D4FD",
+"u. c #C8D6FF",
+"i. c #C8D8FF",
+"p. c #CDD8FD",
+"a. c #CCDAFF",
+"s. c #CCDDFF",
+"d. c #CEDEFF",
+"f. c #D0D1EE",
+"g. c #D2DDFF",
+"h. c #D2DEFE",
+"j. c #D2DEFF",
+"k. c #D4DFFF",
+"l. c #D9DBF3",
+"z. c #DADDF5",
+"x. c #DADDF6",
+"c. c #D7E4FF",
+"v. c #DDE4F4",
+"b. c #DEE4F6",
+"n. c #D9E5FF",
+"m. c #DAE4FF",
+"M. c #DAE5FF",
+"N. c #DBE5FF",
+"B. c #DDE1F8",
+"V. c #DCE4FB",
+"C. c #DFE8FF",
+"Z. c #E3E9FA",
+"A. c #E3ECFF",
+"S. c #E4EAFD",
+"D. c #E5EBFC",
+"F. c #E4EBFF",
+"G. c #E6EBFC",
+"H. c #E6EBFD",
+"J. c #E8EBF7",
+"K. c #EBEEF8",
+"L. c #E8EDFC",
+"P. c #E8EEFE",
+"I. c #E8EEFF",
+"U. c #E9EFFF",
+"Y. c #EDEFF8",
+"T. c #EAF0FF",
+"R. c #EDF0FB",
+"E. c #ECF1FF",
+"W. c #ECF2FF",
+"Q. c #EDF2FF",
+"!. c #EEF3FF",
+"~. c #F0F4FF",
+"^. c #F2F6FF",
+"/. c #F3F7FF",
+"(. c #F4F7FF",
+"). c #F5F8FF",
+"_. c #F6F8FF",
+"`. c #F6F9FF",
+"'. c #F7F9FF",
+"]. c #F7FAFF",
+"[. c #F8F9FF",
+"{. c #F8FAFE",
+"}. c #F8FAFF",
+"|. c #F8FBFF",
+" X c #F9FBFF",
+".X c #FAFAFF",
+"XX c None",
+/* pixels */
+"XXXX; a > Y ` ) R G y   XXXXXXXX",
+"XX- 2 b m U D.U.w.w.o.p & XXXXXX",
+"- = j 8 s g Y U.p.g.n.x.S # XXXX",
+"3 k q.<.K.c 6 U.c.n.Q.|.x.r   XX",
+"1 l V.1.|.W < Q.C.Q.|.|.(.| $   ",
+", g n K *.v.8.U.Z.|.|.(.x...q o ",
+"E z 4 5 f 7.S.O.,.K. at .' $.' L 7 ",
+"] 0.F x &.U.p.% A v.! N V C v 7 ",
+"_ g.U.(.(. XD.+.4.Y.^ %.V.g.e   ",
+"Z y.(.|. X XU.D.Y.|. .5.D.r.*   ",
+"XX#.(.(.|.Q.n.U.e.f.T 2.Q.( O   ",
+"XXJ q.(.^.c.d.=.[ %.~ 2.z.9     ",
+"XX  J r.n.d.w.-.m B d :.i .   XX",
+"XXXX  u X.q.i.D.>.} R w X   XXXX",
+"XXXXXX  + t D I P 0 #     XXXXXX",
+"XXXXXXXXXX              XXXXXXXX"
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaudiocreator.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaudiocreator.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kaudiocreator.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kaudiocreator[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #13151D",
+"X  c #1D033F",
+"o  c #1A1C28",
+"O  c #1E202B",
+"+  c #222535",
+"@  c #390D7C",
+"#  c #292D43",
+"$  c #2E334C",
+"%  c #303450",
+"&  c #353A58",
+"*  c #39415E",
+"=  c #3C4264",
+"-  c #404767",
+";  c #444B72",
+":  c #4A5476",
+">  c #4B527D",
+",  c #011DA9",
+"<  c #002D80",
+"1  c #002A8A",
+"2  c #002694",
+"3  c #00229C",
+"4  c #002D94",
+"5  c #0620A6",
+"6  c #0721BF",
+"7  c #0C28B3",
+"8  c #1622BD",
+"9  c #1E3DAD",
+"0  c #2537BB",
+"q  c #171FC3",
+"w  c #0923C5",
+"e  c #172ADF",
+"r  c #1C20DA",
+"t  c #1C33C9",
+"y  c #1A3BC7",
+"u  c #1B33D1",
+"i  c #1F31D8",
+"p  c #193CD1",
+"a  c #1D27E9",
+"s  c #1B34EC",
+"d  c #2D3DD2",
+"f  c #313CC5",
+"g  c #2429F4",
+"h  c #2139EF",
+"j  c #2335F5",
+"k  c #2136FF",
+"l  c #253BFD",
+"z  c #283CFB",
+"x  c #004B80",
+"c  c #2542BB",
+"v  c #3B5AB3",
+"b  c #2E45C6",
+"n  c #2948CC",
+"m  c #384ED0",
+"M  c #3951C5",
+"N  c #2F51FD",
+"B  c #3C4AFF",
+"V  c #3543FB",
+"C  c #3C57E0",
+"Z  c #5E2C9F",
+"A  c #4F31B6",
+"S  c #5031BA",
+"D  c #4033EF",
+"F  c #4E3DE9",
+"G  c #4A37FF",
+"H  c #493BFF",
+"J  c #5C3BFF",
+"K  c #553BF9",
+"L  c #4E5582",
+"P  c #515A85",
+"I  c #535A8A",
+"U  c #575E92",
+"Y  c #4355BD",
+"T  c #56628E",
+"R  c #576192",
+"E  c #596494",
+"W  c #5B6498",
+"Q  c #5D699A",
+"!  c #7750B2",
+"~  c #636DA5",
+"^  c #646DA8",
+"/  c #6570A7",
+"(  c #6773AB",
+")  c #6874AE",
+"_  c #6978AF",
+"`  c #6D79B4",
+"'  c #6F7DBA",
+"]  c #6A75B2",
+"[  c #7B6FBC",
+"{  c #707CB9",
+"}  c #4D4EDA",
+"|  c #4756C5",
+" . c #4B5FC3",
+".. c #4958CB",
+"X. c #554DC6",
+"o. c #5A4EDC",
+"O. c #5358DF",
+"+. c #5D55D1",
+"@. c #495BE1",
+"#. c #4453FF",
+"$. c #565BE4",
+"%. c #555DED",
+"&. c #5254FF",
+"*. c #535FFF",
+"=. c #4D63C6",
+"-. c #5366C7",
+";. c #556BC5",
+":. c #556DCC",
+">. c #596EC6",
+",. c #5E6DC8",
+"<. c #5967DA",
+"1. c #5E75C6",
+"2. c #5A70CB",
+"3. c #4E60E6",
+"4. c #5F60ED",
+"5. c #5867FE",
+"6. c #5B6CFE",
+"7. c #6851C2",
+"8. c #605FD6",
+"9. c #7A5EC0",
+"0. c #6541FF",
+"q. c #6155FF",
+"w. c #6E51FF",
+"e. c #6063DE",
+"r. c #646FD4",
+"t. c #6964D8",
+"y. c #6F68D4",
+"u. c #6378CD",
+"i. c #6C79CB",
+"p. c #6377D2",
+"a. c #6C66ED",
+"s. c #676DF7",
+"d. c #636DF8",
+"f. c #6371FE",
+"g. c #647DFE",
+"h. c #6A74FE",
+"j. c #6E7BFE",
+"k. c #796CFE",
+"l. c #7674E0",
+"z. c #737BE5",
+"x. c #7976E4",
+"c. c #7273FB",
+"v. c #757BFC",
+"b. c #7982BD",
+"n. c #6E88DC",
+"m. c #7584C3",
+"M. c #7081C9",
+"N. c #7B85C2",
+"B. c #7C8ACB",
+"V. c #7288D1",
+"C. c #7D8ED0",
+"Z. c #7E91D1",
+"A. c #6B82F7",
+"S. c #7785ED",
+"D. c #7482FE",
+"F. c #7888FE",
+"G. c #7A93E5",
+"H. c #8573BF",
+"J. c #8078DA",
+"K. c #8A7DD0",
+"L. c #8572FE",
+"P. c #8188C5",
+"I. c #878DCA",
+"U. c #8780D9",
+"Y. c #8590CD",
+"T. c #8A90CD",
+"R. c #8091D4",
+"E. c #8597DE",
+"W. c #8699DF",
+"Q. c #8C95D0",
+"!. c #9487CB",
+"~. c #9F86C3",
+"^. c #9D85CB",
+"/. c #939AC6",
+"(. c #9491DF",
+"). c #939ED8",
+"_. c #9F97D7",
+"`. c #9E93DD",
+"'. c #8684E3",
+"]. c #8690EA",
+"[. c #8499E3",
+"{. c #889CE3",
+"}. c #8192FE",
+"|. c #9E97E0",
+" X c #9A98E2",
+".X c #9299F5",
+"XX c #9A9FF6",
+"oX c #9BA4DB",
+"OX c #97A8DB",
+"+X c #8CA1E9",
+"@X c #93A2E4",
+"#X c #93A3ED",
+"$X c #91A6F0",
+"%X c #93A9F4",
+"&X c #96ACF8",
+"*X c #9CA4FE",
+"=X c #9BB0F7",
+"-X c #A094DC",
+";X c #A9A6DB",
+":X c #A8ACDF",
+">X c #A3ABE2",
+",X c #ABADE2",
+"<X c #A2ADFE",
+"1X c #A6B1E7",
+"2X c #ABB3E4",
+"3X c #ADB6E9",
+"4X c #AAB8E3",
+"5X c #ABBFEE",
+"6X c #A5B9FD",
+"7X c #ABB9F0",
+"8X c #AFBBFE",
+"9X c #B0BAEB",
+"0X c #B2BDE3",
+"qX c #B9BEF0",
+"wX c #AFC0FC",
+"eX c #B1C1EB",
+"rX c #BDC0E8",
+"tX c #BECAED",
+"yX c #B2C2FA",
+"uX c #B9C0FE",
+"iX c #BBC9F6",
+"pX c #BBCBFA",
+"aX c #BDD2FF",
+"sX c #C3C2EF",
+"dX c #C2CCEE",
+"fX c #C5C9F5",
+"gX c #C1CEFC",
+"hX c #C8CEF4",
+"jX c #CFD1EE",
+"kX c #C4D5FF",
+"lX c #C6D8FF",
+"zX c #CAD4FD",
+"xX c #CBDAFF",
+"cX c #D1D4E8",
+"vX c #D2D9EF",
+"bX c #D8DBEB",
+"nX c #D0D3F1",
+"mX c #D4DBF3",
+"MX c #D1DDFE",
+"NX c #DCDCF4",
+"BX c #D8DAFE",
+"VX c #D6E0F4",
+"CX c #D5E1FF",
+"ZX c #DCE1F5",
+"AX c #DBE4FD",
+"SX c #DEE8FF",
+"DX c #E2E6F5",
+"FX c #E2E6FF",
+"GX c #E5E9F6",
+"HX c #E4EBFE",
+"JX c #E9EBF5",
+"KX c #E9EEFD",
+"LX c #ECF1FE",
+"PX c #F2F5FE",
+"IX c #F6F8FE",
+"UX c #F9FAFE",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYX< 3 5 3 YXYXR.C.B.B.m.b.~     YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYX1 3 0 x...v W.W. at X1X3X3X1X@XY.m.` R     YXYXYXYXYXYXYXYX",
+"YXYXYX3 8 F w.L.z.=.u.mXKXKXKXKXkXzXzXfXoXm.^ =   YXYXYXYXYXYXYX",
+"YXYXYX3 q 0.J H q.c.S.>.ZXLXKXKXxXkXkXxXBXzXQ.) >     YXYXYXYXYX",
+"YXYXYXYX2 8 K G r g #.A.>.KXKXHXxXzXzXCXAXMXFX,X) ;     YXYXYXYX",
+"3 3 3 4 $X[.0 z M.i.a #.C 4XLXHXxXxXxXCXCXKXIXPX2X) &     YXYXYX",
+"7 e.| 9 %XnXNXY 0XUX,.j N :.LXKXCXxXAXAXSXIXIXIXKX;X~     YXYXYX",
+"w k.r.G.uXPXUXUXUXUXmXi z n PXHXCXCXSXSXPXIXIXIXIXFXN.L     YXYX",
+"6 &.<.G.LXKXLXPXUXUXIXn z p IXKXAXSXFXPXIXIXIXIXIXIXfX^ o   YXYX",
+", V s.=.SXtX1.ZXPXUXGXt h y IXKXSXHXKXUXUXUXUXUXIXIXKXI.;     YX",
+"3 e &. at .V.OX<. .VXLXKX;XOX4XPXKXFXKXUXUXUXUXUXIXIXPXIX3XU     YX",
+"* 7 z *.3.M .XXX>.VXLXUXUXLXJXZXZXDXIXUXUXIXIXIXjX,X(.J.J.7.X YX",
+"YXA.b j B 6.6.B D.-.dXLXLXLXJXmXZXJXJXUXNX#X].z..XuXBXuX<XD.@   ",
+"YX%XiX:.u s k k z m Z.KXKXVX{._ b.cXDXJX at X=X8X8X8X=Xj.d.d.f.S   ",
+"YX%XaXlX5Xy j t ;.eXSXSXKXwX:   > /.NXZX at XF.}.}.D.h.d.f.%.o.S   ",
+"YX&XaXlXiXc 1.yXSXLXPXLXLXwX:   E /.ZXSXrXf.$.+.y.U.K._.H.>     ",
+"YX%XlXxXSXKXPXPXPXUXPXPXKXVX+Xm.N.bXDXJXsXd.`.SXAXCXMXxXT.$     ",
+"YX+XaXLXPXPXPXPXUXUXUXUXLXKXZXvXJXJXJXUXNX$. XSXSXSXAXzXb.%     ",
+"YXZ.wXPXPXPXPXUXUXUXUXUXPXSXSXSXDXKXUXUXUX$. XKXSXSXAXzX^       ",
+"YX  &XLXPXPXUXPXPXUXUXUXKXHXKXLXIXUXUXUXUX}  XPXLXKXSX>XI       ",
+"YX  +XkXUXUXUXUXUXUXUXLXSXAXKXLXPXIXUXUXUX+.-XIXLXKXBXP.=     YX",
+"YXYXE =XLXLXPXUXPXUXPXSXSXCXLXLXtXC.:X;X!.t.-XUXIXPXqX~       YX",
+"YXYX  {.iXUXUXPXPXPXSXCXCXxXKXeXp.BXBXBXBXl.-XUXUXFXP.=       YX",
+"YXYXYXT +XxXPXPXUXHXCXCXlXlXHXp.*X*X*X*X}.g.`.IXIX).Q       YXYX",
+"YXYXYX  / #XAXIXLXCXCXCXaXxXKXi.s.h.f.6.6.%.^.LX,X^ o       YXYX",
+"YXYXYXYX  Q +XzXAXzXxXlXaXxXHXdXX.c.v.v.a.Z NX>X) #       YXYXYX",
+"YXYXYXYX    E {.5XAXCXaXaXxXHXHXnXH.9.! ~.sXT./ +         YXYXYX",
+"YXYXYXYXYX    $ m.#X9XzXxXxXSXHXKXSXFXhX).' I           YXYXYXYX",
+"YXYXYXYXYXYX      * _ Z. at X>X9X3X3XOXB.` P o           YXYXYXYXYX",
+"YXYXYXYXYXYXYXYX        $ ; W Q R = o             YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYX                            YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX                YXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmid-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmid-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmid-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,126 @@
+/* XPM */
+static char *kmid-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 104 2",
+"   c black",
+".  c #010101",
+"X  c #020202",
+"o  c gray1",
+"O  c #040404",
+"+  c gray2",
+"@  c gray4",
+"#  c #0C0C0C",
+"$  c #101010",
+"%  c #111111",
+"&  c gray7",
+"*  c #161616",
+"=  c gray9",
+"-  c gray10",
+";  c gray11",
+":  c #1D1D1D",
+">  c #1E1E1E",
+",  c gray12",
+"<  c #222222",
+"1  c #232323",
+"2  c gray14",
+"3  c #252525",
+"4  c gray15",
+"5  c #282828",
+"6  c #2A2A2A",
+"7  c gray17",
+"8  c #2D2D2D",
+"9  c gray18",
+"0  c #2F2F2F",
+"q  c gray19",
+"w  c gray20",
+"e  c #393939",
+"r  c #3A3A3A",
+"t  c gray24",
+"y  c #3F3F3F",
+"u  c gray25",
+"i  c gray26",
+"p  c #444444",
+"a  c #464646",
+"s  c #494949",
+"d  c gray29",
+"f  c #4B4B4B",
+"g  c #505050",
+"h  c #555555",
+"j  c #565656",
+"k  c gray34",
+"l  c #585858",
+"z  c gray35",
+"x  c #5B5B5B",
+"c  c #626262",
+"v  c gray39",
+"b  c gray40",
+"n  c #686868",
+"m  c #727272",
+"M  c gray45",
+"N  c gray46",
+"B  c #777777",
+"V  c gray48",
+"C  c #7B7B7B",
+"Z  c gray49",
+"A  c #7E7E7E",
+"S  c #808080",
+"D  c #838383",
+"F  c #868686",
+"G  c gray53",
+"H  c #898989",
+"J  c gray54",
+"K  c #8D8D8D",
+"L  c #8E8E8E",
+"P  c gray56",
+"I  c gray57",
+"U  c #929292",
+"Y  c #959595",
+"T  c gray59",
+"R  c #9A9A9A",
+"E  c #9B9B9B",
+"W  c gray61",
+"Q  c #9D9D9D",
+"!  c gray64",
+"~  c #A4A4A4",
+"^  c gray65",
+"/  c #A7A7A7",
+"(  c #AFAFAF",
+")  c #B2B2B2",
+"_  c gray70",
+"`  c gray71",
+"'  c gray73",
+"]  c gray74",
+"[  c gray",
+"{  c #C0C0C0",
+"}  c gray76",
+"|  c #CACACA",
+" . c gray81",
+".. c gray82",
+"X. c gray84",
+"o. c #D8D8D8",
+"O. c #E2E2E2",
+"+. c gray89",
+"@. c #E6E6E6",
+"#. c gray93",
+"$. c #F8F8F8",
+"%. c #F9F9F9",
+"&. c gray100",
+"*. c None",
+/* pixels */
+"            *.*.*.*.*.*.*.*.*.*.",
+"  : 1 3 f 1 *.*.*.*.*.*.*.*.*.*.",
+"  6 t i C : *.*.*.*.*.*.*.*.*.*.",
+"  6 t a C = *.*.*.*.*.*.*.*.*.*.",
+"  6 i f C @ *.*.*.*.            ",
+"  6 a f B   *.*.l + D l v l :   ",
+"  3 r n F 1 H P 3 n | U M -   *.",
+"  = U [ r ! &.Q f t C |     *.*.",
+"  F %.: a #.&.' C & v &.[ *.*.*.",
+"*.^ ..E E %.&.^ o.X.] &. at .: *.*.",
+"*.k &.] E &.&.Q O.&.` ` k   *.*.",
+"*.q ] ) D ( ] H U X.! 3   *.*.*.",
+"*.# 3 0 i [ +.U U &.P     *.*.*.",
+"*.& i t a | &./ B U k b :   *.*.",
+"*.@ 6 0 1 & q :   + r f r     *.",
+"*.          *.*.*.            *."
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmid.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmid.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmid.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,251 @@
+/* XPM */
+static char *kmid[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 213 2",
+"   c black",
+".  c #010101",
+"X  c #020202",
+"o  c gray1",
+"O  c #040404",
+"+  c gray2",
+"@  c #060606",
+"#  c #070707",
+"$  c gray3",
+"%  c gray4",
+"&  c #0B0B0B",
+"*  c #0C0C0C",
+"=  c gray5",
+"-  c #0E0E0E",
+";  c gray6",
+":  c #101010",
+">  c #111111",
+",  c gray7",
+"<  c gray8",
+"1  c #151515",
+"2  c #161616",
+"3  c gray9",
+"4  c #181818",
+"5  c #191919",
+"6  c gray10",
+"7  c #1B1B1B",
+"8  c gray11",
+"9  c #1D1D1D",
+"0  c #1E1E1E",
+"q  c gray12",
+"w  c #202020",
+"e  c gray13",
+"r  c #222222",
+"t  c #232323",
+"y  c gray14",
+"u  c #252525",
+"i  c gray15",
+"p  c #272727",
+"a  c #282828",
+"s  c gray16",
+"d  c #2A2A2A",
+"f  c gray17",
+"g  c #2C2C2C",
+"h  c #2D2D2D",
+"j  c gray18",
+"k  c #2F2F2F",
+"l  c gray19",
+"z  c #313131",
+"x  c #323232",
+"c  c gray20",
+"v  c #343434",
+"b  c #353535",
+"n  c gray21",
+"m  c #373737",
+"M  c gray22",
+"N  c #393939",
+"B  c #3A3A3A",
+"V  c gray23",
+"C  c #3C3C3C",
+"Z  c gray24",
+"A  c #3E3E3E",
+"S  c #3F3F3F",
+"D  c gray25",
+"F  c #414141",
+"G  c gray26",
+"H  c #434343",
+"J  c #444444",
+"K  c gray27",
+"L  c #464646",
+"P  c gray28",
+"I  c #484848",
+"U  c #494949",
+"Y  c #4B4B4B",
+"T  c #4C4C4C",
+"R  c gray30",
+"E  c #4E4E4E",
+"W  c gray31",
+"Q  c #505050",
+"!  c #515151",
+"~  c gray32",
+"^  c #535353",
+"/  c gray33",
+"(  c #555555",
+")  c #565656",
+"_  c gray34",
+"`  c #585858",
+"'  c gray35",
+"]  c #5A5A5A",
+"[  c #5B5B5B",
+"{  c gray36",
+"}  c #5D5D5D",
+"|  c gray37",
+" . c #5F5F5F",
+".. c #606060",
+"X. c gray38",
+"o. c #626262",
+"O. c gray39",
+"+. c #646464",
+"@. c #656565",
+"#. c #676767",
+"$. c #686868",
+"%. c DimGray",
+"&. c #6A6A6A",
+"*. c gray42",
+"=. c #6C6C6C",
+"-. c #6D6D6D",
+";. c gray43",
+":. c #6F6F6F",
+">. c gray44",
+",. c gray45",
+"<. c #747474",
+"1. c gray46",
+"2. c #777777",
+"3. c gray47",
+"4. c #797979",
+"5. c gray48",
+"6. c #7B7B7B",
+"7. c gray49",
+"8. c gray50",
+"9. c #808080",
+"0. c #818181",
+"q. c gray51",
+"w. c #838383",
+"e. c #848484",
+"r. c #868686",
+"t. c #888888",
+"y. c gray54",
+"u. c #8B8B8B",
+"i. c gray55",
+"p. c #8E8E8E",
+"a. c gray57",
+"s. c #939393",
+"d. c gray58",
+"f. c gray59",
+"g. c #979797",
+"h. c gray60",
+"j. c #9A9A9A",
+"k. c #9B9B9B",
+"l. c gray61",
+"z. c #9D9D9D",
+"x. c #9F9F9F",
+"c. c #A0A0A0",
+"v. c gray63",
+"b. c #A2A2A2",
+"n. c gray64",
+"m. c #A4A4A4",
+"M. c #A5A5A5",
+"N. c gray65",
+"B. c #A7A7A7",
+"V. c gray66",
+"C. c #A9A9A9",
+"Z. c #AAAAAA",
+"A. c #ACACAC",
+"S. c gray68",
+"D. c #AEAEAE",
+"F. c #AFAFAF",
+"G. c gray69",
+"H. c #B2B2B2",
+"J. c gray70",
+"K. c #B4B4B4",
+"L. c gray71",
+"P. c #B6B6B6",
+"I. c #B7B7B7",
+"U. c gray72",
+"Y. c gray73",
+"T. c #BBBBBB",
+"R. c #BCBCBC",
+"E. c gray74",
+"W. c gray",
+"Q. c gray75",
+"!. c #C0C0C0",
+"~. c #C1C1C1",
+"^. c #C3C3C3",
+"/. c gray77",
+"(. c #C5C5C5",
+"). c #C6C6C6",
+"_. c gray78",
+"`. c #C8C8C8",
+"'. c gray79",
+"]. c gray80",
+"[. c #CECECE",
+"{. c #D2D2D2",
+"}. c LightGray",
+"|. c #D5D5D5",
+" X c gray84",
+".X c #D8D8D8",
+"XX c gray85",
+"oX c #DADADA",
+"OX c gray86",
+"+X c #DDDDDD",
+"@X c gray87",
+"#X c #DFDFDF",
+"$X c #E1E1E1",
+"%X c gray89",
+"&X c gray90",
+"*X c #E6E6E6",
+"=X c gray91",
+"-X c #EEEEEE",
+";X c #EFEFEF",
+":X c gray94",
+">X c #F1F1F1",
+",X c gray95",
+"<X c #F3F3F3",
+"1X c #F4F4F4",
+"2X c gray96",
+"3X c #F6F6F6",
+"4X c #F9F9F9",
+"5X c gray98",
+"6X c #FBFBFB",
+"7X c #FDFDFD",
+"8X c #FEFEFE",
+"9X c gray100",
+"0X c None",
+/* pixels */
+"                        0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"          @   @ @   $     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"  @ 3 3 3 6 q q r N l     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"  @ q y a g l l G 2.N     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"  @ r a v N N C ! 7.l     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"  @ q a v C C G ( 7.l     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"    r g N C G J ] 7.g     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"0X@ r g N G J J | 0.g     0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X",
+"0X@ r l N G Y J o.0.a     0X0X0X0X0X0X0X0X              0X0X0X  ",
+"0X  r v G J Y Y @.0.a     0X0X0X0X0X0X    @               @     ",
+"0X  r v C J R R @.0.y     0X0X0X0X0X=   G o.N C C C C C v 6     ",
+"0X  r N C Y Y ! &.7.r @   0X0XJ.| g = J '.B.&.-.-.>.-.! y @     ",
+"0X  r N G J R R o.0.( y 3 0X}.v ! l v J.~.7.2.7.0.2.Y 6         ",
+"0X  q C J J ( >.F.r.g Y N._.J.! l -.Y R F.k.0.r.2.C =       0X0X",
+"0X  q N N 2.F.#Xr.r Y T.9XQ.k.c.a &.2.J | OXJ.>.y @       0X0X0X",
+"0X  3 l y.}.{.y.q ! f.$X9XOXp._.o.Y 2.! 6 f.3XB.r     0X0X0X0X0X",
+"0X  = 2.4Xp.G q R >.J.*X9X<Xk.J.T.g v C R &.9X3XJ.( 0X0X0X0X0X0X",
+"0X  J -X9XT.C y N N.J.4X9X4XN.z.-XR G ] ] p.9X9X-X_.7.0X0X0X0X0X",
+"0X= f.Q.F.J.F.c.f.F.T.9X9X9XJ.p.<Xf.2.Q.J.J.<X9XOXJ.]     0X0X0X",
+"0X@ ( c.N.N.z.B.Q.f.OX9X9X9X~.0.OX3X9X3XJ.J.'.$XF.f.r     0X0X0X",
+"0X  6 N.].].Q.p.z.f.<X9X9X4X_.0.~.9X9X-XJ.J.J.J.z.&.@     0X0X0X",
+"0X  $ y.#X#X}.k.0.B.9X3X4X3X_.7.J.9X$X'.N.N.z.c.] 6       0X0X0X",
+"0X  @ 7.OXOXOXN.7.B._.'.}.#X~.0.k.T.N.F.J.0.0.J           0X0X0X",
+"0X  @ ! -.2.p.c.7.2.y.s.k.k.k.7.2.B.'.%XT.&.C         = 0X0X0X0X",
+"0X  @ y g a g ! o.( B.T.T.~.Q.2.>._.$X%XT.| r       0X0X0X0X0X0X",
+"0X0X@ a N v N v G J J.}.OX#X'.>.&.~.$X%XB.R J r       0X0X0X0X0X",
+"0X0X@ y N N C G J Y J.OX#X#X_.2. at .Q.'.B.] G ( R 3     0X0X0X0X0X",
+"0X0X  r v N C G J R z.Q.~.'.T.2.! 2.| J C R o.o.G @     0X0X0X0X",
+"0X0X  r v N C G J v y J | &.o.N :   = C R ( ] ] ] l @     0X0X0X",
+"0X0X  3 6 6 3 6 6 6                   y y q q q r r =       0X0X",
+"0X0X                                                          0X",
+"0X0X                            0X0X0X                        0X"
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmix-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmix-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmix-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,202 @@
+/* XPM */
+static char *kmix-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 180 2",
+"   c black",
+".  c #000100",
+"X  c #010101",
+"o  c #000002",
+"O  c #000003",
+"+  c #000200",
+"@  c #000201",
+"#  c #030002",
+"$  c gray1",
+"%  c #000304",
+"&  c #030306",
+"*  c #000400",
+"=  c #000601",
+"-  c #000702",
+";  c #000706",
+":  c #000801",
+">  c #000B03",
+",  c #030803",
+"<  c #000B04",
+"1  c #000B06",
+"2  c #000C00",
+"3  c #000E04",
+"4  c #060B0C",
+"5  c #080208",
+"6  c #0E060E",
+"7  c #0F060F",
+"8  c #001300",
+"9  c #001800",
+"0  c #001B00",
+"q  c #001B02",
+"w  c #001906",
+"e  c #181818",
+"r  c #1A1A20",
+"t  c #002205",
+"y  c #002703",
+"u  c #002B01",
+"i  c #002C00",
+"p  c #003200",
+"a  c #003107",
+"s  c #003D00",
+"d  c #202020",
+"f  c #222222",
+"g  c #212128",
+"h  c #222228",
+"j  c #2C2C2C",
+"k  c gray18",
+"l  c #2F2F2F",
+"z  c #2B2A30",
+"x  c #2C2C32",
+"c  c #323232",
+"v  c #004000",
+"b  c #004400",
+"n  c #004D01",
+"m  c #0A460A",
+"M  c #005200",
+"N  c #005006",
+"B  c #005402",
+"V  c #005403",
+"C  c #005507",
+"Z  c #005D02",
+"A  c #005E02",
+"S  c #006100",
+"D  c #006600",
+"F  c #006603",
+"G  c #006900",
+"H  c #006A00",
+"J  c #006A05",
+"K  c #007000",
+"L  c #007300",
+"P  c #007004",
+"I  c #007005",
+"U  c #007104",
+"Y  c #007700",
+"T  c #007800",
+"R  c #007904",
+"E  c #007D00",
+"W  c #007F04",
+"Q  c #29442C",
+"!  c #324436",
+"~  c #413C41",
+"^  c #434343",
+"/  c #484849",
+"(  c #494949",
+")  c #4B4B4B",
+"_  c #4E4D4E",
+"`  c gray31",
+"'  c #585858",
+"]  c #5A5A5A",
+"[  c #5B5B5B",
+"{  c #5D5D5D",
+"}  c #5C5C5F",
+"|  c #5D5D64",
+" . c #606060",
+".. c gray38",
+"X. c #626262",
+"o. c gray39",
+"O. c #646464",
+"+. c #656565",
+"@. c gray40",
+"#. c #686868",
+"$. c DimGray",
+"%. c #6A6A6A",
+"&. c gray42",
+"*. c #69696F",
+"=. c #6C6C6C",
+"-. c gray43",
+";. c #706B70",
+":. c gray44",
+">. c #717171",
+",. c #727272",
+"<. c #747474",
+"1. c gray46",
+"2. c #767676",
+"3. c #777777",
+"4. c #797579",
+"5. c gray47",
+"6. c #797979",
+"7. c #7B7B7B",
+"8. c #7B7B7D",
+"9. c #7E7B7F",
+"0. c #7E7E7E",
+"q. c #008000",
+"w. c #008600",
+"e. c #008F00",
+"r. c #009100",
+"t. c #009300",
+"y. c #009500",
+"u. c #009A00",
+"i. c #009F00",
+"p. c #00A200",
+"a. c #00A700",
+"s. c #00AA01",
+"d. c #00AE02",
+"f. c #00B300",
+"g. c #00C900",
+"h. c #00CC00",
+"j. c #00D700",
+"k. c #00D701",
+"l. c #00D801",
+"z. c #00D900",
+"x. c #00DE01",
+"c. c #00EB01",
+"v. c #00F000",
+"b. c #00F901",
+"n. c #00FF01",
+"m. c #818181",
+"M. c gray51",
+"N. c #888888",
+"B. c #898989",
+"V. c #8C8C8F",
+"C. c gray56",
+"Z. c #908890",
+"A. c #909090",
+"S. c #939393",
+"D. c #959594",
+"F. c gray62",
+"G. c #9F9F9F",
+"H. c gray65",
+"J. c #A7A7A7",
+"K. c #A9A6AA",
+"L. c #AFAFAF",
+"P. c gray70",
+"I. c #B2B2B4",
+"U. c #B7B7B7",
+"Y. c #BCBCBC",
+"T. c gray",
+"R. c #C1BEC3",
+"E. c gray77",
+"W. c gray78",
+"Q. c gray79",
+"!. c #CACAC9",
+"~. c #CDCDCD",
+"^. c #CECECE",
+"/. c #D7D7D7",
+"(. c #DFDFDF",
+"). c #E4E4E3",
+"_. c #E9E9E9",
+"`. c #EDEDEC",
+"'. c gray100",
+"]. c None",
+/* pixels */
+"].].].f.g.k.k.k.x.k.k.y.V ].].].",
+"].].a.s.W V y < < q b L p.D ; ].",
+"].y.R t       ].].].    0 G C O ",
+"].I ;   ].].].T E L ].].].  A w ",
+"].a   ].q.h.c.b.n.c.u.A ].].u y ",
+"].  * Y d.I n p u s S r.J < ].* ",
+"].].G I 2     7 7 ].]., V N O ].",
+"].w.L 4 ~ _ -.G.H.6.B.9.5 b 1 ].",
+"].].Q -.8.1.$. at .<.C.H.U.K.!     ",
+"].Z.4.#.X.{ @.1.B.C.F.L.Q.R.j ].",
+"].1.$. .X.7.P.Q.W.E.P.T.^.).*.  ",
+"].[ =. . at .:.>.$.X.1.M.T.(._.|   ",
+"].l [ >.$./ c l l c o./.`.I.r   ",
+"].].e / >.M.6.1.7.S.Q.^.V.g     ",
+"].].].  f _ @.>.M.S.8.x &     ].",
+"].].].].  f ^ / [ } g       ].]."
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmix.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmix.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kmix.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,117 @@
+/* XPM */
+static char *kmix[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 79 1",
+"  c #000000",
+". c #00000B",
+"X c #000014",
+"o c #00001A",
+"O c #001B16",
+"+ c #000021",
+"@ c #00002B",
+"# c #000030",
+"$ c #1D1D31",
+"% c #00350D",
+"& c #003C0F",
+"* c #003310",
+"= c #003B11",
+"- c #252525",
+"; c #2C2C2C",
+": c #353535",
+"> c #3B3B3B",
+", c #373745",
+"< c #00460C",
+"1 c #004A0D",
+"2 c #005402",
+"3 c #005D02",
+"4 c #005B09",
+"5 c #005011",
+"6 c #006302",
+"7 c #006C01",
+"8 c #007401",
+"9 c #007108",
+"0 c #007B02",
+"q c #007808",
+"w c gray27",
+"e c #4B4B4B",
+"r c #4F4F56",
+"t c #515151",
+"y c #52525A",
+"u c #5C5C5D",
+"i c #5F5F61",
+"p c #626262",
+"a c #606068",
+"s c #6A6A6A",
+"d c #6F6F72",
+"f c #737373",
+"g c #767678",
+"h c #7B7B7B",
+"j c #008301",
+"k c #008108",
+"l c #008B00",
+"z c #009302",
+"x c #009A00",
+"c c #00A300",
+"v c #00AA00",
+"b c #00B400",
+"n c #00BC00",
+"m c #00C300",
+"M c #00CC00",
+"N c #00D400",
+"B c #00DB00",
+"V c #00E300",
+"C c #00EA00",
+"Z c #00F400",
+"A c #00FB00",
+"S c #828282",
+"D c #8B8B8B",
+"F c #939393",
+"G c #9B9B9B",
+"H c #A3A3A3",
+"J c #ABABAB",
+"K c #B3B3B3",
+"L c #B4B4BA",
+"P c #BBBBBB",
+"I c #C2C2C2",
+"U c #C6C6C8",
+"Y c #CBCBCB",
+"T c #D4D4D4",
+"R c #DBDBDB",
+"E c gray89",
+"W c #EEEEEE",
+"Q c gray100",
+"! c None",
+/* pixels */
+"!!!!!!!!!mMNBVCZAACVBMm!!!!!!!!!",
+"!!!!!!!bnmMNBNBNBBNNNMmbvz!!!!!!",
+"!!!!!cvbmnbxq%.X...68xvbbcj@!!!!",
+"!!!!ccvcq*X            2lxxk@!!!",
+"!!!xxx9X    !!!!!!!!!!!! 3jzq@!!",
+"!!lzl*.   !!!!!!!!!!!!!!!! 8j6o!",
+"!!ljO   !!!!!!!!!!!!!!!!!!!!88o ",
+"!!l=.  !!!!!!!!!!!!!!!!!!!!!38< ",
+"!!0X  !!!!!!NBCZAZCBN!!!!!!!!8< ",
+"!!6. !!!!bmMNBCZAACNMmbz!!!!!62 ",
+"!!#  !!cvbnnvzq9763cvvbcz#!!!!X ",
+"!!! !!xcvx1X          8zxj5!!!! ",
+"!!!!!zxz=X   !!!!!!!!!! 7lqo!!!!",
+"!!!!!l0o   !!!!!!!!!!!!!!201o!!!",
+"!!!!ljO   !!!PPPIUU!!!!!!!76o !!",
+"!!!!l4  KJHFDFGHHJJKPPYL!!!7X !!",
+"!!!!0XhGhhhsppppsfhDGJPPIL!7. !!",
+"!!!!!FfgsppppppsdhhDDGHJPIP@  !!",
+"!!!!FfsppppppppdghDDGHJKKIIP@!!!",
+"!!!GssppppppppsfhDDFGJJKIUYIHo!!",
+"!!!hfpppppppDITWWRUKHJKIUTTYUo !",
+"!!!pfpppppfJIUPKJPRYPKPIYTRYYo !",
+"!!!pfpppppFfSFDhgghGHGIYTRETIo !",
+"!!!efppppspttttttttuspKYRREYJo !",
+"!!!>sfpppit:::::::>w>eIRRETIio !",
+"!!!w-shspsuw>::::>>>eGTRERUgo  !",
+"!!!!>-eSSggfpwwwweefJRERTHd$  !!",
+"!!!!!;:-tSFGHHGHJJURRRIGfiX   !!",
+"!!!!!! ->::tsSFGGHFFSsay$.   !!!",
+"!!!!!!!! ->tw>>weysSfpo    !!!!!",
+"!!!!!!!!!!>wewwwtpfsp,. !!!!!!!!",
+"!!!!!!!!!!!-wtyuppitX   !!!!!!!!"
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/krec-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/krec-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/krec-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,94 @@
+/* XPM */
+static char *krec-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 72 1",
+"  c black",
+". c gray5",
+"X c #0E0E0E",
+"o c gray6",
+"O c #190C07",
+"+ c #1F110B",
+"@ c gray7",
+"# c gray8",
+"$ c #151515",
+"% c gray9",
+"& c #1B1B1B",
+"* c #1D1D1D",
+"= c gray12",
+"- c #20120D",
+"; c #21120D",
+": c #211715",
+"> c #271711",
+", c #281812",
+"< c #2A1912",
+"1 c #2B1913",
+"2 c #2F1C14",
+"3 c #391A0F",
+"4 c #311B13",
+"5 c #311D16",
+"6 c #2F211C",
+"7 c #362017",
+"8 c #392016",
+"9 c #3B231A",
+"0 c #202020",
+"q c gray13",
+"w c #252525",
+"e c gray15",
+"r c #282828",
+"t c gray16",
+"y c #2A2A2A",
+"u c gray17",
+"i c #2C2C2C",
+"p c gray18",
+"a c #2F2F2F",
+"s c #352823",
+"d c #382A25",
+"f c #313131",
+"g c #323232",
+"h c #3F3F3F",
+"j c #432115",
+"k c #42251B",
+"l c #47281C",
+"z c #47291D",
+"x c #4E2A1C",
+"c c #573426",
+"v c #523429",
+"b c #5D3728",
+"n c #5D3729",
+"m c #633525",
+"M c #673B2B",
+"N c #6E402F",
+"B c #724332",
+"V c #784532",
+"C c #7B4936",
+"Z c #7C4A37",
+"A c #454141",
+"S c #636161",
+"D c DimGray",
+"F c #6F6B6A",
+"G c #7C7C7C",
+"H c #8D543E",
+"J c #817E7C",
+"K c #9C9B9B",
+"L c #A0A0A0",
+"P c #AEADAD",
+"I c gray72",
+"U c None",
+/* pixels */
+"UUUUUpy=$UUUUUUU",
+"UUUUUpy*@XUUUUUU",
+"UUUUUpw&XXXUUUUU",
+"UUUUUy=&XX.UUUUU",
+"UUUUgy*$..XUUUUU",
+"UUUUgy*@..XUUUUU",
+"UUUUpw&XXXXUUUUU",
+"UUUUkv6XAKIUUUUU",
+"UUUHZb4<KIIUUUUU",
+"UUUmNb9<AIIUUUUU",
+"UUUVBc52&JIIUUUU",
+"UUUZMl5;sFPIUUUU",
+"UUUxj52;dSDIUUUU",
+"UUU3z2;;,UGIIUUU",
+"UUUUUO>,UUUUUUUU",
+"UUUUUUUUUUUUUUUU"
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/krec.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/krec.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/krec.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,198 @@
+/* XPM */
+static char *krec[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 160 2",
+"   c black",
+".  c #173517",
+"X  c #343434",
+"o  c #3C3C3B",
+"O  c #1E461E",
+"+  c #204920",
+"@  c #294429",
+"#  c #2C482C",
+"$  c #265626",
+"%  c #275927",
+"&  c #2C532C",
+"*  c #295E29",
+"=  c #344E34",
+"-  c #395239",
+";  c #2B652B",
+":  c #2E682E",
+">  c #3D663D",
+",  c #357835",
+"<  c #3A743A",
+"1  c #3B7E3B",
+"2  c #433A36",
+"3  c #413B3A",
+"4  c #503227",
+"5  c #58392E",
+"6  c #603C2F",
+"7  c #56423B",
+"8  c #6C402F",
+"9  c #6C483A",
+"0  c #77412D",
+"q  c #754432",
+"w  c #774C3B",
+"e  c #7A4532",
+"r  c #7D4A36",
+"t  c #404040",
+"y  c #4B4B4B",
+"u  c #455D45",
+"i  c #504D4C",
+"p  c #565656",
+"a  c #5D5856",
+"s  c gray37",
+"d  c #4E654E",
+"f  c #457745",
+"g  c #5C725C",
+"h  c #66524B",
+"j  c #685D59",
+"k  c #765042",
+"l  c #765E55",
+"z  c #7A5E52",
+"x  c #746058",
+"c  c #646464",
+"v  c #686868",
+"b  c #617561",
+"n  c #7A7776",
+"m  c #7A7A79",
+"M  c #3A843A",
+"N  c #3C8A3C",
+"B  c #478947",
+"V  c #409340",
+"C  c #449C44",
+"Z  c #529052",
+"A  c #5D935D",
+"S  c #46A146",
+"D  c #48A448",
+"F  c #4BAB4B",
+"G  c #4EB24E",
+"H  c #55A455",
+"J  c #58AB58",
+"K  c #50B750",
+"L  c #54BC54",
+"P  c #5FB05F",
+"I  c #5ABA5A",
+"U  c #638A63",
+"Y  c #6F886F",
+"T  c #748574",
+"R  c #61A461",
+"E  c #61A961",
+"W  c #69A469",
+"Q  c #69AF69",
+"!  c #63B663",
+"~  c #65BA65",
+"^  c #6AB16A",
+"/  c #6BBA6B",
+"(  c #70A070",
+")  c #73B573",
+"_  c #55C255",
+"`  c #5ACB5A",
+"'  c #5CD35C",
+"]  c #5FD85F",
+"[  c #61C161",
+"{  c #60CA60",
+"}  c #69C869",
+"|  c #64D464",
+" . c #61DC61",
+".. c #68D068",
+"X. c #71C171",
+"o. c #75CC75",
+"O. c #7FC87F",
+"+. c #76D276",
+"@. c #71DA71",
+"#. c #7AD17A",
+"$. c #7FD97F",
+"%. c #64E364",
+"&. c #66E966",
+"*. c #6BE06B",
+"=. c #6BEB6B",
+"-. c #70E470",
+";. c #76EC76",
+":. c #78EC78",
+">. c #84452F",
+",. c #834731",
+"<. c #804A36",
+"1. c #854D39",
+"2. c #83523F",
+"3. c #8C503A",
+"4. c #93543C",
+"5. c #855441",
+"6. c #875D4D",
+"7. c #8C5946",
+"8. c #9A5A42",
+"9. c #8A6355",
+"0. c #88675B",
+"q. c #906555",
+"w. c #8C7268",
+"e. c #937266",
+"r. c #A35F45",
+"t. c #A56045",
+"y. c #B46B4F",
+"u. c #B66C50",
+"i. c #84817F",
+"p. c #808080",
+"a. c gray55",
+"s. c gray59",
+"d. c #81BB81",
+"f. c #AD9085",
+"g. c #A29F9E",
+"h. c #AAA19D",
+"j. c #A8A2A0",
+"k. c #ABAAAA",
+"l. c #A9BFA9",
+"z. c #B2B2B2",
+"x. c #B9B9B9",
+"c. c #81D281",
+"v. c #83D883",
+"b. c #90C790",
+"n. c #95D195",
+"m. c #93DE93",
+"M. c #98D898",
+"N. c #83EC83",
+"B. c #9EF39E",
+"V. c #AEC8AE",
+"C. c #A0DBA0",
+"Z. c #A1ECA1",
+"A. c #C6C6C6",
+"S. c #C9C9C9",
+"D. c #D5D5D5",
+"F. c #DADADA",
+"G. c #D5E2D5",
+"H. c #DEF5DE",
+"J. c #E4DAD7",
+"K. c None",
+/* pixels */
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.H.B ( K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.b.H ^ K.K.^ M A K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.~ S Q K.m.D N 1 K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.~ D C H @.C N Z K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.I D S d.| C N Q K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.M._ N : O.] D H K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.` _ ; . c. .F J K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.' ` $ . v.&.F / K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.` ] ; . X.&.L / K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.C.%., . Y %.] I K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.K.K.K.K.K.K.*.F . u @.=._ n.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.K.k.X o k.K.K. at . .+ # M. .&.[ K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.K.p o o o t c K.#.&.V . g #.%.&.v.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.p o o t t o X v K.| %.% @ K.o.%.&.;.B.K.K.K.K.K.K.Z.",
+"K.K.K.K.K.D.t o t t t o X o K.o.%.` O d K.) { %.&.:.=.N.N.*.../ ",
+"K.K.K.K.K.a.X o t t t o o X m K.+.%._ + b K.K.) / I [ I J R U K.",
+"K.K.K.K.K.s.X o o t t 3 o X y K.K.#.%.' * - u K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.y X o t t o o X o K.K.K.o. .&.C & u T K.K.K.K.K.K.K.",
+"K.K.K.K.K.K.c X p.x.m o o 7 w e.K.K.K./ `  . .F < > = f H ) C ) ",
+"K.K.K.K.K.K.p.m F.D.S.h r 4.1.5.K.K.K.K.G.! } `  .' ` L G G G F ",
+"K.K.K.K.K.K.S.S.S.S.S.0.8.t.8.7.J.K.K.K.K.K.K.V.P ! G G G H W V.",
+"K.K.K.K.K.S.S.S.S.S.h.r >.4.4.1.9.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.K.S.S.S.A.A.h.5.y.y.4.3.0 q.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.K.S.S.S.A.A.g.4 8.r.y.y.8.1.6.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.K.A.S.S.S.A.z.2 q 8.r.4.,.1.e k K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.S.S.S.A.A.k.y a 1.1.4.4.1.r 6 z K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"F.S.S.S.S.k.2 o K.f.w q q 8 5 x K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"K.x.A.A.z.3 i.K.K.K.w.9 x 7 j K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"S.S.z.x.m n K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"S.A.z.z.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"A.x.x.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.",
+"x.x.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K.K."
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kscd-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kscd-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kscd-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,253 @@
+/* XPM */
+static char *kscd-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 231 2",
+"   c black",
+".  c #010306",
+"X  c #020912",
+"o  c #1F1D19",
+"O  c #05133C",
+"+  c #202023",
+"@  c #091846",
+"#  c #081948",
+"$  c #0B1F58",
+"%  c #132D71",
+"&  c #152F72",
+"*  c #182F70",
+"=  c #183072",
+"-  c #193172",
+";  c #1A3172",
+":  c #1D3374",
+">  c #1F3677",
+",  c #242D49",
+"<  c #28365E",
+"1  c #2D3A63",
+"2  c #2E3C62",
+"3  c #2F3C62",
+"4  c #2F3C63",
+"5  c #2F3C64",
+"6  c #213572",
+"7  c #303D64",
+"8  c #2E4EAC",
+"9  c #3B70DA",
+"0  c #546BAB",
+"q  c #6C7F9A",
+"w  c #436BD1",
+"e  c #4F74D3",
+"r  c #5176D3",
+"t  c #597DD5",
+"y  c #5A7DD4",
+"u  c #5B7DD5",
+"i  c #4B7DE1",
+"p  c #5C8DDB",
+"a  c #5885E2",
+"s  c #6980C2",
+"d  c #6586D8",
+"f  c #628BDD",
+"g  c #6A8AD9",
+"h  c #728FDB",
+"j  c #7D97DF",
+"k  c #7E99DD",
+"l  c #6284E4",
+"z  c #6092EE",
+"x  c #6B97E6",
+"c  c #6999E2",
+"v  c #6E9CE7",
+"b  c #6B9BEA",
+"n  c #729CE7",
+"m  c #749CE3",
+"M  c #759FE6",
+"N  c #769EE7",
+"B  c #769EE8",
+"V  c #7895E4",
+"C  c #7A9DE1",
+"Z  c #7B9CE6",
+"A  c #7C9FE1",
+"S  c #7B9FE8",
+"D  c #7D9EE8",
+"F  c #60A4EF",
+"G  c #6FB3F1",
+"H  c #75A0E1",
+"J  c #76A2EB",
+"K  c #75A5EA",
+"L  c #76A6EE",
+"P  c #70ACEE",
+"I  c #79A1E1",
+"U  c #7BA2E7",
+"Y  c #79A2EF",
+"T  c #7FA0E8",
+"R  c #7FA6E9",
+"E  c #7DAAEE",
+"W  c #7EA9ED",
+"Q  c #78B4ED",
+"!  c #77B4F1",
+"~  c #7EB9F3",
+"^  c #7EBAF3",
+"/  c #889FDF",
+"(  c #8DA4C7",
+")  c #8AA4DD",
+"_  c #81A0E7",
+"`  c #80A3E4",
+"'  c #82A1E6",
+"]  c #81A6E5",
+"[  c #82A2E8",
+"{  c #85A4EA",
+"}  c #87A7EB",
+"|  c #87A6EC",
+" . c #80AAEB",
+".. c #82A9EA",
+"X. c #83AFEB",
+"o. c #84AAEA",
+"O. c #87AFEC",
+"+. c #88A7EC",
+"@. c #89A8E7",
+"#. c #89ABE7",
+"$. c #8BABE6",
+"%. c #8DA9E5",
+"&. c #8CA9E6",
+"*. c #89A8EC",
+"=. c #89A8ED",
+"-. c #8DADEA",
+";. c #8FB6ED",
+":. c #82B1F1",
+">. c #80B5F2",
+",. c #84B0F0",
+"<. c #86B1F1",
+"1. c #82BAF3",
+"2. c #8BB4F0",
+"3. c #8FB6F0",
+"4. c #88BAF4",
+"5. c #8CBBF3",
+"6. c #90AFE7",
+"7. c #90AFE9",
+"8. c #90AFEE",
+"9. c #95ADED",
+"0. c #90B1EB",
+"q. c #90B1ED",
+"w. c #90B2ED",
+"e. c #92B1ED",
+"r. c #92B1EE",
+"t. c #91B4E9",
+"y. c #90B6ED",
+"u. c #96B0E9",
+"i. c #94B9ED",
+"p. c #95B8EE",
+"a. c #9FB4E7",
+"s. c #99B4EB",
+"d. c #9FB7E9",
+"f. c #9FB8E8",
+"g. c #9FBAEA",
+"h. c #9FBBEE",
+"j. c #9DBCEA",
+"k. c #9DBDEE",
+"l. c #93B9F3",
+"z. c #92BAF2",
+"x. c #94B9F0",
+"c. c #97B9F0",
+"v. c #96BCF2",
+"b. c #96BEF3",
+"n. c #96BDF5",
+"m. c #98BCF3",
+"M. c #98BDF3",
+"N. c #ACBEDA",
+"B. c #A2BFEC",
+"V. c #A4BCED",
+"C. c #A1BFF0",
+"Z. c #8FC0F4",
+"A. c #93C1F4",
+"S. c #9FC0F1",
+"D. c #9EC0F4",
+"F. c #B3C4DA",
+"G. c #AFC3E7",
+"H. c #ABC0EB",
+"J. c #A9C0ED",
+"K. c #ACC2EB",
+"L. c #ACC1EE",
+"P. c #AEC3EE",
+"I. c #A2C1F2",
+"U. c #A3C2F3",
+"Y. c #A4C2F0",
+"T. c #A2C0F9",
+"R. c #A8C2F0",
+"E. c #ABC2F2",
+"W. c #ABC5F3",
+"Q. c #ADC5F0",
+"!. c #ACC7F3",
+"~. c #AEC6F2",
+"^. c #AFC9F4",
+"/. c #B4C9EF",
+"(. c #BBCEE9",
+"). c #BACDEF",
+"_. c #B0CAF0",
+"`. c #B1CBF2",
+"'. c #B1CCF4",
+"]. c #B2CCF6",
+"[. c #B4CCF6",
+"{. c #B4CEF5",
+"}. c #B9CFF2",
+"|. c #BACDF0",
+" X c #BACDF1",
+".X c #BBCFF0",
+"XX c #BAD0F3",
+"oX c #BDD3F3",
+"OX c #BCD2F5",
+"+X c #BDD2F4",
+"@X c #BFD4F1",
+"#X c #C0CCE0",
+"$X c #C3D2E8",
+"%X c #C6D5EA",
+"&X c #CFDAEB",
+"*X c #CFDBEA",
+"=X c #CFDBEE",
+"-X c #C0D3F4",
+";X c #C4D4F3",
+":X c #C5D7F3",
+">X c #C6D7F3",
+",X c #C7D7F4",
+"<X c #C7D8F4",
+"1X c #CAD7F4",
+"2X c #CADAF1",
+"3X c #CADBF3",
+"4X c #C9D8F6",
+"5X c #C9DAF6",
+"6X c #CBDCF5",
+"7X c #CBDDF7",
+"8X c #CFDDF3",
+"9X c #CFDEF6",
+"0X c #D0D9E7",
+"qX c #D1DDEF",
+"wX c #D2DDF0",
+"eX c #D0DEF6",
+"rX c #D0DFF6",
+"tX c #D1DFF6",
+"yX c #CEE0F7",
+"uX c #D2E0F6",
+"iX c #D4E0F6",
+"pX c #D3E1FB",
+"aX c #DCE8FB",
+"sX c #DCE9FA",
+"dX c #DCEAFB",
+"fX c #DEE9F9",
+"gX c #E0E2E4",
+"hX c #E1ECFC",
+"jX c #E3EEFC",
+"kX c #E4EFFD",
+"lX c None",
+/* pixels */
+"lXlXlXlXlX8X(.$X%XF.(.gXlXlXlXlX",
+"# s 0 $ ( 0X*X*X=XqXwXN.X lXlXlX",
+"j 1X4XpXa.) G.2X2X6X6XrX-X. lXlX",
+"/  X-X>X>X;XV.&.9.s.q.q.T.q lXlX",
+"k ~.}.oXoXoX XK.V.E.P.~.V.' > lX",
+"h h.`.`.'.].B.U.Y.B.E.'.~.J.9.@ ",
+"d q.j.k.S.D.i.M.M.M.S.].].!.&.6 ",
+"t R t.i.v.M.3.2.2.P Q 5.b.x.f : ",
+"r B O.;.l.b.l.J z F G ! ~ c 9 % ",
+"r n W ;.o.W K ,.,.~ ~ 1.2.p i & ",
+"w x L v  XtX).m d.X.A.A.H b a & ",
+"t B W M tXkXpX] sXtXg.I ..J U ; ",
+"g &.sX$.9XjX9XA sXjX/.U 5XJ.r.; ",
+"t @.0.] ,XdX,XC .X6.q.x.7.-.' * ",
+"8 V { { D ' D ' D *.*.| | ' l O ",
+"+ < 7 7 7 1 5 7 7 1 5 5 5 1 , o "
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kscd.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kscd.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/kscd.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,230 @@
+/* XPM */
+static char *kscd[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 192 2",
+"   c #000000",
+".  c #010419",
+"X  c #020817",
+"o  c #020A1F",
+"O  c #030B20",
+"+  c #000E3C",
+"@  c #031136",
+"#  c #04133B",
+"$  c #3F3E3A",
+"%  c #001453",
+"&  c #061B55",
+"*  c #0B1E54",
+"=  c #091F5C",
+"-  c #0B205B",
+";  c #0D2872",
+":  c #38475B",
+">  c #403E3A",
+",  c #41403E",
+"<  c #4C5B6F",
+"1  c #42597E",
+"2  c #072787",
+"3  c #0E2B80",
+"4  c #082C8E",
+"5  c #102E85",
+"6  c #19368E",
+"7  c #1D3A94",
+"8  c #213F95",
+"9  c #1E44B1",
+"0  c #234296",
+"q  c #244398",
+"w  c #284EBB",
+"e  c #264DC0",
+"r  c #2654CC",
+"t  c #2857CE",
+"y  c #2C59CE",
+"u  c #3157C7",
+"i  c #3358C6",
+"p  c #335BCA",
+"a  c #315ED0",
+"s  c #385ED1",
+"d  c #3B61CC",
+"f  c #3662D1",
+"g  c #3A63D1",
+"h  c #3B6BD5",
+"j  c #566B8A",
+"k  c #4067C5",
+"l  c #4065CB",
+"z  c #4469CE",
+"x  c #4A6DCE",
+"c  c #416BD3",
+"v  c #496FD4",
+"b  c #4C7BCD",
+"n  c #4372D5",
+"m  c #4B71D5",
+"M  c #4A79DB",
+"N  c #5274D0",
+"B  c #577AD1",
+"V  c #537DDA",
+"C  c #5C7BD2",
+"Z  c #6F85A6",
+"A  c #7E96BB",
+"S  c #4D80DF",
+"D  c #5182D6",
+"F  c #5F82D6",
+"G  c #5C83DC",
+"H  c #5C8AD2",
+"J  c #5C8DDA",
+"K  c #5484E0",
+"L  c #5C8CE3",
+"P  c #5C95EE",
+"I  c #599EEF",
+"U  c #55A4EA",
+"Y  c #5AA2EE",
+"T  c #6482D6",
+"R  c #6385DE",
+"E  c #6589DB",
+"W  c #6B87D7",
+"Q  c #6B8CDC",
+"!  c #6A95D7",
+"~  c #6C91DB",
+"^  c #718DDA",
+"/  c #7492DC",
+"(  c #749DDA",
+")  c #7894DD",
+"_  c #7E9BD6",
+"`  c #7B9BDD",
+"'  c #628EE2",
+"]  c #6394EB",
+"[  c #679AE6",
+"{  c #6798EF",
+"}  c #6B93E2",
+"|  c #6B97EE",
+" . c #6D9AE4",
+".. c #6C9AE9",
+"X. c #6B96F0",
+"o. c #7194E0",
+"O. c #739CE4",
+"+. c #729FEB",
+"@. c #7997E0",
+"#. c #7D9CE3",
+"$. c #7EA1DF",
+"%. c #68A3EF",
+"&. c #6BAFEE",
+"*. c #74A0E6",
+"=. c #74A2EA",
+"-. c #71AFED",
+";. c #7CA1E4",
+":. c #79A5EC",
+">. c #7DA8E6",
+",. c #7CA8ED",
+"<. c #75A6F0",
+"1. c #7CA4F1",
+"2. c #7CABF0",
+"3. c #73B3F2",
+"4. c #7DB3F2",
+"5. c #78B8F3",
+"6. c #809EE3",
+"7. c #89A1C3",
+"8. c #8CA4CA",
+"9. c #88A5DC",
+"0. c #8EA9DF",
+"q. c #84A4E3",
+"w. c #80A2E9",
+"e. c #86A8E6",
+"r. c #84ACEC",
+"t. c #8AA5E4",
+"y. c #8BA9E5",
+"u. c #8CABE9",
+"i. c #83AEF1",
+"p. c #85B3EF",
+"a. c #8CB2EB",
+"s. c #82B2F1",
+"d. c #83BAF2",
+"f. c #8CB4F1",
+"g. c #8BBCF2",
+"h. c #92ACE5",
+"j. c #98ADE0",
+"k. c #93B4EC",
+"l. c #95BBEE",
+"z. c #9BB4E8",
+"x. c #9DBBE6",
+"c. c #9CBAEC",
+"v. c #90B6F1",
+"b. c #94BAF2",
+"n. c #9ABDF3",
+"m. c #A8BBD7",
+"M. c #B3BECF",
+"N. c #A4BCE5",
+"B. c #A3BCEB",
+"V. c #ABBFEB",
+"C. c #A3BFF1",
+"Z. c #93C1F4",
+"A. c #9DC1F2",
+"S. c #A0C0EF",
+"D. c #AAC3E6",
+"F. c #ACC2ED",
+"G. c #AEC8EE",
+"H. c #A2C1F1",
+"J. c #ABC4F1",
+"K. c #ADC9F3",
+"L. c #AAC9FB",
+"P. c #B3C6E3",
+"I. c #B0C4ED",
+"U. c #B5C8EE",
+"Y. c #BBCDE7",
+"T. c #BBCAEC",
+"R. c #B3C7F0",
+"E. c #B2CBF3",
+"W. c #BACDF1",
+"Q. c #BFD0EB",
+"!. c #B7D0F4",
+"~. c #BBD1F3",
+"^. c #C2CDDC",
+"/. c #C1CEEF",
+"(. c #C4D2E7",
+"). c #C3D2EB",
+"_. c #CBD5E3",
+"`. c #C9D6EA",
+"'. c #CDD9EC",
+"]. c #C2D3F2",
+"[. c #C5D9F4",
+"{. c #C6DBFA",
+"}. c #C9D6F2",
+"|. c #CBDBF3",
+" X c #C8DDFC",
+".X c #D2DCEB",
+"XX c #D7E1ED",
+"oX c #D3E1F7",
+"OX c #D2E2F9",
+"+X c #DEEAFA",
+"@X c #E0ECFB",
+"#X c None",
+/* pixels */
+"#X#X#X#X#X#X#X#X#X#X#X+XW.x.D.Y.Q.D.7.m.^.#X#X#X#X#X#X#X#X#X#X#X",
+"#X#X#X#X#X#X#X#X#X'.B.P._..XXX.X.XXXXX.X(.8.M.#X#X#X#X#X#X#X#X#X",
+"#X+ 4 6 2 % . #X1 P._.'.'..X.X'.XX'..X.X'.XXQ.j #X#X#X#X#X#X#X#X",
+"= R }.}.}.B.} p 9._._.`.`.`.`.'.}.'.'.'.|.'.'.|.A   #X#X#X#X#X#X",
+"e /./.]./.].}.|.j.B _ (.`.`.`.'.'.|.|.|.|.[.'.[.|.Z #X#X#X#X#X#X",
+"x /././././.}.}.}.}.N.F / T.[.[.[.[.[.[.[.{.{.|.[.{.: #X#X#X#X#X",
+"C T.W.W.~.[.}.}.].].].].B.E W z.~.[.OX X X X X X{.{.G.  #X#X#X#X",
+"C V.R.E.!.].[.[.].].].W.~.Q.U.y./ E E Q E E G L } ;.L.< #X#X#X#X",
+"C V.V.R.!.Q.~.[.~.~.~.~.~.W.E.I.I.U.F.F.R.R.J.V.V.u.} k &   #X#X",
+"C B.C.J.!.!.~.~.~.~.~.~.!.F.N.B.B.B.B.J.V.V.K.K.J.V.V.B.W 9   #X",
+"N z.C.C.K.U.U.!.!.!.~.!.K.N.J.H.C.C.C.C.K.J.K.K.K.J.C.C.j.) ;   ",
+"m h.k.C.G.G.K.K.K.K.K.K.c.n.H.H.H.H.C.C.J.C.E.E.K.K.J.C.h.h.i   ",
+"x 6.u.b.B.B.S.S.A.A.H.A.l.n.n.n.n.n.n.n.S.S.W.E.E.K.J.F.0.6.l . ",
+"x 6.t.a.c.k.c.c.A.A.H.n.b.k.b.b.b.b.b.b.A.S.E.L.L.K.K.H.9.6.v o ",
+"x @.6.r.k.k.l.l.n.b.A.b.b.a.f.f.v.f.v.g.g.l.A.H.K.K.K.n.` #.v o ",
+"l / +.r.a.h.k.l.l.b.Z.b.v.f.p.f.f.<.I U U 3.5.2.4.s.r.=.b v p O ",
+"d } O.:.r.a.a.l.b.b.b.b.v.f.f.1.] P I Y &.3.3.5.4.p.4.J n f r o ",
+"d Q o.:.,.a.k.v.f.b.b.b.n.f.+.| X.{ %.&.3.5.3.5.5.p.4.b M h y o ",
+"d E } =.,.r.a.a.b.b.n.g.s.2.s.r.i.2.4.5.5.5.5.4.d.d.O.D M n y o ",
+"d E } =.,.,.a.a.+.;.;.*.*...g.,.s.d.d.d.d.d.g.d.d.p.H L K M y o ",
+"p G } +.:.2.,. .y.W.W.W.W.y.*.~ #.;.g.g.g.g.g.g.g.! [ ] L M p O ",
+"p G E ..=.<.<.} W.+X+X+X+XT.;.e.].W.y.>.Z.Z.n.g.( ..=...' V f O ",
+"d E } +.<.2.,.O.W.+X at X@X+XW.q.y.|. at XOXF.q.a.a.$.*.2.:.=.} E f o ",
+"d h.;.;.;.k.e.O.W.+X at X@X+X!.e.y.|. at X+X+X|.c.~ ,.e.k.;.:.;.y.a O ",
+"d k.y.y.]. at XB.;.W. at X@X at X+XW.$.e.|. at X+X@X+X~.) +.c. at X].u.e.y.g O ",
+"z h.u.t.~. at Xc.#.W.+X+X at X+XW.;.q.|.+X+X|.B.6.u.v.N. at X~.u.u.h.g O ",
+"l h.q.u.r.z.e.q.W. at X+X+X@XW.q.e.OXOXW.q.e.b.b.c.e.k.u.u.q.y.s o ",
+"i ^ ` u.k.k.a. at .V.|.|.|. XB.` #.B.h.;.h.c.k.k.v.k.k.h.u.#.W p X ",
+"w ^ ) 6.q.u.u.q.~ q.q.q.q.Q t.} / e.u.u.u.u.u.u.u.u.e.q.) W e   ",
+"& s C ^ @.#.6.#.6.#.#.6.#.6.#.6.6.6.6.6.#.6.6.6.6.6. at .^ C g =   ",
+"#X@ 5 7 8 q 8 q q q q q q q q q q q q q q q q q 8 8 0 7 5 #     ",
+"#X#X> > $ $ $ $ $ $ $ $ $ > $ $ $ $ $ > $ > > > > > > > > , #X#X"
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/noatun-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/noatun-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/noatun-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,225 @@
+/* XPM */
+static char *noatun-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 203 2",
+"   c black",
+".  c #081C3E",
+"X  c #1E1F24",
+"o  c #002300",
+"O  c #002500",
+"+  c #263B25",
+"@  c #1B6616",
+"#  c #1E6617",
+"$  c #234D20",
+"%  c #2F4029",
+"&  c #294E27",
+"*  c #265029",
+"=  c #27502B",
+"-  c #295328",
+";  c #305029",
+":  c #20781A",
+">  c #267920",
+",  c #3A753B",
+"<  c #39755B",
+"1  c #4F4B56",
+"2  c #4F4B57",
+"3  c #425F5F",
+"4  c #4B5C52",
+"5  c #4F7355",
+"6  c #517457",
+"7  c #6D686E",
+"8  c #6C6F6B",
+"9  c #677172",
+"0  c #6C7477",
+"q  c #6E7E79",
+"w  c #706971",
+"e  c gray45",
+"r  c #1D3782",
+"t  c #326096",
+"y  c #425FAC",
+"u  c #4D7392",
+"i  c #586087",
+"p  c #5E6486",
+"a  c #4868B2",
+"s  c #6E7595",
+"d  c #4779DC",
+"f  c #5772C0",
+"g  c #4D7AE7",
+"h  c #059A00",
+"j  c #0CA600",
+"k  c #09A800",
+"l  c #1FAE13",
+"z  c #27842D",
+"x  c #2D9A25",
+"c  c #3B9835",
+"v  c #2EA024",
+"b  c #34AE2A",
+"n  c #3DB134",
+"m  c #268A68",
+"M  c #3FC033",
+"N  c #51BE3E",
+"B  c #45877B",
+"V  c #49A442",
+"C  c #58AB53",
+"Z  c #5DAA57",
+"A  c #5FAD5B",
+"S  c #57BC4F",
+"D  c #58B456",
+"F  c #5EBB57",
+"G  c #5EBC58",
+"H  c #63985D",
+"J  c #649B68",
+"K  c #69906F",
+"L  c #6A9D6E",
+"P  c #6C9074",
+"I  c #61A75F",
+"U  c #65A762",
+"Y  c #6BAA68",
+"T  c #67B969",
+"R  c #6EBE6B",
+"E  c #6DBC6E",
+"W  c #6CB379",
+"Q  c #78AB74",
+"!  c #7AAC78",
+"~  c #7BB777",
+"^  c #59C94E",
+"/  c #6EC666",
+"(  c #6FC368",
+")  c #6ACD60",
+"_  c #6DCB63",
+"`  c #6FD165",
+"'  c #7CCD75",
+"]  c #77D96E",
+"[  c #7DD374",
+"{  c #7FDA74",
+"}  c #5784DF",
+"|  c #6483D9",
+" . c #778BD1",
+".. c #7A92D2",
+"X. c #628CE2",
+"o. c #668EE1",
+"O. c #658EEC",
+"+. c #6C92E2",
+"@. c #6F91E6",
+"#. c #6A9AEE",
+"$. c #6A93F0",
+"%. c #7498E5",
+"&. c #779FEC",
+"*. c #7B9DE5",
+"=. c #6DA0ED",
+"-. c #6EA1EF",
+";. c #76A4EE",
+":. c #76A5EE",
+">. c #7DA0E6",
+",. c #7AAAEF",
+"<. c #7EA8EF",
+"1. c #7EABEF",
+"2. c #75A5F0",
+"3. c #7CAAF0",
+"4. c #7EACF0",
+"5. c #80CD7A",
+"6. c #87CA7C",
+"7. c #80D278",
+"8. c #94979C",
+"9. c #9696A5",
+"0. c #9993A9",
+"q. c #82BF84",
+"w. c #ADADB6",
+"e. c #A0BCAC",
+"r. c #B6ACBF",
+"t. c #8299D7",
+"y. c #80ADEF",
+"u. c #81ADEF",
+"i. c #81ADF1",
+"p. c #80AEF1",
+"a. c #8DAFF1",
+"s. c #88B2F1",
+"d. c #88B3F0",
+"f. c #89B3F0",
+"g. c #89B3F1",
+"h. c #90ACE9",
+"j. c #91AFEA",
+"k. c #90B3F0",
+"l. c #91B6F1",
+"z. c #92B8F1",
+"x. c #93B9F1",
+"c. c #92B9F2",
+"v. c #93B9F3",
+"b. c #94B9F1",
+"n. c #94B9F2",
+"m. c #94B9F3",
+"M. c #94BAF2",
+"N. c #9BB0F2",
+"B. c #9DB6F5",
+"V. c #AFB2D4",
+"C. c #BCBDD3",
+"Z. c #BDBED3",
+"A. c #BCBDD4",
+"S. c #BDBED4",
+"D. c #BFBFD4",
+"F. c #BBB8DB",
+"G. c #85C881",
+"H. c #8CCC87",
+"J. c #8DD885",
+"K. c #91CE8E",
+"L. c #91DD88",
+"P. c #96D292",
+"I. c #9FD69B",
+"U. c #9ADA92",
+"Y. c #9BDC94",
+"T. c #9DDE95",
+"R. c #9DDB98",
+"E. c #97E28F",
+"W. c #A1DA9C",
+"Q. c #A2E49B",
+"!. c #A5EA9E",
+"~. c #AAE9A2",
+"^. c #B4E6AA",
+"/. c #B6E9AF",
+"(. c #B6EFAE",
+"). c #B6EAB1",
+"_. c #B8EDB3",
+"`. c #BAEFB4",
+"'. c #A4C1F2",
+"]. c #A4C3F4",
+"[. c #A5C4F3",
+"{. c #A6C5F3",
+"}. c #A6C5F4",
+"|. c #A6C5F5",
+" X c #A7C6F4",
+".X c #ABC2F2",
+"XX c #B9D0F6",
+"oX c #B9D2F6",
+"OX c #C3C3DD",
+"+X c #C7C0DF",
+"@X c #CAC1DE",
+"#X c #CAC5DD",
+"$X c #CCC3DB",
+"%X c #C9C8DA",
+"&X c #CBC9DD",
+"*X c #C7E5C7",
+"=X c #C5EFC0",
+"-X c #C6EFC1",
+";X c #CAE5C9",
+":X c #CBF1C6",
+">X c #D0F3C9",
+",X c #D1E0FC",
+"<X c None",
+/* pixels */
+"<X<X<X<X;XK.H.I.P.~ ! <X<X<X<X<X",
+"<X<X<XE W.>X^.U.R.=X:XA 5 <X<X<X",
+"<X<XD =X6.B u s 8.K I ).Y.= <X<X",
+"<XT /.Z 9 N.,X.Xt.V.$XL T.5.4 <X",
+";X' ( 0 OXh.oXoXoXh...F.Y { @ <X",
+"G.L., #XA.>. X|.|.|.'.*. .h k e ",
+"F ) q &XC.+.M.m.M.l.M.M.k. at .m ; ",
+"b j 0.%XC.X.f.f.g.g.f.f.4.;.$.r ",
+"n l 9.%XOXd 2.4.1.,.;.#.;.#.g . ",
+"V M P &XC.} p.p.p.p.u.u.O.t z + ",
+"Q ^ c $XC.| B.v.l.l.&.y 3 N v w ",
+"<Xx ` J OX&. X Xg.a p w.S { O <X",
+"<X6 _ [ U | B.a i r.e.G E.: 2 <X",
+"<X<X= / ~.W < H q.E J.!.: X <X<X",
+"<X<X<X4 # 7.(.`._.Q.C O 2 <X<X<X",
+"<X<X<X<X<X8 & - $ + w <X<X<X<X<X"
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/icons/noatun.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/icons/noatun.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/icons/noatun.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *noatun[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #000A00",
+"X  c #001400",
+"o  c #001800",
+"O  c #0F1218",
+"+  c #03091C",
+"@  c #1D1C21",
+"#  c #003B00",
+"$  c #003100",
+"%  c #1B2D1E",
+"&  c #092C34",
+"*  c #3D3A3E",
+"=  c #0A1D4E",
+"-  c #223D55",
+";  c #3F3B40",
+":  c #353F5B",
+">  c #2E3C66",
+",  c #323D60",
+"<  c #004500",
+"1  c #004B00",
+"2  c #045C00",
+"3  c #04510B",
+"4  c #1B561B",
+"5  c #086002",
+"6  c #197814",
+"7  c #1E6718",
+"8  c #214923",
+"9  c #354A39",
+"0  c #217B1C",
+"q  c #29682A",
+"w  c #346D35",
+"e  c #0E5A46",
+"r  c #1E4C75",
+"t  c #144675",
+"y  c #1A5C6F",
+"u  c #177947",
+"i  c #3C4156",
+"p  c #3B5444",
+"a  c #344445",
+"s  c #403C3F",
+"d  c #403C40",
+"f  c #585459",
+"g  c #5A5A5A",
+"h  c #546B5B",
+"j  c #576D57",
+"k  c #5F6065",
+"l  c #64656B",
+"z  c #66696C",
+"x  c #686568",
+"c  c #696671",
+"v  c #667C6E",
+"b  c #697E72",
+"n  c #76747A",
+"m  c #284797",
+"M  c #2A4DA3",
+"N  c #2D52AC",
+"B  c #3258B7",
+"V  c #25689C",
+"C  c #2F69AE",
+"Z  c #3161A7",
+"A  c #2E5BC9",
+"S  c #305DD8",
+"D  c #325AC8",
+"F  c #3665D5",
+"G  c #3B69D5",
+"H  c #767081",
+"J  c #446DCE",
+"K  c #446ED5",
+"L  c #456CD7",
+"P  c #4A76D9",
+"I  c #4B76D7",
+"U  c #5A77C6",
+"Y  c #527CDA",
+"T  c #5B7ED9",
+"R  c #5179D4",
+"E  c #517DE0",
+"W  c #617BC4",
+"Q  c #099901",
+"!  c #14850D",
+"~  c #1E8319",
+"^  c #198513",
+"/  c #119A08",
+"(  c #1B9713",
+")  c #1C9816",
+"_  c #0C8505",
+"`  c #169134",
+"'  c #12AD02",
+"]  c #14A608",
+"[  c #1FA815",
+"{  c #19B109",
+"}  c #239C1B",
+"|  c #258818",
+" . c #268822",
+".. c #299823",
+"X. c #32982B",
+"o. c #3F9F31",
+"O. c #3B8737",
+"+. c #25AA1A",
+"@. c #28B31A",
+"#. c #29A221",
+"$. c #2AAA20",
+"%. c #2FB422",
+"&. c #32A22B",
+"*. c #38AD2E",
+"=. c #36A232",
+"-. c #38A333",
+";. c #3BAD32",
+":. c #34B529",
+">. c #3FB038",
+",. c #218447",
+"<. c #42893E",
+"1. c #45B43E",
+"2. c #49BB3F",
+"3. c #458149",
+"4. c #56925B",
+"5. c #4AAD44",
+"6. c #43A741",
+"7. c #4BB343",
+"8. c #4EB049",
+"9. c #4CBA43",
+"0. c #50AF4B",
+"q. c #50B44A",
+"w. c #52BA4A",
+"e. c #5BBD53",
+"r. c #5FB45A",
+"t. c #658E6C",
+"y. c #61B75A",
+"u. c #69AA6F",
+"i. c #68BA63",
+"p. c #70AE77",
+"a. c #6BA972",
+"s. c #44C036",
+"d. c #4EC342",
+"f. c #54C14A",
+"g. c #58C54D",
+"h. c #5CC353",
+"j. c #5EC954",
+"k. c #63C75B",
+"l. c #6AC463",
+"z. c #6ECC65",
+"x. c #67C261",
+"c. c #71C36B",
+"v. c #70CD67",
+"b. c #73CB6D",
+"n. c #7CCD75",
+"m. c #7EC073",
+"M. c #7CD073",
+"N. c #5C83DB",
+"B. c #5B8DE4",
+"V. c #5A85E2",
+"C. c #5F96EA",
+"Z. c #6880C4",
+"A. c #6488DC",
+"S. c #6D91DF",
+"D. c #7689C6",
+"F. c #7191DF",
+"G. c #6A8BE4",
+"H. c #6287E4",
+"J. c #6492E5",
+"K. c #6498EA",
+"L. c #6B9CEB",
+"P. c #6C95E5",
+"I. c #7194E3",
+"U. c #739BE7",
+"Y. c #729FEB",
+"T. c #6BA0EE",
+"R. c #73A4EE",
+"E. c #7AA4EA",
+"W. c #7BAAEE",
+"Q. c #79A1E7",
+"!. c #75A6F0",
+"~. c #7CABF0",
+"^. c #82CC7C",
+"/. c #86D37E",
+"(. c #80D477",
+"). c #858385",
+"_. c #858092",
+"`. c #888090",
+"'. c #82AF80",
+"]. c #87B292",
+"[. c #86B185",
+"{. c #9DA8A6",
+"}. c #9EB7AC",
+"|. c #A8A3B8",
+" X c #AEADBD",
+".X c #859FE8",
+"XX c #82A5E9",
+"oX c #83ABEC",
+"OX c #8CADEB",
+"+X c #82A2E6",
+"@X c #83AEF0",
+"#X c #8AB0EE",
+"$X c #86B1F0",
+"%X c #8BB4F1",
+"&X c #91A9EB",
+"*X c #93B4ED",
+"=X c #9CB8ED",
+"-X c #9AB4EC",
+";X c #90B7F2",
+":X c #95BBF2",
+">X c #9BBCF1",
+",X c #AFB4D3",
+"<X c #B5ADC5",
+"1X c #B3B6CD",
+"2X c #BCB8CD",
+"3X c #B3B2C3",
+"4X c #B0B5D3",
+"5X c #A2BBEE",
+"6X c #A7BDF0",
+"7X c #8EC69E",
+"8X c #89D482",
+"9X c #89D584",
+"0X c #91D689",
+"qX c #92D98B",
+"wX c #9BDB94",
+"eX c #9EDD98",
+"rX c #A2DD9B",
+"tX c #A3D6A1",
+"yX c #A3E09D",
+"uX c #A6E0A0",
+"iX c #A9E1A4",
+"pX c #AEE2A8",
+"aX c #B1E4AC",
+"sX c #B5E4B1",
+"dX c #B9E6B5",
+"fX c #BCE6B8",
+"gX c #BCE8B9",
+"hX c #9EC0F3",
+"jX c #AFD4C4",
+"kX c #BAC0CC",
+"lX c #A6C0EF",
+"zX c #A2C1F2",
+"xX c #AAC6F3",
+"cX c #AAC8F5",
+"vX c #B0C6F1",
+"bX c #B3CDF5",
+"nX c #BACEF3",
+"mX c #BBD2F6",
+"MX c #C0BECF",
+"NX c #C0BDD1",
+"BX c #C2E9BE",
+"VX c #C5C4D6",
+"CX c #C6C5D8",
+"ZX c #C8C7D6",
+"AX c #C9C4DA",
+"SX c #C9C8DB",
+"DX c #C9C8D7",
+"FX c #CEC8E2",
+"GX c #CEC7E1",
+"HX c #C2D4F5",
+"JX c #CAD8F4",
+"KX c #C5EBC1",
+"LX c #C8ECC4",
+"PX c #CEEDCB",
+"IX c #C4E2C3",
+"UX c #D0EECD",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXrXr.0.y.c.i.0.<.'.YXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXIX5.&.^.fXUXUXUXUXUXfX^.&.2 j YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYX6.1.dXPXPXIXLXLXPXLXPXLXLXPXdXq.< l YXYXYXYXYXYXYX",
+"YXYXYXYXYXjX) rXBXBXBXPXpX^.y.l.k.n.tXLXBXBXLXyX! % YXYXYXYXYXYX",
+"YXYXYXYX7X..gXgXgXfXk.u e p k l l h q  .k.gXfXfXfX=.o YXYXYXYXYX",
+"YXYXYXjX+.fXsXfX8X6 r &X5XG.U 1XSXAXMX|.v  .^.dXaXdX=.. YXYXYXYX",
+"YXYXYX) aXaXaXk.4 c T JXJXJXmXA.U 1XDXZXAX<X3.e.aXpXaX^ @ YXYXYX",
+"YXYX6.9XtXtXe.8 `.4XF.HXHXHXHXHXvXT W 2XAXAXVXt.e.iXtX9X< l YXYX",
+"YXIX;.rXeXM.4 _.VX,XI.bXmXmXmXmXnXmX5XR Z.MXZXVX4.v.yXyX1.  YXYX",
+"YX5.8XwXqX^ c VXVX,XF.xXbXbXbXbXbXvXvXxXOXJ D.VXAX..:.k.v.1 f YX",
+"YX} qXqXw.9 3XCXVX,XA.5XcXcXcXcXcXxXcXxXlX5XXXJ D.{.Q ' ' Q   YX",
+"tXw./.8X~ H CXVXVX,XA.=XzXhXhXhXzXhXhXhXzX5X-X-XI.L u ' { ] X YX",
+"y.c.M.z.4  XCXVXVX,XN.*X*X:X:X:X:X:X:XhXhX;X:X;X*XOXG.C ` ' # ).",
+"5.h.z.d.p 2XVXVXVX4XY oX%X;X;X;X;X;X;X;X;X;X;X;X%XOXOXXXT Z 3 * ",
+"5.{ { Q l CXVXVXVX4XY XX#X%X%X%X%X%X$X%X%X%X%X%X%X#X$XW.E.I.D O ",
+"8.[ @./ c CXVXVXVX4XI E.oX%X$X$X$X$X$X$X$X$X$XoXR.T.K.C.B.P F = ",
+"8. at .%.] c DXVXVXCX4XF J.R.~. at X@X$X$X$X~.~.R.T.T.T.L.L.K.H.Y S + ",
+"5.%.:.[ h AXVXVXVX4XG J.T.!.!.!.!.!.R.!.R.R.!.R.R.L.K.J.Y A &   ",
+"<.:.2.%.w kXVXVXVX4XL U.W.~.~.~.~.~.~.~.~.~.W.!.Y.U.V.F r 7 $ d ",
+"[.$.d.d.~ |.VXVXCX4XP Y.oX at X$X at X$X$X$X$X at XoXE.Y.I.G r q -.%.o `.",
+"YX/ g.h.+.b SXVXVX,XI oX%X%X%X;X%X%X%X#XoXoXP.K m a | g.g.)   YX",
+"YX2 f.k.h.~ <XAXVX,XY OX:X:X>X:X:X:X*XOXXXY m f `.X.g.k.f.1   YX",
+"YXj +.z.v.2.3.AXZX4XY *X>XhX>X>X:X*XOXN.M : n 2Xp.1.v.z.$.  g YX",
+"YXYX< h.M.M.*.t.AX4XY =X6XzX6X5X*XJ.N : n 3XFX].*.M.M.k.<   YXYX",
+"YXYXl _ n.8X/.>.4.AXK 5X5X5X6XI.B : z 3XSXGXa.;././.(.!   z YXYX",
+"YXYXYX% } 9XqXqXh.X.Z .X=XI.B > x  XGXFX}.-.e.qXqX8X} . @ YXYXYX",
+"YXYXYXYXo +.0XeXeXqX0.y t - g {.2X}.a.-.7.0XrXeX0X} .   YXYXYXYX",
+"YXYXYXYXYX. ! M.uXiXtXwXm.y.w.1.7.e.^.rXyXuXyXM.! .   YXYXYXYXYX",
+"YXYXYXYXYXYX@ < >.qXpXaXaXpXaXaXpXpXaXaXaX0X1.<   @ YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXl   1 &.l.wXaXaXsXaXaXwXz.&.1     z YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXf   X # 2 6 0 6 5 # o     g YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX).; ; ; ; ; ; ).YXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/juk.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/juk.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/juk.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,27 @@
+debian/tmp/usr/bin/juk
+debian/tmp/usr/share/applications/kde/juk.desktop
+debian/tmp/usr/share/apps/juk/jukui-rtl.rc
+debian/tmp/usr/share/apps/juk/jukui.rc
+debian/tmp/usr/share/apps/juk/pics/playing.png
+debian/tmp/usr/share/apps/juk/pics/splash.png
+debian/tmp/usr/share/apps/konqueror/servicemenus/jukservicemenu.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/juk/common
+debian/tmp/usr/share/doc/kde/HTML/en/juk/history-playlist.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/juk/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/juk/juk-adv-search.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/juk-file-renamer.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/juk-main.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/juk-tag-guesser.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/normal-playlist.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/search-playlist.png
+debian/tmp/usr/share/doc/kde/HTML/en/juk/toolbar.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/juk_dock.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/juk.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/juk.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/juk.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/juk.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/juk.png
+
+debian/icons/juk.xpm		/usr/share/pixmaps
+debian/icons/juk-16.xpm		/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kaboodle.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kaboodle.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kaboodle.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+debian/tmp/usr/bin/kaboodle
+debian/tmp/usr/lib/kde3/libkaboodlepart.la
+debian/tmp/usr/lib/kde3/libkaboodlepart.so
+debian/tmp/usr/share/applications/kde/kaboodle.desktop
+debian/tmp/usr/share/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
+debian/tmp/usr/share/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
+debian/tmp/usr/share/apps/kaboodle/kaboodlepartui.rc
+debian/tmp/usr/share/apps/kaboodle/kaboodleui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kaboodle/common
+debian/tmp/usr/share/doc/kde/HTML/en/kaboodle/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kaboodle/index.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kaboodle.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kaboodle.png
+debian/tmp/usr/share/services/kaboodle_component.desktop
+debian/tmp/usr/share/services/kaboodleengine.desktop
+
+debian/icons/kaboodle.xpm		/usr/share/pixmaps
+debian/icons/kaboodle-16.xpm		/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kaudiocreator.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kaudiocreator.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kaudiocreator.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+debian/tmp/usr/bin/kaudiocreator
+debian/tmp/usr/share/applications/kde/kaudiocreator.desktop
+debian/tmp/usr/share/apps/kaudiocreator/eventsrc
+debian/tmp/usr/share/apps/kaudiocreator/kaudiocreatorui.rc
+debian/tmp/usr/share/apps/kaudiocreator/pics/check.png
+debian/tmp/usr/share/apps/kconf_update/kaudiocreator-libkcddb.upd
+debian/tmp/usr/share/apps/kconf_update/kaudiocreator-meta.upd
+debian/tmp/usr/share/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
+debian/tmp/usr/share/apps/konqueror/servicemenus/audiocd_extract.desktop
+debian/tmp/usr/share/config.kcfg/kaudiocreator.kcfg
+debian/tmp/usr/share/config.kcfg/kaudiocreator_encoders.kcfg
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kaudiocreator.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kaudiocreator.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kaudiocreator.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kaudiocreator.png
+
+debian/icons/kaudiocreator.xpm		/usr/share/pixmaps
+debian/icons/kaudiocreator-16.xpm	/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,174 @@
+debian/tmp/usr/include/kde/arts/artsbuilder.h
+debian/tmp/usr/include/kde/arts/artsbuilder.idl
+debian/tmp/usr/include/kde/arts/artsgui.h
+debian/tmp/usr/include/kde/arts/artsgui.idl
+debian/tmp/usr/include/kde/arts/artsmidi.h
+debian/tmp/usr/include/kde/arts/artsmidi.idl
+debian/tmp/usr/include/kde/arts/artsmodules.h
+debian/tmp/usr/include/kde/arts/artsmodules.idl
+debian/tmp/usr/include/kde/arts/artsmodulescommon.h
+debian/tmp/usr/include/kde/arts/artsmodulescommon.idl
+debian/tmp/usr/include/kde/arts/artsmoduleseffects.h
+debian/tmp/usr/include/kde/arts/artsmoduleseffects.idl
+debian/tmp/usr/include/kde/arts/artsmodulesmixers.h
+debian/tmp/usr/include/kde/arts/artsmodulesmixers.idl
+debian/tmp/usr/include/kde/arts/artsmodulessynth.h
+debian/tmp/usr/include/kde/arts/artsmodulessynth.idl
+debian/tmp/usr/include/kde/arts/kartswidget.h
+debian/tmp/usr/include/kde/arts/kframe_impl.h
+debian/tmp/usr/include/kde/arts/klayoutbox_impl.h
+debian/tmp/usr/include/kde/arts/kwidget_impl.h
+debian/tmp/usr/include/kde/arts/kwidgetrepo.h
+debian/tmp/usr/include/kde/audiocdencoder.h
+debian/tmp/usr/include/kde/cmodule.h
+debian/tmp/usr/include/kde/effectview.h
+debian/tmp/usr/include/kde/equalizerview.h
+debian/tmp/usr/include/kde/ksaver.h
+debian/tmp/usr/include/kde/libkcddb/cache.h
+debian/tmp/usr/include/kde/libkcddb/cddb.h
+debian/tmp/usr/include/kde/libkcddb/cdinfo.h
+debian/tmp/usr/include/kde/libkcddb/client.h
+debian/tmp/usr/include/kde/libkcddb/config.h
+debian/tmp/usr/include/kde/libkcddb/configbase.h
+debian/tmp/usr/include/kde/mimetypetree.h
+debian/tmp/usr/include/kde/mpeglib/decoder/cddaPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/command.h
+debian/tmp/usr/include/kde/mpeglib/decoder/commandPipe.h
+debian/tmp/usr/include/kde/mpeglib/decoder/decoderPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/mpegPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/mpgPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/nukePlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/splayPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/tplayPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/vorbisPlugin.h
+debian/tmp/usr/include/kde/mpeglib/decoder/yuvPlugin.h
+debian/tmp/usr/include/kde/mpeglib/frame/IOFrameQueue.h
+debian/tmp/usr/include/kde/mpeglib/frame/audioFrame.h
+debian/tmp/usr/include/kde/mpeglib/frame/audioFrameQueue.h
+debian/tmp/usr/include/kde/mpeglib/frame/floatFrame.h
+debian/tmp/usr/include/kde/mpeglib/frame/frame.h
+debian/tmp/usr/include/kde/mpeglib/frame/frameQueue.h
+debian/tmp/usr/include/kde/mpeglib/frame/framer.h
+debian/tmp/usr/include/kde/mpeglib/frame/pcmFrame.h
+debian/tmp/usr/include/kde/mpeglib/frame/rawDataBuffer.h
+debian/tmp/usr/include/kde/mpeglib/frame/rawFrame.h
+debian/tmp/usr/include/kde/mpeglib/input/bufferInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/cddaInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/cdromInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/fileInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/httpInputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/inputDetector.h
+debian/tmp/usr/include/kde/mpeglib/input/inputPlugin.h
+debian/tmp/usr/include/kde/mpeglib/input/inputStream.h
+debian/tmp/usr/include/kde/mpeglib/input/threadSafeInputStream.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/mpegSystemHeader.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/mpegSystemStream.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/mpegVideoLength.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/pesSystemStream.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/psSystemStream.h
+debian/tmp/usr/include/kde/mpeglib/mpegutil/tsSystemStream.h
+debian/tmp/usr/include/kde/mpeglib/oggvorbis/oggFrame.h
+debian/tmp/usr/include/kde/mpeglib/oggvorbis/ovFramer.h
+debian/tmp/usr/include/kde/mpeglib/oggvorbis/vorbisDecoder.h
+debian/tmp/usr/include/kde/mpeglib/oggvorbis/vorbisInfo.h
+debian/tmp/usr/include/kde/mpeglib/output/artsOutputStream.h
+debian/tmp/usr/include/kde/mpeglib/output/audioTime.h
+debian/tmp/usr/include/kde/mpeglib/output/avSyncer.h
+debian/tmp/usr/include/kde/mpeglib/output/dspX11OutputStream.h
+debian/tmp/usr/include/kde/mpeglib/output/outPlugin.h
+debian/tmp/usr/include/kde/mpeglib/output/outputStream.h
+debian/tmp/usr/include/kde/mpeglib/output/pluginInfo.h
+debian/tmp/usr/include/kde/mpeglib/output/threadSafeOutputStream.h
+debian/tmp/usr/include/kde/mpeglib/splay/mpegAudioFrame.h
+debian/tmp/usr/include/kde/mpeglib/splay/mpegAudioInfo.h
+debian/tmp/usr/include/kde/mpeglib/splay/splayDecoder.h
+debian/tmp/usr/include/kde/mpeglib/util/abstract/abs_thread.h
+debian/tmp/usr/include/kde/mpeglib/util/abstract/threadQueue.h
+debian/tmp/usr/include/kde/mpeglib/util/dynBuffer.h
+debian/tmp/usr/include/kde/mpeglib/util/file/fileAccess.h
+debian/tmp/usr/include/kde/mpeglib/util/mmx/mm_accel.h
+debian/tmp/usr/include/kde/mpeglib/util/mmx/mmx.h
+debian/tmp/usr/include/kde/mpeglib/util/mmx/mmx_asm.h
+debian/tmp/usr/include/kde/mpeglib/util/render/pictureArray.h
+debian/tmp/usr/include/kde/mpeglib/util/render/yuvPicture.h
+debian/tmp/usr/include/kde/mpeglib/util/syncClock.h
+debian/tmp/usr/include/kde/mpeglib/util/timeStamp.h
+debian/tmp/usr/include/kde/mpeglib/util/timeStampArray.h
+debian/tmp/usr/include/kde/mpeglib/util/timeWrapper.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/buffer.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
+debian/tmp/usr/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
+debian/tmp/usr/include/kde/mpeglib_artsplug/decoderBaseObject.h
+debian/tmp/usr/include/kde/mpeglib_artsplug/decoderBaseObject.idl
+debian/tmp/usr/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h
+debian/tmp/usr/include/kde/mpeglib_artsplug/splayPlayObject.h
+debian/tmp/usr/include/kde/mpeglib_artsplug/splayPlayObject.idl
+debian/tmp/usr/include/kde/mpeglib_artsplug/splayPlayObject_impl.h
+debian/tmp/usr/include/kde/noatun/app.h
+debian/tmp/usr/include/kde/noatun/controls.h
+debian/tmp/usr/include/kde/noatun/conversion.h
+debian/tmp/usr/include/kde/noatun/downloader.h
+debian/tmp/usr/include/kde/noatun/effects.h
+debian/tmp/usr/include/kde/noatun/engine.h
+debian/tmp/usr/include/kde/noatun/equalizer.h
+debian/tmp/usr/include/kde/noatun/noatunarts.h
+debian/tmp/usr/include/kde/noatun/player.h
+debian/tmp/usr/include/kde/noatun/playlist.h
+debian/tmp/usr/include/kde/noatun/playlistsaver.h
+debian/tmp/usr/include/kde/noatun/plugin.h
+debian/tmp/usr/include/kde/noatun/pluginloader.h
+debian/tmp/usr/include/kde/noatun/pref.h
+debian/tmp/usr/include/kde/noatun/scrollinglabel.h
+debian/tmp/usr/include/kde/noatun/stdaction.h
+debian/tmp/usr/include/kde/noatun/stereobuttonaction.h
+debian/tmp/usr/include/kde/noatun/tags.h
+debian/tmp/usr/include/kde/noatun/vequalizer.h
+debian/tmp/usr/include/kde/noatun/video.h
+debian/tmp/usr/include/kde/noatun/winskinvis.h
+debian/tmp/usr/include/kde/plugin_deps.h
+debian/tmp/usr/lib/libarts_mpeglib.so
+debian/tmp/usr/lib/libarts_splay.so
+debian/tmp/usr/lib/libartsbuilder.so
+debian/tmp/usr/lib/libartscontrolapplet.so
+debian/tmp/usr/lib/libartscontrolsupport.so
+debian/tmp/usr/lib/libartsgui.so
+debian/tmp/usr/lib/libartsgui_idl.la
+debian/tmp/usr/lib/libartsgui_idl.so
+debian/tmp/usr/lib/libartsgui_kde.so
+debian/tmp/usr/lib/libartsmidi.so
+debian/tmp/usr/lib/libartsmidi_idl.la
+debian/tmp/usr/lib/libartsmidi_idl.so
+debian/tmp/usr/lib/libartsmodules.la
+debian/tmp/usr/lib/libartsmodules.so
+debian/tmp/usr/lib/libartsmodulescommon.so
+debian/tmp/usr/lib/libartsmoduleseffects.so
+debian/tmp/usr/lib/libartsmodulesmixers.so
+debian/tmp/usr/lib/libartsmodulessynth.so
+debian/tmp/usr/lib/libaudiocdplugins.la
+debian/tmp/usr/lib/libaudiocdplugins.so
+debian/tmp/usr/lib/libkcddb.la
+debian/tmp/usr/lib/libkcddb.so
+debian/tmp/usr/lib/libkdeinit_kmix.la
+debian/tmp/usr/lib/libkdeinit_kmixctrl.la
+debian/tmp/usr/lib/libkdeinit_krec.la
+debian/tmp/usr/lib/libkdeinit_noatun.la
+debian/tmp/usr/lib/libkmidlib.la
+debian/tmp/usr/lib/libkmidlib.so
+debian/tmp/usr/lib/libmpeg.la
+debian/tmp/usr/lib/libmpeg.so
+debian/tmp/usr/lib/libnoatun.la
+debian/tmp/usr/lib/libnoatun.so
+debian/tmp/usr/lib/libnoatuncontrols.la
+debian/tmp/usr/lib/libnoatuncontrols.so
+debian/tmp/usr/lib/libnoatuntags.la
+debian/tmp/usr/lib/libnoatuntags.so
+debian/tmp/usr/lib/libyafcore.la
+debian/tmp/usr/lib/libyafcore.so
+debian/tmp/usr/lib/libyafxplayer.la
+debian/tmp/usr/lib/libyafxplayer.so

Added: 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.artsbuilder	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-artsbuilder
+Title: Artsbuilder Handbook
+Author: Stefan Westerfeld, Jeff Tranter 
+Abstract: This handbook describes aRts, the Analog Real-time Synthesizer.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/artsbuilder/index.html
+Files: /usr/share/doc/kde/HTML/en/artsbuilder/*.html
+

Added: 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.juk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-juk
+Title: Juk Handbook
+Author: Michael Pyne, Scott Wheeler
+Abstract: Juk is a jukebox, tagger and music collection manager.
+Section: Apps/Music
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/juk/index.html
+Files: /usr/share/doc/kde/HTML/en/juk/*.html
+

Added: 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.kaboodle	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-kaboodle
+Title: Kaboodle Handbook
+Author: The KDE team.
+Abstract: Kaboodle is a one file quick media player for KDE.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kaboodle/index.html
+Files: /usr/share/doc/kde/HTML/en/kaboodle/*.html
+

Added: 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.kmid	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-kmid
+Title: KMid Handbook
+Author: Antonio Larrosa Jimenez
+Abstract: KMid is a midi/karaoke multimedia player for KDE.
+Section: Apps/Music
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmid/index.html
+Files: /usr/share/doc/kde/HTML/en/kmid/*.html
+

Added: 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.kmix	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Document: kdemultimedia-doc-html-kmix
+Title: KMix Handbook
+Author: Matt Johnson, Christian Esken, Helio Chissini de Castro,
+ Stefan Schimanski, Lauri Watts
+Abstract: KMix is an application to allow you to change the volume of
+ your sound card.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmix/index.html
+Files: /usr/share/doc/kde/HTML/en/kmix/*.html
+

Added: 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.krec	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-krec
+Title: KRec Handbook
+Author: Arnold Krille
+Abstract: KRec is a sound recording application for aRts and KDE.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/krec/index.html
+Files: /usr/share/doc/kde/HTML/en/krec/*.html
+

Added: 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.kscd	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdemultimedia-doc-html-kscd
+Title: KsCD Handbook
+Author: Jonathan Singer, David White, Bernd Johannes Wuebben,
+ Dirk Foersterling, Lauri Watts
+Abstract: KsCD is a small, fast, CDDB-enabled audio CD player for KDE.
+Section: Apps/Music
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kscd/index.html
+Files: /usr/share/doc/kde/HTML/en/kscd/*.html
+

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdemultimedia-doc-html-noatun
+Title: NoAtun Handbook
+Author: Charles Samuels
+Abstract: NoAtun is a fully-featured plugin-based media player for KDE.
+Section: Apps/Sound
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/noatun/index.html
+Files: /usr/share/doc/kde/HTML/en/noatun/*.html
+

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kappfinder-data.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kappfinder-data.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kappfinder-data.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,20 @@
+debian/tmp/etc/xdg/menus/kde-applications-merged/kde-multimedia-music.menu
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ams.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/amsynth.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ardour.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/djplay.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ecamegapedal.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/freebirth.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/freqtweak.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/galan.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/hydrogen.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/jack-rack.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/jamin.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/meterbridge.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/mixxx.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/muse.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/qjackctl.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/qsynth.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/vkeybd.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/zynaddsubfx.desktop
+debian/tmp/usr/share/desktop-directories/kde-multimedia-music.directory

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kfile-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kfile-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kfile-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,33 @@
+debian/tmp/usr/lib/kde3/kfile_au.la
+debian/tmp/usr/lib/kde3/kfile_au.so
+debian/tmp/usr/lib/kde3/kfile_avi.la
+debian/tmp/usr/lib/kde3/kfile_avi.so
+debian/tmp/usr/lib/kde3/kfile_flac.la
+debian/tmp/usr/lib/kde3/kfile_flac.so
+debian/tmp/usr/lib/kde3/kfile_m3u.la
+debian/tmp/usr/lib/kde3/kfile_m3u.so
+debian/tmp/usr/lib/kde3/kfile_mp3.la
+debian/tmp/usr/lib/kde3/kfile_mp3.so
+debian/tmp/usr/lib/kde3/kfile_mpc.la
+debian/tmp/usr/lib/kde3/kfile_mpc.so
+debian/tmp/usr/lib/kde3/kfile_mpeg.la
+debian/tmp/usr/lib/kde3/kfile_mpeg.so
+debian/tmp/usr/lib/kde3/kfile_ogg.la
+debian/tmp/usr/lib/kde3/kfile_ogg.so
+debian/tmp/usr/lib/kde3/kfile_sid.la
+debian/tmp/usr/lib/kde3/kfile_sid.so
+debian/tmp/usr/lib/kde3/kfile_theora.la
+debian/tmp/usr/lib/kde3/kfile_theora.so
+debian/tmp/usr/lib/kde3/kfile_wav.la
+debian/tmp/usr/lib/kde3/kfile_wav.so
+debian/tmp/usr/share/services/kfile_au.desktop
+debian/tmp/usr/share/services/kfile_avi.desktop
+debian/tmp/usr/share/services/kfile_flac.desktop
+debian/tmp/usr/share/services/kfile_m3u.desktop
+debian/tmp/usr/share/services/kfile_mp3.desktop
+debian/tmp/usr/share/services/kfile_mpc.desktop
+debian/tmp/usr/share/services/kfile_mpeg.desktop
+debian/tmp/usr/share/services/kfile_ogg.desktop
+debian/tmp/usr/share/services/kfile_sid.desktop
+debian/tmp/usr/share/services/kfile_theora.desktop
+debian/tmp/usr/share/services/kfile_wav.desktop

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kio-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kio-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kdemultimedia-kio-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+debian/tmp/usr/lib/kde3/kcm_audiocd.la
+debian/tmp/usr/lib/kde3/kcm_audiocd.so
+debian/tmp/usr/lib/kde3/kio_audiocd.la
+debian/tmp/usr/lib/kde3/kio_audiocd.so
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_flac.la
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_flac.so
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_lame.la
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_lame.so
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_vorbis.la
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_vorbis.so
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_wav.la
+debian/tmp/usr/lib/kde3/libaudiocd_encoder_wav.so
+debian/tmp/usr/lib/libaudiocdplugins.so.1
+debian/tmp/usr/lib/libaudiocdplugins.so.1.0.0
+debian/tmp/usr/share/applications/kde/audiocd.desktop
+debian/tmp/usr/share/apps/kconf_update/audiocd.upd
+debian/tmp/usr/share/apps/kconf_update/upgrade-metadata.sh
+debian/tmp/usr/share/config.kcfg/audiocd_lame_encoder.kcfg
+debian/tmp/usr/share/config.kcfg/audiocd_vorbis_encoder.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kioslave/audiocd.docbook
+debian/tmp/usr/share/services/audiocd.protocol

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kmid.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kmid.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kmid.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+kmid for Debian
+---------------
+
+kmid can be used with a hardware synth or with timidity by running 
+"timidity -iA -Os".
+
+ -- Christopher L Cheney <ccheney at debian.org>, Sun, 21 Dec 2003 22:00:00 -0600

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kmid.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kmid.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kmid.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,40 @@
+debian/tmp/usr/bin/kmid
+debian/tmp/usr/lib/kde3/libkmidpart.la
+debian/tmp/usr/lib/kde3/libkmidpart.so
+debian/tmp/usr/lib/libkmidlib.so.0
+debian/tmp/usr/lib/libkmidlib.so.0.0.0
+debian/tmp/usr/share/applications/kde/kmid.desktop
+debian/tmp/usr/share/apps/kmid/DiesIrae.kar
+debian/tmp/usr/share/apps/kmid/Guantanamera.kar
+debian/tmp/usr/share/apps/kmid/MariaDeLasMercedes.kar
+debian/tmp/usr/share/apps/kmid/OFortuna.kar
+debian/tmp/usr/share/apps/kmid/fm/drums.o3
+debian/tmp/usr/share/apps/kmid/fm/drums.sb
+debian/tmp/usr/share/apps/kmid/fm/std.o3
+debian/tmp/usr/share/apps/kmid/fm/std.sb
+debian/tmp/usr/share/apps/kmid/icons/button1.xpm
+debian/tmp/usr/share/apps/kmid/icons/button2.xpm
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/16x16/actions/piano.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/16x16/actions/volume.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/22x22/actions/piano.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/22x22/actions/volume.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/32x32/actions/piano.png
+debian/tmp/usr/share/apps/kmid/icons/crystalsvg/32x32/actions/volume.png
+debian/tmp/usr/share/apps/kmid/icons/keyboard.xpm
+debian/tmp/usr/share/apps/kmid/kmid_partui.rc
+debian/tmp/usr/share/apps/kmid/kmidui.rc
+debian/tmp/usr/share/apps/kmid/maps/YamahaPSR500.map
+debian/tmp/usr/share/apps/kmid/maps/YamahaPSS790.map
+debian/tmp/usr/share/apps/kmid/maps/YamahaQY10.map
+debian/tmp/usr/share/apps/kmid/maps/gm.map
+debian/tmp/usr/share/doc/kde/HTML/en/kmid/common
+debian/tmp/usr/share/doc/kde/HTML/en/kmid/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kmid/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmid.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmid.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kmid.png
+debian/tmp/usr/share/mimelnk/audio/x-karaoke.desktop
+debian/tmp/usr/share/servicetypes/audiomidi.desktop
+
+debian/icons/kmid.xpm		/usr/share/pixmaps
+debian/icons/kmid-16.xpm	/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,53 @@
+debian/tmp/usr/bin/kmix
+debian/tmp/usr/bin/kmixctrl
+debian/tmp/usr/lib/kde3/kmix.la
+debian/tmp/usr/lib/kde3/kmix.so
+debian/tmp/usr/lib/kde3/kmix_panelapplet.la
+debian/tmp/usr/lib/kde3/kmix_panelapplet.so
+debian/tmp/usr/lib/kde3/kmixctrl.la
+debian/tmp/usr/lib/kde3/kmixctrl.so
+debian/tmp/usr/lib/libkdeinit_kmix.so
+debian/tmp/usr/lib/libkdeinit_kmixctrl.so
+debian/tmp/usr/share/applications/kde/kmix.desktop
+debian/tmp/usr/share/apps/kicker/applets/kmixapplet.desktop
+debian/tmp/usr/share/apps/kmix/kmixui.rc
+debian/tmp/usr/share/apps/kmix/pics/Listener.png
+debian/tmp/usr/share/apps/kmix/pics/SpeakerFrontLeft.png
+debian/tmp/usr/share/apps/kmix/pics/SpeakerFrontRight.png
+debian/tmp/usr/share/apps/kmix/pics/SpeakerRearLeft.png
+debian/tmp/usr/share/apps/kmix/pics/SpeakerRearRight.png
+debian/tmp/usr/share/apps/kmix/pics/kmixdocked.png
+debian/tmp/usr/share/apps/kmix/pics/kmixdocked_error.png
+debian/tmp/usr/share/apps/kmix/pics/kmixdocked_mute.png
+debian/tmp/usr/share/apps/kmix/pics/mix_ac97.png
+debian/tmp/usr/share/apps/kmix/pics/mix_audio.png
+debian/tmp/usr/share/apps/kmix/pics/mix_bass.png
+debian/tmp/usr/share/apps/kmix/pics/mix_cd.png
+debian/tmp/usr/share/apps/kmix/pics/mix_digital.png
+debian/tmp/usr/share/apps/kmix/pics/mix_ext.png
+debian/tmp/usr/share/apps/kmix/pics/mix_headphone.png
+debian/tmp/usr/share/apps/kmix/pics/mix_microphone.png
+debian/tmp/usr/share/apps/kmix/pics/mix_midi.png
+debian/tmp/usr/share/apps/kmix/pics/mix_recmon.png
+debian/tmp/usr/share/apps/kmix/pics/mix_record.png
+debian/tmp/usr/share/apps/kmix/pics/mix_surround.png
+debian/tmp/usr/share/apps/kmix/pics/mix_treble.png
+debian/tmp/usr/share/apps/kmix/pics/mix_unknown.png
+debian/tmp/usr/share/apps/kmix/pics/mix_video.png
+debian/tmp/usr/share/apps/kmix/pics/mix_volume.png
+debian/tmp/usr/share/autostart/restore_kmix_volumes.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/common
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/kmix-channel-playback.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/kmix-channel-record.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmix/kmix-window.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kmix.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmix.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmix.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kmix.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kmix.png
+debian/tmp/usr/share/services/kmixctrl_restore.desktop
+
+debian/icons/kmix.xpm		/usr/share/pixmaps
+debian/icons/kmix-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kmix.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+kmix: no-shlibs-control-file usr/lib/libkdeinit_kmixctrl.so
+kmix: no-shlibs-control-file usr/lib/libkdeinit_kmix.so
+kmix: postinst-must-call-ldconfig usr/lib/libkdeinit_kmixctrl.so
+kmix: postrm-should-call-ldconfig usr/lib/libkdeinit_kmixctrl.so

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

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

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/krec.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/krec.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/krec.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,42 @@
+debian/tmp/usr/bin/krec
+debian/tmp/usr/lib/kde3/kcm_krec.la
+debian/tmp/usr/lib/kde3/kcm_krec.so
+debian/tmp/usr/lib/kde3/kcm_krec_files.la
+debian/tmp/usr/lib/kde3/kcm_krec_files.so
+debian/tmp/usr/lib/kde3/krec.la
+debian/tmp/usr/lib/kde3/krec.so
+debian/tmp/usr/lib/kde3/libkrecexport_ogg.la
+debian/tmp/usr/lib/kde3/libkrecexport_ogg.so
+debian/tmp/usr/lib/kde3/libkrecexport_wave.la
+debian/tmp/usr/lib/kde3/libkrecexport_wave.so
+debian/tmp/usr/lib/libkdeinit_krec.so
+debian/tmp/usr/share/applications/kde/krec.desktop
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/32x32/actions/krec_record.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_fileempty.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_fileplay.png
+debian/tmp/usr/share/apps/krec/icons/crystalsvg/32x32/mimetypes/krec_filerec.png
+debian/tmp/usr/share/apps/krec/krecui.rc
+debian/tmp/usr/share/apps/krec/tips
+debian/tmp/usr/share/doc/kde/HTML/en/krec/common
+debian/tmp/usr/share/doc/kde/HTML/en/krec/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/krec/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/krec/krec-configuration.png
+debian/tmp/usr/share/doc/kde/HTML/en/krec/krec-hicolor.png
+debian/tmp/usr/share/doc/kde/HTML/en/krec/krec-keramik.png
+debian/tmp/usr/share/doc/kde/HTML/en/krec/krec-new_file_properties.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/krec.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/krec.png
+debian/tmp/usr/share/services/kcm_krec.desktop
+debian/tmp/usr/share/services/kcm_krec_files.desktop
+debian/tmp/usr/share/services/krec_exportogg.desktop
+debian/tmp/usr/share/services/krec_exportwave.desktop
+debian/tmp/usr/share/servicetypes/krec_exportitem.desktop
+
+debian/icons/krec.xpm		/usr/share/pixmaps
+debian/icons/krec-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/krec.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/krec.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/krec.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+krec: no-shlibs-control-file usr/lib/libkdeinit_krec.so
+krec: postinst-must-call-ldconfig usr/lib/libkdeinit_krec.so
+krec: postrm-should-call-ldconfig usr/lib/libkdeinit_krec.so

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

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

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/kscd.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/kscd.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/kscd.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,33 @@
+debian/tmp/usr/bin/kscd
+debian/tmp/usr/bin/workman2cddb.pl
+debian/tmp/usr/share/applications/kde/kscd.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/audiocd_play.desktop
+debian/tmp/usr/share/apps/kscd/icons/crystalsvg/22x22/actions/cdsmall.png
+debian/tmp/usr/share/apps/profiles/kscd.profile.xml
+debian/tmp/usr/share/config.kcfg/kscd.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/common
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd11.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd12.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd13.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd14.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd16.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd18.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd19.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd2.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd3.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd5.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd6.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscd9.png
+debian/tmp/usr/share/doc/kde/HTML/en/kscd/kscdannounc.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kscd.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kscd.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kscd.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kscd.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kscd.png
+debian/tmp/usr/share/mimelnk/text/xmcd.desktop
+
+debian/icons/kscd.xpm		/usr/share/pixmaps
+debian/icons/kscd-16.xpm	/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-akode.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-akode.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-akode.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+debian/tmp/usr/lib/libarts_akode.la
+debian/tmp/usr/lib/libarts_akode.so
+debian/tmp/usr/lib/mcop/akodearts.mcoptype
+debian/tmp/usr/lib/mcop/akodearts.mcopclass
+debian/tmp/usr/lib/mcop/akodePlayObject.mcopclass
+debian/tmp/usr/lib/mcop/akodeMPCPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/akodeXiphPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/akodeVorbisStreamPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/akodeSpeexStreamPlayObject.mcopclass

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-audiofile.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-audiofile.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-audiofile.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/libaudiofilearts.la
+debian/tmp/usr/lib/libaudiofilearts.so
+debian/tmp/usr/lib/mcop/Arts/audiofilePlayObject.mcopclass
+debian/tmp/usr/lib/mcop/audiofilearts.mcopclass
+debian/tmp/usr/lib/mcop/audiofilearts.mcoptype

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-audiofile.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-audiofile.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-audiofile.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+libarts1-audiofile: no-shlibs-control-file usr/lib/libaudiofilearts.so

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-mpeglib.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-mpeglib.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-mpeglib.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+debian/tmp/usr/bin/mpeglibartsplay
+debian/tmp/usr/lib/libarts_mpeglib-0.3.0.so.0
+debian/tmp/usr/lib/libarts_mpeglib-0.3.0.so.0.0.3
+debian/tmp/usr/lib/libarts_mpeglib.la
+debian/tmp/usr/lib/libarts_splay.la
+debian/tmp/usr/lib/libarts_splay.so.0
+debian/tmp/usr/lib/libarts_splay.so.0.0.0
+debian/tmp/usr/lib/mcop/CDDAPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/MP3PlayObject.mcopclass
+debian/tmp/usr/lib/mcop/NULLPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/OGGPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/SplayPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/WAVPlayObject.mcopclass

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-xine.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-xine.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-xine.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+debian/tmp/usr/lib/kde3/videothumbnail.la
+debian/tmp/usr/lib/kde3/videothumbnail.so
+debian/tmp/usr/lib/libarts_xine.la
+debian/tmp/usr/lib/libarts_xine.so
+debian/tmp/usr/lib/mcop/xineAudioPlayObject.mcopclass
+debian/tmp/usr/lib/mcop/xineVideoPlayObject.mcopclass
+debian/tmp/usr/share/apps/videothumbnail/sprocket-large.png
+debian/tmp/usr/share/apps/videothumbnail/sprocket-medium.png
+debian/tmp/usr/share/apps/videothumbnail/sprocket-small.png
+debian/tmp/usr/share/services/videothumbnail.desktop

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-xine.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-xine.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/libarts1-xine.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+libarts1-xine: no-shlibs-control-file usr/lib/libarts_xine.so

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/libkcddb1.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/libkcddb1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/libkcddb1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+debian/tmp/usr/lib/kde3/kcm_cddb.la
+debian/tmp/usr/lib/kde3/kcm_cddb.so
+debian/tmp/usr/lib/libkcddb.so.1
+debian/tmp/usr/lib/libkcddb.so.1.0.0
+debian/tmp/usr/share/applications/kde/libkcddb.desktop
+debian/tmp/usr/share/apps/kconf_update/kcmcddb-emailsettings.upd
+debian/tmp/usr/share/config.kcfg/libkcddb.kcfg

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/man/juk.1
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/man/juk.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/man/juk.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+.TH "JuK" "1" "October 2003"
+.SH "NAME"
+juk \- music organizer and player for KDE
+.SH "SYNOPSIS"
+\fBjuk\fR
+.SH "DESCRIPTION"
+.LP 
+
+JuK (pronounced "jook") is a jukebox and music manager for the KDE
+desktop similar to jukebox software on other platforms such as
+iTunes or RealOne.
+
+.
+.SH "OPTIONS"
+.l
+\fIjuk\fP does not accept any command-line options.
+.
+
+.SH "AUTHOR"
+This page was written by David Schleef <ds at schleef.org> for Debian,
+but may be used elsewhere.
+

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/man/kaboodle.1
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/man/kaboodle.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/man/kaboodle.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,261 @@
+.lf 1 info/kdemultimedia.kaboodle.1
+.TH KABOODLE 1 "May 2003" KDE "KDE Application"
+.SH NAME
+kaboodle \- KDE simple and lean Media Player
+.SH SYNOPSIS
+.B kaboodle
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIURL\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kaboodle
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B Kaboodle
+is a simple KMedia (aRts) player for KDE, which can play standalone,
+or embedded in Konqueror. The embedded player should work for media embedded in khtml, too.
+It is meant for simple stuff like playing a quick video or sound file. 
+.B Kaboodle
+does not accept plugins, does not have a playlist or volume control and other such features.
+.P
+To get a media-player with a full-fledged user interface, look at
+.BR noatun (1)
+.SH OPTIONS
+.SS "Arguments:"
+.TP
+URL
+URL of media file to play
+.SS "General Options"
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v\fR, \fB\-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.lf 1 info/kdeqtoptions
+.SS "KDE options"
+.TP 12
+.BI \-\-caption \ caption
+Use \fIcaption\fP as name in the titlebar.
+.TP
+.BI \-\-icon \ icon
+Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
+icon, which can either be an absolute filename path, or otherwise the
+icon is sought for in places according to the normal KDE rules.
+.TP
+.BI \-\-miniicon \ icon
+Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
+of the icon, according to the same rules as for the \-\-icon parameter.
+.TP
+.BI \-\-config \ filename
+Use an alternative configuration file, instead of the default, which
+is normally located in
+.I /usr/share/config
+or in
+.RB $ KDEHOME\fI/share/config
+.TP
+.BI \-\-dcopserver \ server
+Set the address of the DCOP server to attach to.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps. This option has the same
+effect as definiting the environment variable KDE_DEBUG.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.BI \-\-style \ style
+sets the application GUI style.
+.TP
+.BI \-\-geometry \ geometry
+sets the client geometry of the main widget.
+The geometry parameter follows the normal X convention for geometry,
+which is on the form:
+.RS
+.IP
+[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
+.P
+Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
+height, of the main application window. Both in pixels. A value of 0
+specifies the default size. The optional \fIxpos\fR and \fIypos\fR
+specifies the x,y-position that which is desired for the application
+window. Specifying negative values for x or y implies that the x or y
+position is to be measured from the left or bottom screen edge,
+instead of as in the normal case, with positive values, from the left
+and top edges. 
+.RE
+.SS "Qt options"
+.TP 12
+.BI \-\-display \ displayname
+Use the X-server display \fIdisplayname\fP.
+.TP
+.BI \-\-session \ sessionId
+Restore the application for the given \fIsessionId\fP.
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display.
+.TP
+.BI \-\-ncols \ count
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit
+.B \-nograb, use \fB\-dograb\fR to override.
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging.
+.TP
+.BI "\-\-fn\fR, \fP\-\-font" \ fontname
+Defines the default application font. The \fIfontname\fP should be in
+the X logical font name description format XLFD. For a full description of
+the format see
+.I /usr/X11R6/lib/X11/doc/xlfd.TXT
+Note that the application might override the font specified with
+its own font.
+.TP
+.BI "-\-bg\fR, \fB\-\-background"  \ color
+Sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
+Sets the default foreground color.
+.TP
+.BI \-\-btn\fR, \fB\-\-button \ color
+Sets the default button color.
+.TP
+.BI \-\-name \ name
+Sets the application name.
+.TP
+.BI \-\-title \ title
+Sets the application title. This option might, or might not appear
+in the title bar caption, depending on the application. To change the caption, use the 
+.B \-\-caption
+option instead. 
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.BI \-\-inputstyle \ inputstyle
+Sets XIM (X Input Method) input style. Possible
+values are 
+.BR onthespot ", " overthespot ", " offthespot and root .
+.TP
+.BI \-\-im " XIM-server"
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+.TP
+.B \-\-reverse
+Mirror reverses the whole layout of widgets. This means that menus
+will go in the opposite direction, the scroll bar will be on the
+opposite side, etc. For a normal western layout that means that menus
+and tool bars will go from the right edge to the left, the vertical
+scroll bar will be on the left side and so on.
+
+.lf 53 info/kdemultimedia.kaboodle.1
+.SH ENVIRONMENT
+.lf 1 info/kdeenviron
+.SS "standard KDE environment variables"
+.IP KDE_LANG
+Language locale setting to use. This option makes it possible to set
+another language environment for a program than what is the default. The
+correct language pack for this language has to be installed for this option
+to work. The default language when there is none set is en_US. When
+deciding upon a language, the following resources are looked up, in
+order: KDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
+LANG.
+.IP KDE_UTF8_FILENAMES
+Assume that all filenames are in UTF-8 format regardless of the
+current language setting. Otherwise the filename format is defined by
+the language.
+.IP KDE_MULTIHEAD
+If this variable has the value
+.B true
+multihead multiple display mode is enabled. The KDE display will be
+shared over more than one screen.
+.IP DISPLAY
+Specifies the X display to run KDE on.
+.IP KDESYCOCA
+Specifies and alternative path for the 
+.I ksycoca
+KDE system configuration cache file.
+The default path is
+/tmp/kde-$USER/ksycoca
+.IP DCOPSERVER
+Specifies an alternative path for the DCOP server file. The default
+file is
+$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
+.IP SESSION_MANAGER
+The session manager to use. This option is set automatically by KDE
+and is a network path to the session manager socket.
+.IP HOME
+Path to the home directory for the current user. 
+.IP KDEHOME
+The KDE per-user setting directory. Default if not specified is
+.I $HOME/.kde
+.lf 55 info/kdemultimedia.kaboodle.1
+.SH FILES
+.TP
+.I $HOME/.kde/share/config/kaboodlerc
+configuration file.
+.SH AUTHOR
+Kaboodle was written by
+.nh
+.ad l
+Neil Stevens <neil at qualityassistant.com>,
+Nikolas Zimmermann <wildfox at kde.org>,
+and Charles Samuels <charles at kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+.ad l
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.BR noatun (1)
+.br
+The full documentation for
+.B kaboodle
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kaboodle
+.PP
+should give you access to the complete manual.
+.P
+Alternatively the manual can be browsed in
+.B konqueror
+giving it the URL help:/kaboodle

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/man/kaudiocreator.1
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/man/kaudiocreator.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/man/kaudiocreator.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,145 @@
+.TH kaudiocreator 1 "Nov 2005" "K Desktop Environment" ""
+.SH NAME
+kaudiocreator \- CD ripper and audio encoder front-end
+.SH SYNOPSIS
+kaudiocreator [Qt-options] [KDE-options] 
+.SH DESCRIPTION
+.B kaudiocreator 
+is the CD ripper and audio encoder front-end for the K Desktop Environment. It
+supports many encoders like 
+.BR lame (1),
+.BR oggenc (1),
+.BR flac (1),
+and performs CDDB queries.
+
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  --help  
+Show help about options
+.TP
+.B  --help-qt  
+Show Qt specific options
+.TP
+.B  --help-kde  
+Show KDE specific options
+.TP
+.B  --help-all  
+Show all options
+.TP
+.B  --author  
+Show author information
+.TP
+.B -v,  --version  
+Show version information
+.TP
+.B  --license  
+Show license information
+.TP
+.B  --  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  --caption  <caption>
+Use 'caption' as name in the title bar
+.TP
+.B  --icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  --miniicon  <icon>
+Use 'icon' as the icon in the title bar
+.TP
+.B  --config  <filename>
+Use alternative configuration file
+.TP
+.B  --dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  --nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  --waitforwm  
+Waits for a WM_NET compatible window manager
+.TP
+.B  --style  <style>
+sets the application GUI style
+.TP
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
+.SS 
+.SS Qt options:
+.TP
+.B  --display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  --session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  --cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  --ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  --nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  --dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  --sync  
+switches to synchronous mode for debugging
+.TP
+.B --fn,  --font  <fontname>
+defines the application font
+.TP
+.B --bg,  --background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B --fg,  --foreground  <color>
+sets the default foreground color
+.TP
+.B --btn,  --button  <color>
+sets the default button color
+.TP
+.B  --name  <name>
+sets the application name
+.TP
+.B  --title  <title>
+sets the application title (caption)
+.TP
+.B  --visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  --inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  --im  <XIM server>
+set XIM server
+.TP
+.B  --noxim  
+disable XIM
+.TP
+.B  --reverse  
+mirrors the whole layout of widgets
+ 
+
+.SH AUTHOR
+Benjamin Meyer <ben+kaudiocreator at meyerhome.net>
+
+Please use <http://bugs.kde.org> to report bugs, do not mail the authors
+directly.
+
+
+This man-page was written by Francois Wendling <frwendling at free.fr>

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/man/kmix.1
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/man/kmix.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/man/kmix.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,49 @@
+.TH KMIX 1 "August, 15 2003"
+.SH NAME
+Kmix \- KDE audio mini-mixer
+.SH SYNOPSIS
+.B kmix 
+.RI [ OPTIONS ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kmix
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+\fBKmix\fP is a mini audio mixer for kde. It allows the user to change
+volume settings for each sound device (master, CD, line, mic, ...).
+.SH OPTIONS
+A summary of options for Kmix is included below.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-kde
+Show KDE specific help (common for all KDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+
+.SH SEE ALSO
+.BR kmixctrl (1),
+.PP
+For more details, you should have a look at the KDE Help center, available
+from the K menu.
+.SH AUTHOR
+This manual page was written by Clément Stenac <zorglub at via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kmix was written by the KDE project.

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/man/kmixctrl.1
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/man/kmixctrl.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/man/kmixctrl.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,54 @@
+.TH KMIXCTRL 1 "August, 25 2003"
+.SH NAME
+kmixctrl \- Settings loader/saver for kmix
+.SH SYNOPSIS
+.B kmixctrl 
+.RI [ OPTIONS ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kmixctrl
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+\fBkmixctrl\fP is used to save or restore the settings of \fIkmix\fP.
+.SH OPTIONS
+A summary of options for kmixctrl is included below.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-kde
+Show KDE specific help (common for all KDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-s, \-\-save
+Save the current settings as default
+.TP
+.B \-r, \-\-restore
+Restores the default settings
+
+.SH SEE ALSO
+.BR kmix (1),
+.PP
+For more details, you should have a look at the KDE Help center, available
+from the K menu.
+.SH AUTHOR
+This manual page was written by Clément Stenac <zorglub at via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kmixctrl was written by the KDE project.

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/man/krec.1
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/man/krec.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/man/krec.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,59 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
+.TH krec "1" "July 2004" "Debian" "User Commands"
+.SH NAME
+krec \- A voice recording program
+.SH SYNOPSIS
+.B krec
+[\fIoptions\fR]
+.SH DESCRIPTION
+This is a recording tool for KDE.
+It uses aRts, just look at the audiomanager
+and you will find it there accepting sound
+for recording.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+
+
+.SH USAGE
+Details  are shown in the built-in help system to krec.  Run krec and go to help-krec handbook to access this data
+	
+.SH AUTHORS
+krec is (C)2002-2003 By Arnold Krille (arnold at arnoldarts.de)
+.P
+This man page was written and maintained by Ryan Waye (rmw998 at gmail.com) 
+.PP
+.
+.
+.SH "STANDARD DISCLAIMER"
+Use only at your own risk!
+There may be errors and inaccuracies that could be damaging to your system or
+your eye.
+Proceed with caution, and although this is highly unlikely, the authors don't
+take any responsibility for that!
+.PP
+
+This document is licensed under the GPL.
+.P
+KDE: 3.2.2
+.P
+KRec: 0.5

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/mpeglib.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/mpeglib.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/mpeglib.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+debian/tmp/usr/bin/yaf-cdda
+debian/tmp/usr/bin/yaf-mpgplay
+debian/tmp/usr/bin/yaf-splay
+debian/tmp/usr/bin/yaf-tplay
+debian/tmp/usr/bin/yaf-vorbis
+debian/tmp/usr/bin/yaf-yuv
+debian/tmp/usr/lib/libmpeg-0.3.0.so

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.install
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,329 @@
+debian/tmp/usr/bin/noatun
+debian/tmp/usr/lib/kconf_update_bin/noatun20update
+debian/tmp/usr/lib/kde3/noatun.la
+debian/tmp/usr/lib/kde3/noatun.so
+debian/tmp/usr/lib/kde3/noatun_dcopiface.la
+debian/tmp/usr/lib/kde3/noatun_dcopiface.so
+debian/tmp/usr/lib/kde3/noatun_excellent.la
+debian/tmp/usr/lib/kde3/noatun_excellent.so
+debian/tmp/usr/lib/kde3/noatun_htmlexport.la
+debian/tmp/usr/lib/kde3/noatun_htmlexport.so
+debian/tmp/usr/lib/kde3/noatun_infrared.la
+debian/tmp/usr/lib/kde3/noatun_infrared.so
+debian/tmp/usr/lib/kde3/noatun_kaiman.la
+debian/tmp/usr/lib/kde3/noatun_kaiman.so
+debian/tmp/usr/lib/kde3/noatun_keyz.la
+debian/tmp/usr/lib/kde3/noatun_keyz.so
+debian/tmp/usr/lib/kde3/noatun_kjofol.la
+debian/tmp/usr/lib/kde3/noatun_kjofol.so
+debian/tmp/usr/lib/kde3/noatun_marquis.la
+debian/tmp/usr/lib/kde3/noatun_marquis.so
+debian/tmp/usr/lib/kde3/noatun_metatag.la
+debian/tmp/usr/lib/kde3/noatun_metatag.so
+debian/tmp/usr/lib/kde3/noatun_monoscope.la
+debian/tmp/usr/lib/kde3/noatun_monoscope.so
+debian/tmp/usr/lib/kde3/noatun_net.la
+debian/tmp/usr/lib/kde3/noatun_net.so
+debian/tmp/usr/lib/kde3/noatun_splitplaylist.la
+debian/tmp/usr/lib/kde3/noatun_splitplaylist.so
+debian/tmp/usr/lib/kde3/noatun_systray.la
+debian/tmp/usr/lib/kde3/noatun_systray.so
+debian/tmp/usr/lib/kde3/noatun_ui.la
+debian/tmp/usr/lib/kde3/noatun_ui.so
+debian/tmp/usr/lib/kde3/noatun_voiceprint.la
+debian/tmp/usr/lib/kde3/noatun_voiceprint.so
+debian/tmp/usr/lib/kde3/noatun_winskin.la
+debian/tmp/usr/lib/kde3/noatun_winskin.so
+debian/tmp/usr/lib/kde3/noatunsimple.la
+debian/tmp/usr/lib/kde3/noatunsimple.so
+debian/tmp/usr/lib/libartseffects.la
+debian/tmp/usr/lib/libartseffects.so
+debian/tmp/usr/lib/libkdeinit_noatun.so
+debian/tmp/usr/lib/libnoatun.so.1
+debian/tmp/usr/lib/libnoatun.so.1.2.0
+debian/tmp/usr/lib/libnoatunarts.la
+debian/tmp/usr/lib/libnoatunarts.so
+debian/tmp/usr/lib/libnoatuncontrols.so.1
+debian/tmp/usr/lib/libnoatuncontrols.so.1.2.0
+debian/tmp/usr/lib/libnoatuntags.so.1
+debian/tmp/usr/lib/libnoatuntags.so.1.2.0
+debian/tmp/usr/lib/libwinskinvis.la
+debian/tmp/usr/lib/libwinskinvis.so
+debian/tmp/usr/lib/mcop/ExtraStereo.mcopclass
+debian/tmp/usr/lib/mcop/ExtraStereoGuiFactory.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/Equalizer.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/EqualizerSSE.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/FFTScope.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/FFTScopeStereo.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/Listener.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/RawScope.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/RawScopeStereo.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/Session.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/StereoEffectStack.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/StereoVolumeControl.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass
+debian/tmp/usr/lib/mcop/Noatun/WinSkinFFT.mcopclass
+debian/tmp/usr/lib/mcop/RawWriter.mcopclass
+debian/tmp/usr/lib/mcop/VoiceRemoval.mcopclass
+debian/tmp/usr/lib/mcop/artseffects.mcopclass
+debian/tmp/usr/lib/mcop/artseffects.mcoptype
+debian/tmp/usr/lib/mcop/noatunarts.mcopclass
+debian/tmp/usr/lib/mcop/noatunarts.mcoptype
+debian/tmp/usr/lib/mcop/winskinvis.mcopclass
+debian/tmp/usr/lib/mcop/winskinvis.mcoptype
+debian/tmp/usr/share/applications/kde/noatun.desktop
+debian/tmp/usr/share/apps/kconf_update/noatun.upd
+debian/tmp/usr/share/apps/noatun/dcopiface.plugin
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.dance
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.jazz
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.metal
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.trance
+debian/tmp/usr/share/apps/noatun/eq.preset/preset.zero
+debian/tmp/usr/share/apps/noatun/excellent.plugin
+debian/tmp/usr/share/apps/noatun/excellentui.rc
+debian/tmp/usr/share/apps/noatun/htmlexport.plugin
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/128x128/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/128x128/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/effect.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunback.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunforward.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunpause.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunplay.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunplaylist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/noatunstop.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/16x16/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunback.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunfback.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunfforward.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunforward.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopnone.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopplaylist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunlooprandom.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunloopsong.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunpause.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunplay.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunplaylist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatunstop.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/noatuntiny.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/22x22/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/32x32/actions/effect.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/32x32/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/32x32/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/48x48/actions/effect.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/48x48/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/48x48/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/64x64/actions/equalizer.png
+debian/tmp/usr/share/apps/noatun/icons/crystalsvg/64x64/actions/playlist.png
+debian/tmp/usr/share/apps/noatun/infrared.plugin
+debian/tmp/usr/share/apps/noatun/kaiman.plugin
+debian/tmp/usr/share/apps/noatun/kaimanui.rc
+debian/tmp/usr/share/apps/noatun/keyz.plugin
+debian/tmp/usr/share/apps/noatun/kjofolui.plugin
+debian/tmp/usr/share/apps/noatun/magictable
+debian/tmp/usr/share/apps/noatun/marquis.plugin
+debian/tmp/usr/share/apps/noatun/metatag.plugin
+debian/tmp/usr/share/apps/noatun/monoscope.plugin
+debian/tmp/usr/share/apps/noatun/net.plugin
+debian/tmp/usr/share/apps/noatun/noatunui.plugin
+debian/tmp/usr/share/apps/noatun/simple.plugin
+debian/tmp/usr/share/apps/noatun/simpleui.rc
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_exit.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_iconify.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_list.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_next.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p1.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p2.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p3.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p4.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p5.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_p6.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_play.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_prev.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_sml.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_stop.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_voldn.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/btn_volup.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/digbig.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/digmed.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/letters.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/main.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/monoster.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/posbar.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/random.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/repeat.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/skindata
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/status.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/car-preset/volume.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/back.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/back_mask.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/back_sm.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/back_sm_mask.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/bar_pos.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/bar_vol.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_exit.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_iconify.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_list.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_mode.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_next.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_play.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_pref.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_prev.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_repeat.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_shuffle.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_exit.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_iconify.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_mode.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_next.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_play.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_prev.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_sm_stop.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/btn_stop.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/dig.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/digsml.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/letters.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/skindata
+debian/tmp/usr/share/apps/noatun/skins/kaiman/circle/status.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/README
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/conf.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/conf.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/eject.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/icon.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/icon.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/kill.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/kill.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-nfont.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-nfont.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-nfont2.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-nfont2.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-normal2.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-normal2.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-vfont.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/knine-vfont.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/long2.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/mask.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/newtext.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/newtext.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/next.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/pause.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/play.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/pos_item.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/repeat.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/repeat.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/reverse.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/shuffle.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/shuffle.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/skindata
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/small-k.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/small-k.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/square.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/square.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/status.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/status.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/stop.jpg
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/trans-pos.png
+debian/tmp/usr/share/apps/noatun/skins/kaiman/k9/trans-slide.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/HexoBronx.rc
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/README.txt
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/active.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/eckig_font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/inactive.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/mask.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/pitch.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/splash.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/time_font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/volume.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/HexoBronx/volume_pitch_font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/kjofol.dck
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/kjofol.pl
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/kjofol.rc
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/kjofol.wsh
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg_num.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg_seek.bmp
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg_seek.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sg_text.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgdock.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgdock2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgdocksk.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgdockvp.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgeq.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpitch.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpitchp.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgplist.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgplist2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpres1.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpres2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgpres3.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgvol.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgvolnum.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgvolpos.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshad.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshad2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshdsk.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshvol.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/kjofol/sgwshvp.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_eq.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_main.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_mainback.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_numbers.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_playback.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_playlist.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_propos.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_text.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_volbar.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/p_volpos.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/phong.dck
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/phong.rc
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/phong.wsh
+debian/tmp/usr/share/apps/noatun/skins/kjofol/phong/phong_readme.txt
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_base.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_base2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_eq.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_font.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_pl.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_pl2.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_pro.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_text.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_vol.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/i_volpos.png
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.dck
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.rc
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/vibrocentric.wsh
+debian/tmp/usr/share/apps/noatun/skins/kjofol/vibrocentric/vibrocentric_readme.txt
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/BALANCE.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/CBUTTONS.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/FONT.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/MAIN.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/MONOSTER.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/NUMS_EX.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/PLAYPAUS.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/POSBAR.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/SHUFREP.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/SPEC.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/TEXT.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/TITLEBAR.BMP
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/VISCOLOR.TXT
+debian/tmp/usr/share/apps/noatun/skins/winamp/Winamp/VOLUME.BMP
+debian/tmp/usr/share/apps/noatun/splitplaylist.plugin
+debian/tmp/usr/share/apps/noatun/splui.rc
+debian/tmp/usr/share/apps/noatun/systray.plugin
+debian/tmp/usr/share/apps/noatun/systrayui.rc
+debian/tmp/usr/share/apps/noatun/voiceprint.plugin
+debian/tmp/usr/share/apps/noatun/winskin.plugin
+debian/tmp/usr/share/apps/noatun/yhconfig.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/noatun/common
+debian/tmp/usr/share/doc/kde/HTML/en/noatun/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/noatun/index.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/noatun.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/noatun.png
+debian/tmp/usr/share/mimelnk/interface/x-winamp-skin.desktop
+
+debian/icons/noatun.xpm		/usr/share/pixmaps
+debian/icons/noatun-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+noatun: shlib-missing-in-control-file libwinskinvis.so usr/lib/libwinskinvis.so
+noatun: shlib-missing-in-control-file libartseffects.so usr/lib/libartseffects.so
+noatun: shlib-missing-in-control-file libnoatunarts.so usr/lib/libnoatunarts.so
+noatun: shlib-missing-in-control-file libkdeinit_noatun.so usr/lib/libkdeinit_noatun.so

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

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.mime
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/noatun.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+application/ogg;	noatun --nofork %s;	nametemplate=%s.ogg;	test=test "$DISPLAY" != ""
+application/x-ogg;	noatun --nofork %s;	nametemplate=%s.ogg;	test=test "$DISPLAY" != ""
+audio/mpeg;	noatun --nofork %s;	nametemplate=%s.mpg;	test=test "$DISPLAY" != ""
+audio/mpegurl;	noatun --nofork %s;	nametemplate=%s.m3u;	test=test "$DISPLAY" != ""
+audio/x-mp2;	noatun --nofork %s;	nametemplate=%s.mp2;	test=test "$DISPLAY" != ""
+audio/x-mp3;	noatun --nofork %s;	nametemplate=%s.mp3;	test=test "$DISPLAY" != ""
+audio/x-wav;	noatun --nofork %s;	nametemplate=%s.wav;	test=test "$DISPLAY" != ""

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/patches/11_applications_menu_move.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/11_applications_menu_move.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/patches/11_applications_menu_move.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+--- kde.orig/kappfinder-data/Makefile.am
++++ kde.patched/kappfinder-data/Makefile.am
+@@ -25,5 +25,5 @@
+ xdg_directory_DATA = kde-multimedia-music.directory
+ 
+ xdg_mergedmenu_DATA = kde-multimedia-music.menu
+-xdg_mergedmenudir = $(xdg_menudir)/applications-merged
++xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
+ 

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/patches/12_noatun_kconf.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/12_noatun_kconf.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/patches/12_noatun_kconf.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+--- kde.orig/noatun/Makefile.am
++++ kde.patched/noatun/Makefile.am
+@@ -11,7 +11,9 @@
+ 
+ updatedir = $(kde_datadir)/kconf_update
+ update_DATA = noatun.upd
+-update_PROGRAMS = noatun20update
++
++kconfdir = $(libdir)/kconf_update_bin
++kconf_PROGRAMS = noatun20update
+ 
+ noatun20update_SOURCES  = noatun20update.cpp
+ noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/patches/13_mpeglib_PIC.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/13_mpeglib_PIC.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/patches/13_mpeglib_PIC.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+--- kde.orig/mpeglib/configure.in.in
++++ kde.patched/mpeglib/configure.in.in
+@@ -144,12 +144,6 @@
+ AC_MSG_RESULT($OS_TYPE)
+ 
+ INTELCPPFLAG=
+-dnl MMX_SUPPORT is set as variable in main configure.in.in
+-dnl now make it a config.h entry
+-if test x$MMX_SUPPORT = xyes; then
+-   AC_DEFINE(INTEL,1,[Define if you have MMX support on x86 with gcc])
+-   INTELCPPFLAG="-DINTEL"
+-fi
+ AC_SUBST(INTELCPPFLAG)
+ 
+ AC_DEFUN([KDE_MPEGLIB_COMPILES],

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/patches/14_mpeglib_noexecstack.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/14_mpeglib_noexecstack.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/patches/14_mpeglib_noexecstack.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+--- kde.orig/mpeglib/lib/mpegplay/mmxidct_asm.S
++++ kde.patched/mpeglib/lib/mpegplay/mmxidct_asm.S
+@@ -736,3 +736,4 @@
+ 
+ #endif
+ 
++.section	.note.GNU-stack,"", at progbits

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/patches/common/07_disable-visibility.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/07_disable-visibility.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/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/kdemultimedia/debian/patches/kubuntu_02_hide_arts_menu_entries.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/kubuntu_02_hide_arts_menu_entries.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/patches/kubuntu_02_hide_arts_menu_entries.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+--- kdemultimedia/arts/builder/artsbuilder.desktop	2005-03-24 04:45:49.863186112 +0000
++++ kdemultimedia/arts/builder/artsbuilder.desktop	2005-03-24 04:45:58.062939560 +0000
+@@ -99,3 +99,4 @@
+ X-DCOP-ServiceType=Multi
+ OnlyShowIn=KDE;
+ Categories=Qt;KDE;AudioVideo;X-KDE-More;
++NoDisplay=true
+--- kdemultimedia/arts/tools/artscontrol.desktop	2005-03-24 04:46:48.481274808 +0000
++++ kdemultimedia/arts/tools/artscontrol.desktop	2005-03-24 04:46:58.140806336 +0000
+@@ -114,3 +114,4 @@
+ DocPath=artsbuilder/index.html
+ OnlyShowIn=KDE;
+ Categories=Qt;KDE;AudioVideo;X-KDE-More;
++NoDisplay=true

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/patches/kubuntu_03_autostart_kdeonly.diff
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/patches/kubuntu_03_autostart_kdeonly.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/patches/kubuntu_03_autostart_kdeonly.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+--- kdemultimedia/kmix/restore_kmix_volumes.desktop	(revision 507496)
++++ kdemultimedia/kmix/restore_kmix_volumes.desktop	(working copy)
+@@ -4,6 +4,7 @@
+ X-KDE-autostart-condition=kmixrc::startkdeRestore:true
+ Type=Application
+ Exec=kmixctrl --restore
++OnlyShowIn=KDE;
+ Name=Restore Mixer Volumes
+ Name[bg]=Ð’ÑŠÐ·ÑÑ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÑ‚Ð¾Ð¹Ð½Ð¾ÑÑ‚Ð¸Ñ‚Ðµ Ð½Ð° Ð¼Ð¸ÐºÑÐµÑ€Ð°
+ Name[bn]=à¦®à¦¿à¦•à§à¦¸à¦¾à¦° à¦à¦²à¦¿à¦‰à¦® à¦ªà§à¦¨à¦ƒà¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦•à¦°à§‡

Added: people/jriddell/KDE/3.5/kdemultimedia/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdemultimedia/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdemultimedia/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+#! /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 := \
+	--with-alsa --with-arts-alsa \
+	--with-extra-includes=/usr/include/speex:/usr/include/kde/arts
+	# The include/kde/arts one should be temporary. See
+	# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
+
+DOC_HTML_PRUNE := kcontrol
+
+PACKAGES_WITH_LIBS := artsbuilder kdemultimedia-kio-plugins kmid kmix krec \
+	libarts1-akode libarts1-audiofile libarts1-mpeglib libarts1-xine \
+	libkcddb1 mpeglib noatun
+
+DEB_DH_MAKESHLIBS_ARGS_artsbuilder	:= -V'artsbuilder (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kmid		:= -V'kmid (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_libkcddb1	:= -V'libkcddb1 (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_mpeglib		:= -V'mpeglib (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_noatun		:= -V'noatun (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_libarts1-mpeglib	:= -V'libarts1-mpeglib (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kdemultimedia-kio-plugins := -V'kdemultimedia-kio-plugins (>= 4:3.5-rc1-1)'
+
+#shlibs_ver = 4:3.5.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))


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

Modified: people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdenetwork/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/kdenetwork/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1,3 +1,55 @@
+kdenetwork (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
+
+kdenetwork (4:3.5.0-0ubuntu6) dapper; urgency=low
+
+  * Install kopete/kopeteversion.h in kdenetwork-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 13 Jan 2006 13:34:42 +0000
+
+kdenetwork (4:3.5.0-0ubuntu5) dapper; urgency=low
+
+  * Tighten build-dep on kdelibs to 4:3.5.0-0ubuntu9
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 18:23:00 +0000
+
+kdenetwork (4:3.5.0-0ubuntu4) dapper; urgency=low
+
+  * Tighten build-dep on kdelibs to 4:3.5.0-0ubuntu8
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 15:35:02 +0000
+
+kdenetwork (4:3.5.0-0ubuntu3) dapper; urgency=low
+
+  * Add kdnssd to kdenetwork meta package
+  * Remove libkdnssd dependency from kdnssd (now in kdelibs)
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Jan 2006 09:51:13 +0000
+
+kdenetwork (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Add package kdnssd with zeroconf:/ ioslave
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 11 Jan 2006 02:22:49 +0000
+
+kdenetwork (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:28:33 +0000
+
+kdenetwork (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Generate .pot files
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 21:10:41 +0000
+
 kdenetwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
 
   * New upstream pre-release

Modified: people/jriddell/KDE/3.5/kdenetwork/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -3,13 +3,13 @@
 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), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5-rc1-1ubuntu2), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.1), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
 Standards-Version: 3.6.2
 
 Package: kdenetwork
 Section: kde
 Architecture: all
-Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}), librss1 (>= ${Source-Version})
+Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}), librss1 (>= ${Source-Version}), kdnssd (>= ${Source-Version})
 Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
 Suggests: kdenetwork-doc-html (>= ${Source-Version})
 Description: network-related apps from the official KDE release
@@ -298,3 +298,10 @@
  .
  This package is part of KDE, as a component of the KDE network module.
  See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kdnssd
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Zeroconf support for KDE
+ A kio-slave and kded module for zeroconf support.

Modified: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -35,6 +35,7 @@
 debian/tmp/usr/include/kde/kopete/kopeteuiglobal.h
 debian/tmp/usr/include/kde/kopete/kopeteversion.h
 debian/tmp/usr/include/kde/kopete/kopetexsl.h
+debian/tmp/usr/include/kde/kopete/kopeteversion.h
 debian/tmp/usr/include/kde/kopete/managedconnectionaccount.h
 debian/tmp/usr/include/kde/kopete/ui/accountselector.h
 debian/tmp/usr/include/kde/kopete/ui/addcontactpage.h

Modified: people/jriddell/KDE/3.5/kdenetwork/debian/patches/kubuntu_01_kmenu_changes.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/kubuntu_01_kmenu_changes.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/kubuntu_01_kmenu_changes.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -1,12 +1,11 @@
 --- kdenetwork-orig/wifi/kwifimanager.desktop	2005-03-16 22:51:10.175765744 +0000
 +++ kdenetwork/wifi/kwifimanager.desktop	2005-03-16 22:53:23.163548528 +0000
-@@ -102,4 +102,4 @@
+@@ -105,4 +105,4 @@
  GenericName[uz]=Ð¡Ð¸Ð¼ÑÐ¸Ð· Ñ‚Ð°Ñ€Ð¼Ð¾Ò› Ð±Ð¾ÑˆÒ›Ð°Ñ€ÑƒÐ²Ñ‡Ð¸ÑÐ¸
- GenericName[xx]=xxWireless LAN Managerxx
  GenericName[zh_CN]=æ— çº¿å±€åŸŸç½‘ç®¡ç†å™¨
+ GenericName[zh_HK]=ç„¡ç·šç¶²çµ¡ç®¡ç†å“¡
 -Categories=Qt;KDE;Network;X-KDE-More;
-+Categories=Qt;KDE;Network;
-
++Categories=Qt;KDE;Network
 --- kdenetwork-orig/knewsticker/knewsticker-standalone.desktop	2005-03-16 22:57:07.890384856 +0000
 +++ kdenetwork/knewsticker/knewsticker-standalone.desktop	2005-03-16 22:57:50.612890048 +0000
 @@ -84,3 +84,4 @@
@@ -25,9 +24,9 @@
 
 --- kdenetwork-orig/krfb/krfb/krfb.desktop-orig	2005-03-16 23:07:58.007552024 +0000
 +++ kdenetwork/krfb/krfb/krfb.desktop	2005-03-16 23:08:00.130229328 +0000
-@@ -33,4 +33,4 @@
- GenericName[uk]=Ð¡Ð¿Ñ–Ð»ÑŒÐ½Ñ– ÑÑ‚Ñ–Ð»ÑŒÐ½Ð¸Ñ†Ñ–
- GenericName[xx]=xxDesktop Sharingxx
+@@ -44,4 +44,4 @@
+ GenericName[uz]=Ð˜Ñˆ ÑÑ‚Ð¾Ð»Ð¸ Ð±Ð¸Ð»Ð°Ð½ Ð±ÑžÐ»Ð¸ÑˆÐ¸Ñˆ
  GenericName[zh_CN]=æ¡Œé¢å…±äº«
+ GenericName[zh_HK]=æ¡Œé¢åˆ†äº«
 -Categories=Qt;KDE;System;
 +Categories=Qt;KDE;Network;

Modified: people/jriddell/KDE/3.5/kdenetwork/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -10,19 +10,6 @@
 DEB_DH_MAKESHLIBS_ARGS_librss1	:= -V'librss1 (>= 4:3.4.3-1)'
 DEB_DH_MAKESHLIBS_ARGS_kopete	:= -V'kopete (>= 4:3.4.3-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
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
 

Added: people/jriddell/KDE/3.5/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+Not build using tar inside .orig
+Don't build-dep on libgnokii-dev, not in main
+Install /usr/share/services/kontact/ desktop files in their supporting programs, not kontact (and add Replaces)
+

Added: people/jriddell/KDE/3.5/kdepim/debian/akregator.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/akregator.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/akregator.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,35 @@
+/usr/bin/akregator
+/usr/lib/kde3/libakregatorpart.la
+/usr/lib/kde3/libakregatorpart.so
+/usr/lib/libakregatorprivate.la
+/usr/lib/libakregatorprivate.so
+/usr/share/apps/akregator
+/usr/share/config.kcfg/akregator.kcfg
+/usr/share/doc/kde/HTML/en/akregator
+/usr/share/icons/crystalsvg/16x16/apps/akregator_empty.png
+/usr/share/icons/hicolor/128x128/apps/akregator.png
+/usr/share/icons/hicolor/16x16/apps/akregator.png
+/usr/share/icons/hicolor/22x22/apps/akregator.png
+/usr/share/icons/hicolor/32x32/apps/akregator.png
+/usr/share/icons/hicolor/48x48/apps/akregator.png
+/usr/share/icons/hicolor/64x64/apps/akregator.png
+/usr/share/icons/hicolor/scalable/apps/akregator.svgz
+/usr/share/icons/crystalsvg/32x32/actions/rss_tag.png
+/usr/share/icons/crystalsvg/16x16/actions/rss_tag.png
+/usr/share/icons/crystalsvg/48x48/actions/rss_tag.png
+/usr/share/icons/crystalsvg/22x22/actions/rss_tag.png
+/usr/share/icons/crystalsvg/64x64/actions/rss_tag.png
+/usr/share/services/akregator_part.desktop
+/usr/share/services/feed.protocol
+/usr/share/services/kontact/akregatorplugin3.2.desktop
+/usr/share/services/kontact/akregatorplugin.desktop
+/usr/share/applications/kde/akregator.desktop
+/usr/share/services/akregator_mk4storage_plugin.desktop
+/usr/share/config.kcfg/mk4config.kcfg
+/usr/share/servicetypes/akregator_plugin.desktop
+/usr/lib/kde3/libakregator_mk4storage_plugin.so
+/usr/lib/kde3/libakregator_mk4storage_plugin.la
+
+../icons/akregator.xpm /usr/share/pixmaps
+../icons/akregator-16.xpm /usr/share/pixmaps
+

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

Added: people/jriddell/KDE/3.5/kdepim/debian/akregator.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/akregator.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/akregator.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(akregator):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="aKregator"\
+	icon32x32="/usr/share/pixmaps/akregator.xpm"\
+	icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+	command="/usr/bin/akregator"

Added: people/jriddell/KDE/3.5/kdepim/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/cdbs/debian-qt-kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,86 @@
+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
+
+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/kdepim/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,942 @@
+kdepim (4:3.5.1-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_07_autostart_kdeonly.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  9 Feb 2006 13:01:11 +0000
+
+kdepim (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Install /usr/share/services/kontact/ desktop files in their supporting
+    programs, not kontact
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
+
+kdepim (4:3.5.0-0ubuntu4) dapper; urgency=low
+
+  * Install multisynk.desktop in kitchensync not Kontact, 
+    stop empty icon displaying.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jan 2006 14:53:52 +0000
+
+kdepim (4:3.5.0-0ubuntu3) dapper; urgency=low
+
+  * Increase version number on Replaces for kdepim-kresources
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  6 Jan 2006 18:42:44 +0000
+
+kdepim (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_07_branch_fixes.diff from KMail developers
+    fixes http://bugs.kde.org/show_bug.cgi?id=113730
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  9 Dec 2005 23:00:48 +0000
+
+kdepim (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:28:46 +0000
+
+kdepim (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+
+  * s/Depends/Build-Depends/ in control
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 26 Nov 2005 18:56:44 +0000
+
+kdepim (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Generate .pot files
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Nov 2005 21:38:28 +0000
+
+kdepim (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Sync with Debian
+  * Remove kubuntu_02_kalarm_kmenu_tidy.diff (now X-KDE-PIM, not X-KDE-More)
+  * Remove kubuntu_03_karm_kmenu_tidy.diff
+  * libkleopatra0a now libkleopatra1
+  * libkleopatra0-dev now libkleopatra1-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 18:09:20 +0000
+
+kdepim (4:3.4.2-2) unstable; urgency=medium
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Build with g++-3.4 on arm, m68k and hppa. Closes: #327594
+  * Add kitchensync as a dependency of kdepim-dev. Closes: #327159
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 21 Sep 2005 17:45:43 +0200
+
+kdepim (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bugs fixed in past experimental versions but filed with BTS
+    afterwards:
+    + Compiles on amd64 with g++-4.0.  Closes: #293107.
+    + kdepim-wizards support libraries were mistakenly in kdepim-dev.
+      Closes: #315560.
+    + *.sh manpages in kmail.  Closes: #319808.
+  * Reenable gnokii support since the license issues have now been
+    resolved.
+  * Yet more ABI breakages:
+    + libkdepim1 -> libkdepim1a.  Closes: #312310.
+    + libkcal2a -> libkcal2b.  Closes: #312318.
+  * C++ transition:
+    + Tighten Build-Depends on kdelibs4-dev to new enough version.
+    + Rename libmimelib1a -> libmimelib1c2 in order not to break
+      lurker.  Also split out libkmime2 from this package while I'm
+      at it so that lurker users don't have to install kdelibs4 --
+      at least, they won't have to once I can link libkdefakes statically
+      into mimelib (see bug #326113).
+  * Add Vietnamese debconf translation.  Closes: #312159.
+  * Remove 10_korganizer_makefile.diff, which has been applied in
+    upstream SVN and thus is included in the kdepim_branch patch.
+  * Remove obsolete Conflicts and Replaces on packages not in sarge.
+  * Fix command synopsis in kabc2mutt manpage.  Closes: #324958.
+
+ -- Daniel Schepler <schepler at debian.org>  Thu,  1 Sep 2005 15:17:12 -0700
+
+kdepim (4:3.4.1-2) UNRELEASED; urgency=low
+
+  * Move libraries for egroupware, kolab, slox wizards to kdepim-wizards
+    where they belong.  Thanks to Reinhold Kainhofer for reporting the
+    issue.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri,  3 Jun 2005 08:57:02 -0700
+
+kdepim (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Split kresources into new package kdepim-kresources.
+  * Split kdepimmacros.h into new package libkdepim1-dev, and make all
+    the other -dev packages depend on it.
+
+ -- Daniel Schepler <schepler at debian.org>  Thu,  2 Jun 2005 21:45:31 -0700
+
+kdepim (4:3.4.3-0ubuntu4) dapper; urgency=low
+
+  * Actually build-depend on g++-3.4 on hppa.
+
+ -- LaMont Jones <lamont at ubuntu.com>  Fri, 11 Nov 2005 09:57:38 -0700
+
+kdepim (4:3.4.3-0ubuntu3) breezy-updates; urgency=low
+
+  * Add back gpgme11-dev build-dep, http://bugzilla.ubuntu.com/17546
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 14 Oct 2005 13:10:47 +0000
+
+kdepim (4:3.4.3-0ubuntu2) breezy; urgency=low
+
+  * Add kubuntu_06_add_akregator_feed.diff add kubuntu.org and fridge
+    feeds as default
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Oct 2005 19:14:19 +0100
+
+kdepim (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Remove gpgme11-dev build-dep
+  * Build with GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  7 Oct 2005 16:41:29 +0000
+
+kdepim (4:3.4.2-0ubuntu2) breezy; urgency=low
+
+  * Add kubuntu_07_korganiser_libraries.diff fix compile order
+  * Add kubuntu_08_kmail_attachments.diff fix empty attachments http://bugs.kde.org/109003
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed,  3 Aug 2005 11:51:41 +0000
+
+kdepim (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 28 Jul 2005 11:35:01 +0000
+
+kdepim (4:3.4.1-0ubuntu4) breezy; urgency=low
+
+  * Rebuild for removed libXcursor.la and tighten kdelibs dependency
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 24 Jul 2005 23:58:51 +0000
+
+kdepim (4:3.4.1-0ubuntu3) breezy; urgency=low
+
+  * Add back flex build-dep which somehow went missing.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 21 Jul 2005 13:03:06 +0000
+
+kdepim (4:3.4.1-0ubuntu2) breezy; urgency=low
+
+  * Rebuild for libXrender.la changes
+  * Add build-dep on libxfixes-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 20 Jul 2005 23:11:42 +0000
+
+kdepim (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+  * Add all dependencies back to meta package
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 00:51:23 +0000
+
+kdepim (4:3.4.1-0ubuntu0pre2) breezy; urgency=low
+
+  * Add kubuntu_06_kpilot_tag_to_branch.diff, patch from upstream to
+    prevent data loss.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Fri, 27 May 2005 15:28:51 +0000
+
+kdepim (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+
+  * New upstream release
+  * Sync with Debian
+  * Remove obsolete script korganizerIn
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 25 May 2005 17:37:34 +0000
+
+kdepim (4:3.4.0-0ubuntu10) hoary; urgency=low
+
+  * Add /usr/share/doc/kde/HTML/en/kcontrol/kalarmd/ to
+    kdepim-doc-html to prevent dhelp error
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 30 Mar 2005 18:05:50 +0000
+
+kdepim (4:3.4.0-0ubuntu9) hoary; urgency=low
+
+  * Remove duplicate files from kdepim-dev for libkleopatra0-dev and libkgantt0.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 30 Mar 2005 04:45:07 +0000
+
+kdepim (4:3.4.0-0ubuntu8) hoary; urgency=low
+
+  * Move wizards from kdepim-dev to kdepim-wizards, removes conflicing files.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 30 Mar 2005 04:45:46 +0100
+
+kdepim (4:3.4.0-0ubuntu7) hoary; urgency=low
+
+  * remoded double depends and a conflict on libkcal2-dev
+
+ -- Andreas Mueller <amu at ubuntu.com>  Tue, 29 Mar 2005 23:53:25 +0000
+
+kdepim (4:3.4.0-0ubuntu6) hoary; urgency=low
+
+  * added kdepim-dev as dep of libkcal2-dev
+  * fixed some typo's
+  * added missing egroupware libs
+
+ -- Andreas Mueller <amu at ubuntu.com>  Tue, 29 Mar 2005 13:53:12 +0000
+
+kdepim (4:3.4.0-0ubuntu5) hoary; urgency=low
+
+  * Removed gpgsm from builddepens 
+  * final sync with kde-branch / backporting cool stuff
+  * Removed kleopatra from kmail depends
+
+ -- Andreas Mueller <amu at ubuntu.com>  Thu, 24 Mar 2005 17:11:22 +0000
+
+kdepim (4:3.4.0-0ubuntu4) hoary; urgency=low
+
+  * Readded cyrpto support for kmail
+  * Readded kleopatra for kmail
+  * Fixed a replaces on akregator
+  * Added gpgsm as a build depends
+
+ -- Andreas Mueller <amu at ubuntu.com>  Tue, 22 Mar 2005 18:45:04 +0000
+
+kdepim (4:3.4.0-0ubuntu3) hoary; urgency=low
+
+  * Removed crypto support for kmail.
+  * Removed depends on Kleopatra for kmail.
+  * Fixed a replaces for knef.
+       
+ -- Andreas Mueller <amu at ubuntu.com>  Thu, 17 Mar 2005 18:05:34 +0000
+
+kdepim (4:3.4.0-0ubuntu2) hoary; urgency=low
+
+  * Remove korn dependency from kdepim meta-package.
+  * Fix kubuntu_01_kmenu_tidy.diff
+  * Add further patches to tidy menu
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 17 Mar 2005 01:49:54 +0000
+
+kdepim (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * Remove korn dependency from kdepim meta-package.
+  * Add kubuntu_01_kmenu_tidy.diff to tidy up kmenu.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 16 Mar 2005 23:58:26 +0000
+
+kdepim (4:3.4.0-0pre1ubuntu4) hoary; urgency=low
+
+  * fixed  wrong depends in kmail for kleopatra.
+  
+ -- Andreas Mueller <amu at ubuntu.com>  Wed, 16 Mar 2005 21:19:16 +0000
+
+kdepim (4:3.4.0-0pre1ubuntu3) hoary; urgency=low
+
+  * Removed them again, cause it cant move to main. 
+  * Added kdepim-kio-pluging as installdepends for kmail
+    in case someone run only kmail.
+  * Changed suggest kleopatra to depends for gpg decrypt
+    support.     
+  * More lintian cleanup. 
+
+ -- Andreas Mueller <amu at ubuntu.com>  Wed, 16 Mar 2005 19:02:50 +0000
+
+kdepim (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
+
+  * Added gpgsm build depends
+
+ -- Andreas Mueller <amu at ubuntu.com>  Mon, 14 Mar 2005 01:35:50 +0100
+
+kdepim (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+  * New packages: kode, networkstatus.
+  * New groupware wizards added to menu
+  * Added imap-patch for Kolab 
+  * Added gpg/smime/smartcard stuff
+
+ -- Andreas Mueller <amu at ubuntu.com>  Fri, 11 Mar 2005 00:20:53 -0800
+
+kdepim (4:3.4.0-0pre1) alioth; urgency=low
+
+  * New upstream release.
+  * Change to using upstream tar.bz2.
+  * New packages: kode, networkstatus.
+  * Absorb akregator package.  Thanks to Pierre Habouzit for his fine work
+    on this package up until now.
+  * libkdenetwork2 split upstream into libkmime, which is now in the
+    libmimelib1a package, and libkpgp, which is now in the libkleopatra0a
+    package.
+  * Split off libktnef1 from the ktnef package since libkcal now depends
+    on it.
+    + Also split libktnef1-dev from kdepim-dev.
+  * Keep kmail's *.sh manpages from being installed in
+    /usr/share/man/sh/man1.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 12 Mar 2005 21:41:20 -0800
+
+kdepim (4:3.3.2-3) unstable; urgency=medium
+
+  * KDE_3_3_BRANCH update.
+  * Move kleopatra to main, now that gnupg2 is in the archive.
+    Closes: #281689, #300499.
+  * Update kmail/kleopatra dependencies accordingly.
+  * Set urgency to medium to hopefully get these changes into sarge.
+  * Add Recommends on procmail to kmail, which is needed for fetching
+    mbox mail.
+  * Tighten libtool build dependency.  This closes half of #285882,
+    while the other half is really a kdelibs issue.
+  * Include the GFDL in debian/copyright, since the handbooks are
+    licensed under it.
+  * Update the list of licenses.
+
+ -- Daniel Schepler <schepler at debian.org>  Sun,  3 Apr 2005 20:23:43 -0700
+
+kdepim (4:3.3.2-2) unstable; urgency=low
+
+  * Disable gnokii support again until bug #266566 is resolved.
+  * Update from KDE_3_3_BRANCH.
+  * Fixed the kmailcvt description to refer to mail folders instead of
+    address books.  Closes: #252668.
+    Also expanded the description a bit to list some supported import
+    formats.
+  * Kontact conflicts with obsolete kontact-plugins package.
+    Closes: #292997.
+  * Add Build-Depends on graphviz to get class hierarchy graphs.
+
+ -- Daniel Schepler <schepler at debian.org>  Tue,  1 Mar 2005 05:20:08 -0800
+
+kdepim (4:3.3.2-1) unstable; urgency=low
+
+  * Uploading to unstable.
+  * Include updates from KDE_3_3_BRANCH.
+  * Reenable gnokii support.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 19 Jan 2005 18:20:43 -0800
+
+kdepim (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+  * They did it again... rename libkcal2 to libkcal2a because of removed
+    symbols SloxAccounts::self(), SloxAccounts::setServer(QString const&),
+    SloxAccounts::SloxAccounts() in libkslox.so.
+  * Bump shlibs version on libkdepim1.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 17 Dec 2004 20:45:39 -0800
+
+kdepim (4:3.3.1-3) unstable; urgency=medium
+
+  * Disable gnokii support to attempt getting kde3.3 into sarge.
+    Closes: #284985.
+  * Disable final mode for compiling kmail, which will hopefully fix
+    the buildd timeouts.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 11 Dec 2004 15:50:44 -0800
+
+kdepim (4:3.3.1-2) unstable; urgency=medium
+
+  * Urgency medium due to fix for buildd issues.
+  * Updates from KDE_3_3_BRANCH.
+  * Stop building static libraries to make buildd's happy (or at least
+    happier).  They were pretty useless anyway without static versions
+    of Qt or kdelibs.  Closes: #281955.
+  * Update kleopatra dependencies for current experimental gnupg2/gpgsm
+    packages.  Closes: #274611, #280759.
+  * Drop cryptplug from kmail's dependencies, since it's no longer used.
+    Closes: #274612.
+  * Add blurb about kdepim-kio-plugins and kdebase-kio-plugins
+    dependencies to kmail's description, due to the number of people who
+    somehow manage to install kmail without even noticing the Recommends
+    on these packages, then complain that things don't work.
+    Closes: #274657.
+
+ -- Daniel Schepler <schepler at debian.org>  Sun, 21 Nov 2004 15:04:40 -0800
+
+kdepim (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rename 01_kdepim_branch.diff to 10_kdepim_branch.diff, and
+    other kdepim-specific patches to 2?_*.diff.
+  * New patch 04_disable_static_la_final.diff, to keep --enable-final
+    from messing up the static libraries.
+    + debian/rules: Reenable --enable-final.
+  * kde.mk: Add calls to dh_desktop.
+    + debian/control: Build-Depends on debhelper (>= 4.2.21) to ensure
+      dh_desktop is available.
+  * Correct URL in kleopatra description.  Closes: #275522.
+  * Bump shlibs version to require current version.  Closes: #275211.
+  * Package name change: libmimelib1 -> libmimelib1a, because of
+    missing DwHeaders::AllFieldBodiesAsString(DwString const&) (at least)
+    since version 4:3.2.3-1.  Closes: #276607.
+  * Package name change: libkleopatra0 -> libkleopatra0a, because of
+    missing symbols since last version:
+    + Kleo::Job::showErrorDialog(QWidget*) const
+    + Kleo::KeyListView::parentFor(QCString const&) const
+    + Kleo::KeyListView::refillFingerprintDictionary()
+    + Kleo::QGpgMEEncryptJob::showErrorDialog(QWidget*) const
+    + Kleo::QGpgMESignEncryptJob::showErrorDialog(QWidget*) const
+    + Kleo::QGpgMESignJob::showErrorDialog(QWidget*) const
+    + Kleo::KeyListViewItem::~KeyListViewItem().
+
+    To KDE upstream maintainers: every time you break binary compatibility
+    like this in a public library, I'm going to have to increase the
+    library "subversion" in the package name, which will delay packages
+    entering sid.  Please keep this in mind before making such changes, if
+    the rule that non-backward-compatible changes require a new SONAME
+    carries no weight with you.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat,  6 Nov 2004 12:18:42 -0800
+
+kdepim (4:3.3.0-3) unstable; urgency=low
+
+  * Updates from KDE_3_3_BRANCH.
+    + Fixes konsolekalendar.  Closes: #269295.
+  * Move kleopatra to contrib for now, until GnuPG2 is in unstable.  In
+    the meantime, add a note to the package description on how to
+    install the package.  Closes: #269789.
+  * Move binary dependencies from kontact-plugins for korganizer and
+    kpilot to Recommends and Suggests, respectively.  Closes: #273402.
+  * kmailcvt Depends: kmail.  Closes: #268788.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat, 25 Sep 2004 19:44:44 -0700
+
+kdepim (4:3.3.0-2) unstable; urgency=low
+
+  * Using automake1.7 doesn't fix the korganizer install problems; go to
+    automake1.9 and readd 03_automake1.8.diff and
+    04_korganizer_makefile.diff.
+  * New patch 05_lib_link.diff: Correct link lines for libkalarmd and
+    libkpilot so that they are linked against all necessary libraries.
+  * Include new fixes from KDE_3_3_BRANCH.
+
+ -- Daniel Schepler <schepler at debian.org>  Fri, 27 Aug 2004 07:25:15 -0700
+
+kdepim (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add German debconf translations, thanks to Erik Schanze.
+    Closes: #264825.
+  * Correct typo in kpilot.install which caused file conflicts.
+    Closes: #266311.
+  * Add Recommends: kdepim-kio-plugins to kmail for newimap, and also
+    move kdebase-kio-plugins there from Depends.  Closes: #266603.
+  * Use automake1.7 instead of 1.8 to work around problem in
+    korganizer/Makefile.am.
+
+ -- Daniel Schepler <schepler at debian.org>  Wed, 25 Aug 2004 00:09:09 -0400
+
+kdepim (4:3.2.92+3.3.0rc1-1) experimental; urgency=low
+
+  * New upstream release.
+    + New packages: kdepim-wizards, kitchensync, libkleopatra0[-dev],
+      libkpimidentities1.
+    + Removed packages: libkdgantt0[-dev].
+    + Renamed kgpgcertmanager to kleopatra.
+  * Taking over maintainership, add myself to Uploaders.
+  * Build in gnokii support again.  Closes: #254643.
+  * Add Build-Depends on libgpgme11-dev for kmail.
+  * Make the *.install files a bit more robust by listing directories
+    clearly belonging to packages instead of listing each individual
+    file.
+  * Add kdepim-doc-html package for the benefit of non-KDE users.
+  * Expand package descriptions.  Closes: #209672, #209689, #209862,
+    #209997, #210088, #210094.
+  * Add menu icons.
+  * Add doc-base files for kdepim-doc and kdepim-doc-html.
+  * Write new manual pages for all binaries.
+
+ -- Daniel Schepler <schepler at debian.org>  Sat,  7 Aug 2004 23:20:22 -0700
+
+kdepim (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * kmail Suggests: cryptplug. (Closes: #231797)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue,  3 Aug 2004 23:00:00 -0500
+
+kdepim (4:3.2.2-2) unstable; urgency=high
+
+  * Build-Conflicts: gnokii - due to gnokii not being properly maintained.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon, 26 Apr 2004 22:00:00 -0500
+
+kdepim (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/*.menu: remove the obsolete kderemove tag.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 16 Apr 2004 19:00:00 -0500
+
+kdepim (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added Danish and Japanese po-debconf translations. (Closes: #233579)
+  * Added Brazilian Portuguese po-debconf translations. (Closes: #235461)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat,  6 Mar 2004 17:00:00 -0600
+
+kdepim (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 20 Feb 2004 01:00:00 -0600
+
+kdepim (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Thu, 29 Jan 2004 04:00:00 -0600
+
+kdepim (4:3.1.5-1.1) unstable; urgency=low
+
+  * NMU with Maintainers permission
+  * New patch: 07_libmal1_support.diff from Ludovic Rousseau (Closes: #232500, #217013)
+
+ -- Riku Voipio <riku.voipio at iki.fi>  Sun, 15 Feb 2004 11:06:49 +0000
+
+kdepim (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added libtool arm patch.
+  * Added debconf /dev/pilot question to kpilot. (Closes: #218665)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed, 14 Jan 2004 02:00:00 -0600
+
+kdepim (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>  Sat, 18 Oct 2003 02:00:00 -0500
+
+kdepim (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sun,  3 Aug 2003 23:00:00 -0500
+
+kdepim (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon, 26 May 2003 22:00:00 -0500
+
+kdepim (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream.
+  * Redo debian dir.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed, 12 Mar 2003 17:00:00 -0600
+
+kdepim (4:2.2.2-5.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 21:24:12 +0100
+
+kdepim (4:2.2.2-5.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>  Mon,  6 Jan 2003 09:16:08 +0100
+
+kdepim (4:2.2.2-5) unstable; urgency=HIGH
+
+  * Change Maintainer to Chris.
+  * Change || in Build-Deps to |. (closes: #130183)
+  * Apply silly fix for silly PowerPC to fix a silly bug because it stupidly
+    doesn't automatically link in -lgcc. Thanks to Kevin Puetz.
+  * Urgency high because it fixes one real and one potental RC.
+
+ -- Daniel Stone <daniel at sfarc.net>  Wed, 27 Feb 2002 17:18:47 +1100
+
+kdepim (4:2.2.2-4) unstable; urgency=low
+
+  * libical/src/libical/icalyacc.y:
+    - Fix bison errors; thanks, Andrew Suffield. (closes: #124383)
+  * debian/control:
+    - Fix spelling errors. (closes: #124778)
+  * debian/{alarmd,ical2vcal}.sgml, debian/korganizer.manpages, debian/rules:
+    - New manpages.
+  * debian/rules:
+    - Clean up *-stamp in debian-clean.
+  * debian/control:
+    - automake1.5 stuffs up our automake Build-Depend, GAH.
+  * debian/control, debian/rules:
+    - Remove all index.cache.bz2 files in the debian-clean target.
+    - Get rid of other crap while I'm here.
+
+ -- Daniel Stone <daniel at sfarc.net>  Tue, 18 Dec 2001 13:45:28 +1100
+
+kdepim (4:2.2.2-3) unstable; urgency=low
+
+  * New maintainer. (closes: #114106) 
+  * libdif/ldif.c:
+    - Kowtow to gcc3 (well, g++-3)'s fascist sticking to standards, add "using
+    namespace std;" - enable building on hppa.
+  * debian/korganizer.sgml, debian/kpilot.sgml, debian/kandy.sgml:
+    - New manpages.
+  * debian/rules:
+    - Be sure to clean up auto* crap.
+
+ -- Daniel Stone <daniel at sfarc.net>  Fri, 30 Nov 2001 21:53:31 +1100
+
+kdepim (4:2.2.2-2) unstable; urgency=low
+
+  * Sync with upstream
+  * Cleanup documentation for freeze
+  * Update Build-Depends, deps, etc.
+  * Cleanup build process
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 29 Nov 2001 04:10:00 -0700
+
+kdepim (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 07 Nov 2001 19:38:00 -0700
+
+kdepim (4:2.2.1-1.5) unstable; urgency=low
+
+  * Don't search for auto* as it hoses things
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 08 Oct 2001 19:38:00 -0700
+
+kdepim (4:2.2.1-1.4) unstable; urgency=low
+
+  * fix configure
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 05 Oct 2001 01:11:00 -0700
+
+kdepim (4:2.2.1-1.3) unstable; urgency=low
+
+  * Don't use automake since it's hosed
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 03 Oct 2001 01:11:00 -0700
+
+kdepim (4:2.2.1-1.2) unstable; urgency=low
+
+  * Remove libical (Closes: #113668)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 27 Sep 2001 01:11:00 -0700
+
+kdepim (4:2.2.1-1.1) unstable; urgency=low
+
+  * Fix overwrite (Closes: #112974)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 23 Sep 2001 18:18:00 -0700
+
+kdepim (4:2.2.1-1) unstable; urgency=low
+ 
+  * new upstream version 2.2.1
+  * Change maintainer
+  * Lintian fixes
+  * Break out libical packages again
+  * Provide undocumented link (Closes: #110361)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 07 Sep 2001 12:07:00 -0700
+
+kdepim (4:2.2.0-final-1) unstable; urgency=low
+ 
+  * new upstream version 2.2
+  * Hack build for hppa (Closes: #108273)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 12 Aug 2001 01:55:00 -0700
+
+kdepim (4:2.2.0-0beta1-5) unstable; urgency=low
+ 
+  * Sync with upstream
+  * gcc3 build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 26 Jul 2001 20:28:00 -0700
+
+kdepim (4:2.2.0-0beta1-4) unstable; urgency=low
+ 
+  * Sync with upstream
+  * More alpha build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 07 Jul 2001 03:38:00 -0700
+
+kdepim (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * Sync with upstream
+  * Recommend kghostview (Closes: #103585)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 05 Jul 2001 09:08:00 -0700
+
+kdepim (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:35:00 -0700
+
+kdepim (4:2.2.0-0beta1-1) unstable; urgency=low
+ 
+  * Fix overwrites (Closes: #102855)
+  * sync with upstream
+  * build fixes for mips
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 30 Jun 2001 20:48:00 -0700
+
+kdepim (4:2.2-cvs20010622-1) unstable; urgency=low
+ 
+  * New upstream cvs pull
+  * 2.2 beta1
+  * Adding in Enhances
+  * abbrowser moved to kdelibs
+  * New package: kandy
+  * Fix typo (Closes: #101349)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
+
+kdepim (4:2.1.1-2) unstable; urgency=low
+ 
+  * Update menu bits to include new kde menu removal tag
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 08 Apr 2001 17:46:00 -0700
+
+kdepim (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 17:00:00 -0700
+
+kdepim (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Upstream fixes (Closes: #77622, #77803)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Mar 2001 22:31:00 -0700
+
+kdepim (4:2.1.0-1) unstable; urgency=low
+ 
+  * New upstream CVS pull
+  * Update shlibs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 07 Mar 2001 22:31:00 -0700
+
+kdepim (4:2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Upping standards version
+  * Fix build problem with new libc 2.2.1 (Closes: #86435)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdepim (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
+
+kdepim (4:2.1-20010118-1) unstable; urgency=low
+ 
+  * New upstream cvs version
+  * Fixing overwrite problem (Closes: #82965)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 21 Jan 2001 00:46:00 -0700
+
+kdepim (4:2.1-20010115-1) unstable; urgency=low
+ 
+  * New upstream cvs version
+  * no more libical package
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
+
+kdepim (4:2.1-20010106-1) unstable; urgency=low
+ 
+  * New upstream cvs version
+  * Updating build-depends
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
+
+kdepim (4:2.1-20010101-1) unstable; urgency=low
+ 
+  * New upstream cvs version
+  * korganizer is now 2.1beta1 as well
+  * Breaking out libical into it's own lib/lib-dev packages
+  * Updating build-depends
+        
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 01 Jan 2001 15:30:00 -0700
+
+kdepim (4:2.1-20001218-1) unstable; urgency=low
+
+  * New upstream cvs version
+  * Including kpilot, 2 years and 10 days after I did the ITP for it (Closes: #68255)
+  * korganizer is the 2.0.1 version still
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Dec 2000 23:00:00 -0700
+
+kdepim (2.0-20001011-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 12 Sep 2000 06:00:00 -0700
+                                                                                
+kdepim (2.0-20001006-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 06 Sep 2000 22:00:00 -0700
+                                                                                
+kdepim (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 Sep 2000 15:00:00 -0700
+                                                                                
+kdepim (2.0-20001002-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC1
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 02 Sep 2000 01:30:00 -0700
+                                                                                
+kdepim (2.0-20000925-2) unstable; urgency=low
+
+  * More upstream fixes
+  * Clean build against new libc6
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 26 Sep 2000 22:30:00 -0700
+
+kdepim (2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Build-Depends work
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdepim (2.0-20000920-2) unstable; urgency=low
+ 
+  * Fixing some dependencies
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 21 Sep 2000 17:30:00 -0700
+
+kdepim (2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
+
+kdepim (2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing task-kdepim description (Closes: #71984)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Sep 2000 22:00:00 -0700
+
+kdepim (2.0-20000912-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing non-replacement of old kdepim package
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 12 Sep 2000 22:00:00 -0700
+
+kdepim (2.0-20000909-0) unstable; urgency=low
+
+  * upstream fixes
+  * More build cleanups
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 09 Sep 2000 22:00:00 -0700
+
+kdepim (2.0-20000905-0) unstable; urgency=low
+
+  * upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 05 Sep 2000 17:00:02 -0700
+
+kdepim (2.0-20000901-0) unstable; urgency=low
+ 
+  * Build fixes
+  * upstream fixes 
+  * merging build fixes with upstream cvs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Sep 2000 17:00:02 -0700
+                                                                               
+kdepim (2.0-20000825-0) experimental; urgency=low
+ 
+  * Build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 25 Aug 2000 22:30:02 -0700
+                                                                                
+kdepim (2.0-20000823-1.0) experimental; urgency=low
+ 
+  * KDE 2.0 beta 4
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 23 Aug 2000 16:30:02 -0700
+                                                                                
+kdepim (2.0-20000820-1.0) experimental; urgency=low
+ 
+  * New upstream beta version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 20 Aug 2000 15:30:02 -0700
+                                                                                
+kdepim-cvs (2.0-20000521-1.0) experimental; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 21 May 2000 18:15:02 -0700
+
+kdepim-cvs (2.0-20000516-1.0) experimental; urgency=low
+
+  * Initial Release.
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 16 May 2000 20:40:02 -0700

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

Added: people/jriddell/KDE/3.5/kdepim/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,620 @@
+Source: kdepim
+Section: kde
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Daniel Schepler <schepler at debian.org>
+Build-Depends: autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.5.1), libbluetooth1-dev, libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-doc
+Build-Conflicts: libkleopatra0-dev
+Standards-Version: 3.6.2
+
+Package: kdepim
+Section: kde
+Architecture: all
+Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
+Suggests: kdepim-doc-html
+Description: KDE Personal Information Management metapackage
+ kdepim is a collection of Personal Information Management (PIM) tools for the
+ K Desktop Enviromnent (KDE).
+ .
+ This is an empty package which depends on the current version of every
+ application in the kdepim distribution.
+
+Package: kdepim-dev
+Section: devel
+Architecture: any
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
+Replaces: libkcal2-dev (<< 4:3.5.0), libmimelib1-dev (<< 4:3.5.0)
+Description: KDE Personal Information Management [development]
+ This package contains development files needed to compile kdepim applications.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kdepim-doc
+Section: doc
+Architecture: all
+Suggests: www-browser, doc-base
+Description: KDE Personal Information Management library documentation
+ KDE core library documentation. You need this documentation to develop KDE PIM
+ applications.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kdepim-doc-html
+Section: doc
+Architecture: all
+Suggests: www-browser, doc-base
+Description: KDE PIM documentation in HTML format
+ By default the Personal Information Management applications provided with
+ 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 PIM documentation converted to HTML format so it can be read with any
+ web browser.
+ .
+ This package is part of the official KDE pim module.
+
+Package: akregator
+Section: web
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kontact (<< 4:3.5.1)
+Description: RSS feed aggregator for KDE
+ aKregator is a fast, lightweight, and intuitive feed reader program
+ for KDE.  It allows you to quickly browse through hundreds of
+ thousands of internet feeds in a quick, efficient, and familiar way.
+
+Package: kaddressbook
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: kdepim-kresources
+Replaces: kontact (<< 4:3.5.1)
+Description: KDE NG addressbook application
+ KAddressBook is the main address book application for KDE; it enables you
+ to manage your contacts efficiently and comfortably. It can load and save
+ your contacts to many different locations, including the local file system,
+ LDAP servers, and SQL databases.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kalarm
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: kmix, kttsd
+Description: KDE alarm message, command and email scheduler
+ KAlarm provides a graphical interface to schedule personal timed events -
+ pop-up alarm messages, command execution and sending emails. There is a
+ range of options for configuring recurring events.
+ .
+ A pop-up alarm can show either a simple text message, or the contents of a
+ text or image file, It can optionally be spoken, or play a sound file. You
+ can choose its appearance, and set reminders. Among KAlarm's other
+ facilities, you can set up templates to allow KAlarm to be used as a 'tea
+ timer'.
+ .
+ As an alternative to using the graphical interface, alarms can be scheduled
+ from the command line or via DCOP calls from other programs. KAlarm is
+ KDE-based, but will also run on other desktops.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kandy
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE mobile phone utility
+ At the moment Kandy is more or less a terminal program with some special
+ features to store commands and their parameters, but is also has a simple GUI
+ to access the phone book of a mobile phone and it is able to save this phone
+ book to the KDE address book.
+ .
+ Kandy is aimed at mobile phones with integrated (GSM) modems.
+ .
+ This package is part of the official KDE pim module.
+
+Package: karm
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kontact (<< 4:3.5.1)
+Description: KDE time tracker tool
+ KArm is a time tracker for busy people who need to keep track of the amount of
+ time they spend on various tasks.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kdepim-kfile-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE File dialog plugins for palm and vcf files
+ File dialog plugins for palm and vcf files.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kdepim-kio-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase-kio-plugins (<< 4:3.5.0)
+Description: KDE pim I/O Slaves
+ This package includes the pim kioslaves. This includes imap4, sieve,
+ and mbox.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kdepim-kresources
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libkcal2a (<< 4:3.5.0), kaddressbook (<< 4:3.5.0), knotes (<< 4:3.5.0)
+Recommends: ${shlibs:Recommends}, korganizer
+Suggests: knotes
+Description: KDE pim resource plugins
+ This package includes several plugins needed to interface with groupware
+ servers. It also includes plugins for features such as blogging and
+ tracking feature plans.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kdepim-wizards
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdepim-dev (<< 4:3.5.0)
+Suggests: egroupware
+Description: KDE server configuration wizards
+ This package contains KDE-based wizards for configuring eGroupware,
+ Kolab, and SUSE Linux Openexchange servers.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kitchensync
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: konqueror
+Replaces: kontact (<< 4:3.5.1)
+Description: Synchronization framework
+ This package contains a synchronization framework, still under heavy
+ development.  It also contains the multisynk GUI frontend.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kleopatra
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11
+Description: KDE Certificate Manager
+ Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
+ keybox and for retrieving certificates from LDAP servers.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kmail
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}, ${perl:Depends}, kdepim-kio-plugins | kdebase-kio-plugins
+Recommends: kdepim-kio-plugins, kdebase-kio-plugins, procmail
+Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter, clamav | f-prot-installer
+Replaces: kdepim-dev (<< 4:3.5.0), kdebase-data (<< 4:3.5.0), kontact (<< 4:3.5.1)
+Provides: imap-client, mail-reader
+Description: KDE Email client
+ KMail is a fully-featured email client that fits nicely into the KDE
+ desktop. It has features such as support for IMAP, POP3, multiple accounts,
+ mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
+ .
+ You need to install kdepim-kio-plugins if you want to use IMAP or
+ mbox files, and/or kdebase-kio-plugins if you want to use POP3.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kmailcvt
+Section: mail
+Architecture: any
+Depends: ${shlibs:Depends}, kmail
+Description: KDE KMail mail folder converter
+ Converts mail folders to KMail format.  Formats supported for import
+ include Outlook Express, Evolution, and plain mbox.
+ .
+ This package is part of the official KDE pim module.
+
+Package: knode
+Section: news
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdepim-dev (<< 4:3.5.0), kontact (<< 4:3.5.1)
+Provides: news-reader
+Description: KDE news reader
+ KNode is an easy-to-use, convenient newsreader. It is intended to be usable
+ by inexperienced users, but also includes support for such features as
+ MIME attachments, article scoring, and creating and verifying GnuPG
+ signatures.
+ .
+ This package is part of the official KDE pim module.
+
+Package: knotes
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: kdepim-kresources
+Replaces: kontact (<< 4:3.5.1)
+Description: KDE sticky notes
+ KNotes is a program that lets you write sticky notes. The notes are saved
+ automatically when you exit the program, and they display when you open the
+ program.  The program supports printing and mailing your notes.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kode
+Section: devel
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Helper library for programmatic generation of C++ code
+ This package includes a program kode for generation of C++ template files
+ and kxml_compiler for generation of C++ classes representing XML data
+ described by RelaxNG schemes.
+
+Package: konsolekalendar
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE konsole personal organizer
+ To support console-based calendaring with KDE, the konsolekalendar
+ complements the KDE KOrganizer with an according frontend to manage
+ appointments and your schedule on a text-based console.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kontact
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes
+Suggests: ${shlibs:Suggests}, akregator, knewsticker, kweather
+Replaces: akregator (<< 4:3.5.0), akregator-kontact-plugin
+Conflicts: akregator-kontact-plugin
+Description: KDE pim application
+ Kontact is the integrated solution to your personal information management
+ needs. It combines KDE applications like KMail, KOrganizer, and
+ KAddressBook into a single interface to provide easy access to mail,
+ scheduling, address book and other PIM functionality.
+ .
+ This package is part of the official KDE pim module.
+
+Package: korganizer
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, ${perl:Depends}
+Recommends: kghostview
+Replaces: kontact (<< 4:3.5.1)
+Description: KDE personal organizer
+ A complete calendar and scheduling program. KOrganizer supports information
+ interchange with other calendar applications through the industry standard
+ vCalendar file format.
+ .
+ KOrganizer aims to be a complete program for organizing your appointments,
+ contacts, projects, etc. It is in the same spirit as similar programs like
+ the now ubiquitous Microsoft Outlook, Starfish Internet Sidekick,
+ Time & Chaos, etc. (all for the Microsoft Windows platform, of course.) Best
+ of all, It reads and writes the vCalendar file format NATIVELY (please see
+ http://www.imc.org/pdi for more information), which is now an industry-wide
+ personal data interchange format. Because of this, you should be able to move
+ from other modern PIMs to KOrganizer with relative ease. Current users of the
+ popular program ical should definitely take a look at KOrganizer and compare
+ features.
+ .
+ KOrganizer also offers full synchronization with your Palm Pilot, if you have
+ kpilot installed.
+ .
+ This package is part of the official KDE pim module.
+
+Package: korn
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdepim-kio-plugins | kdebase-kio-plugins
+Description: KDE mail checker
+ Korn is a KDE mail checker that can display a small summary in the Kicker
+ tray.  It supports checking mbox, pop3, imap4, and nntp sources.
+ .
+ Once mail is received you can have Korn run a third party program or change
+ the color/icon of the Kicker display.  In addition to this you can have
+ Korn run a program once you click on the docked icon in Kicker.
+ .
+ This package is part of the official KDE pim module.
+
+Package: kpilot
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: knotes, korganizer
+Replaces: kontact (<< 4:3.5.1)
+Description: KDE Palm Pilot hot-sync tool
+ KPilot is an application that synchronizes your Palm Pilot or similar device
+ (like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
+ software does for Windows.  KPilot can back-up and restore your Palm Pilot
+ and synchronize the built-in applications with their KDE counterparts.
+ .
+ This package is part of the official KDE pim module.
+
+Package: ksync
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE Sync
+ KSync is a small application using libksync, which provides a GUI for
+ selecting and syncing files, which contain data of the types, for which
+ implementations of the libksync interfaces exist. It is able to sync data
+ across networks by using the KDE ioslaves.
+ .
+ This package is part of the official KDE pim module.
+
+Package: ktnef
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE TNEF viewer
+ The TNEF File Viewer allows you to handle mail attachments using the TNEF
+ format. These attachments are usually found in mails coming from Microsoft
+ mail servers and embed the mail properties as well as the actual attachments.
+ .
+ This package is part of the official KDE pim module.
+
+Package: networkstatus
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE network status monitor
+ NetworkStatus tracks the status of network interfaces and provides
+ notification to applications when this status changes.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libindex0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kmail (<< 4:3.5.1)
+Conflicts: kmail (<< 4:3.5.1)
+Description: KDE indexing library
+ This library provides text indexing and is currently used by KMail
+ to implement fast searches in mail bodies.
+ .
+ This is the runtime package for programs that use the libindex library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libindex0-dev
+Section: libdevel
+Architecture: any
+Depends: libindex0 (= ${Source-Version})
+Replaces: kdepim-dev (<< 4:3.5.1), kmail (<< 4:3.5.1)
+Conflicts: kdepim-dev (<< 4:3.5.1), kmail (<< 4:3.5.1)
+Description: KDE indexing library [development]
+ This library provides text indexing and is currently used by KMail
+ to implement searching through mail text.
+ .
+ This is the development package which contains the headers for the libindex
+ library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkcal2b
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: ${shlibs:Recommends}
+Conflicts: libkcal2, libkcal2a
+Replaces: libkcal2a
+Suggests: kdepim-kresources
+Description: KDE calendaring library
+ This library provides a C++ API for handling the vCalendar and iCalendar
+ formats.
+ .
+ This is the runtime package for programs that use the libkcal library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkcal2-dev
+Section: libdevel
+Architecture: any
+Depends: libkcal2b (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version})
+Description: KDE calendaring library [development]
+ This library provides a C++ API for handling the vCalendar and iCalendar
+ formats.
+ .
+ This is the development package which contains the headers for the libkcal
+ library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkdepim1a
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libkdepim1
+Replaces: akregator (<< 4:3.5.0), libkdepim1
+Description: KDE PIM library
+ This is the runtime package for programs that use the libkdepim library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkdepim1-dev
+Section: libdevel
+Architecture: any
+Depends: libkdepim1a (= ${Source-Version}), kdelibs4-dev (>= 4:3.4.1)
+Replaces: kdepim-dev (<< 4:3.5.1)
+Description: KDE PIM library [development]
+ This is the development package which contains the headers for the libkdepim
+ library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkgantt0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE gantt charting library
+ This is the runtime package for programs that use the libkgantt library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkgantt0-dev
+Section: libdevel
+Architecture: any
+Depends: libkgantt0 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Description: KDE gantt charting library [development]
+ This is the development package which contains the headers for the libkgantt
+ library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkleopatra1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
+Conflicts: libkleopatra0, libkleopatra0a
+Replaces: libkdenetwork2, libkleopatra0, libkleopatra0a
+Description: KDE GnuPG interface libraries
+ This library is used by several KDE applications to interface to the
+ GnuPG program.
+ .
+ This is the runtime package for programs that use the libkleopatra library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkleopatra1-dev
+Section: libdevel
+Architecture: any
+Depends: libkleopatra1 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Conflicts: libkleopatra0-dev
+Replaces: libkleopatra0-dev
+Description: KDE GnuPG interface libraries [development]
+ This library is used by several KDE applications to interface to the
+ GnuPG program.
+ .
+ This is the development package which contains the headers for the
+ libkleopatra library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkmime2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libmimelib1a
+Replaces: libmimelib1a
+Description: KDE MIME interface library
+ This library provides a C++ interface to MIME messages, parsing them into
+ an object tree.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkpimexchange1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE PIM Exchange library
+ This is the runtime package for programs that use the libkpimexchange
+ library. 
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkpimexchange1-dev
+Section: libdevel
+Architecture: any
+Depends: libkpimexchange1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Description: KDE PIM Exchange library [development]
+ This is the development package which contains the headers for the
+ libkpimexchange library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libkpimidentities1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE PIM user identity information library
+ This library provides information to KDE programs about user identity,
+ such as email address, organization, etc.
+ .
+ This is the runtime package for programs that use the libkpimidentities
+ library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libksieve0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE mail/news message filtering library
+ This is the runtime package for programs that use the libksieve library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libksieve0-dev
+Section: libdevel
+Architecture: any
+Depends: libksieve0 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Description: KDE mail/news message filtering library [development]
+ This is the development package which contains the headers for the libksieve
+ library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libktnef1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: ktnef (<< 4:3.5.0)
+Description: Library for handling KTNEF email attachments
+ This library handles mail attachments using the TNEF format. These
+ attachments are usually found in mails coming from Microsoft mail
+ servers and embed the mail properties as well as the actual
+ attachments.
+ .
+ This is the runtime library for packages using the ktnef library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libktnef1-dev
+Section: libdevel
+Architecture: any
+Depends: libktnef1 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Replaces: kdepim-dev (<< 4:3.5.0)
+Description: KTNEF handler library [development]
+ This library handles mail attachments using the TNEF format. These
+ attachments are usually found in mails coming from Microsoft mail
+ servers and embed the mail properties as well as the actual
+ attachments.
+ .
+ This is the development package which contains the headers for the
+ ktnef library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libmimelib1c2a
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libmimelib1a, libmimelib1c2
+Replaces: libmimelib1a, libmimelib1c2
+Description: KDE mime library
+ This library is used by several KDE applications to handle mime types.
+ .
+ This is the runtime package for programs that use the libmimelib library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libmimelib1-dev
+Section: libdevel
+Architecture: any
+Depends: libmimelib1c2a (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Description: KDE mime library [development]
+ This library is used by several KDE applications to handle mime types.
+ .
+ This is the development package which contains the headers for the
+ libmimelib library.
+ .
+ This package is part of the official KDE pim module.

Added: people/jriddell/KDE/3.5/kdepim/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,437 @@
+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: Rik Hemsley <rik at kde.org>
+			and many others...
+
+Copyright:
+
+All programs are either under the Artistic, BSD, or GPL licenses, see below
+for details on the respective applications and additions to BSD-derivative
+licenses.
+
+On Debian systems, the complete text of these licenses can be found in:
+
+/usr/share/common-licenses/Artistic
+/usr/share/common-licenses/BSD
+/usr/share/common-licenses/GPL
+
+The kdocbook documentation for the applications is under the GFDL
+license.  The complete text of this license is included below.
+
+When in doubt, check the individual file, they should all have license
+headings and other identifying marks.
+
+akregator, kaddressbook, kalarm, kalarmd, kandy, karm, kdgantt,
+kfile-plugins, kgantt, kioslaves, kitchensync, kleopatra, kmail,
+kmailcvt, knode, knotes, konsolekalendar, kontact, korganizer, kpilot,
+ksync, ktnef, libkdenetwork, libkdepim, libkleopatra,
+libkpimidentities, libksieve, mimelib, wizards
+----------------------------------------------------------------------------
+GPL
+
+
+libical, libkcal, libkpimexchange
+------------------------
+LGPL
+
+
+                    GNU Free Documentation License
+                      Version 1.2, November 2002
+
+
+     Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+         59 Temple Place, Suite 330, Boston, MA  02111-1307  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/kdepim/debian/icons/akregator-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/akregator-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/akregator-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,72 @@
+/* XPM */
+static char *akregator-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 50 1",
+"  c black",
+". c #131317",
+"X c #21212E",
+"o c gray32",
+"O c #58586A",
+"+ c #555578",
+"@ c #7C7C93",
+"# c #F91A00",
+"$ c #FF7C00",
+"% c #82828D",
+"& c #80809B",
+"* c #92929E",
+"= c #9B9BAF",
+"- c #A2A2AE",
+"; c #A7A7BC",
+": c #B1B1C3",
+"> c #B2B2C4",
+", c #BDBDC7",
+"< c #BDBDCC",
+"1 c #BDBDCD",
+"2 c #C0A0A4",
+"3 c #E4B9AB",
+"4 c #E4C49A",
+"5 c #C5C5C9",
+"6 c #C2C2D2",
+"7 c #C5C3D1",
+"8 c #C4C4D1",
+"9 c #C6C6D3",
+"0 c #C6C6D4",
+"q c #C9C7D5",
+"w c #CECEDA",
+"e c #D0CDD9",
+"r c #D3CED8",
+"t c #D2D2D9",
+"y c #D4D2DB",
+"u c #D7D7DF",
+"i c #DAD0D5",
+"p c #D9D9E0",
+"a c #DADAE2",
+"s c #DCDCE4",
+"d c #E0CFC9",
+"f c #E5DBE0",
+"g c #E3E3E9",
+"h c #E4E4E9",
+"j c #EAEAEF",
+"k c #EDECF1",
+"l c #EDEDF1",
+"z c #F2F2F4",
+"x c gray100",
+"c c None",
+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"                ",
+"############3fp:",
+"#xxx$xx$xx$$dkzw",
+"#x$x$x$$x$$$i5%.",
+"#xx$$$x$$x$4yt  ",
+"#x$x$xx$xx$ejk8X",
+"#$$$$$$$$$e,-91 ",
+"######28q0gs    ",
+"      1puohg@   ",
+"      =p> *8O   ",
+"      +;&       ",
+"cccccc         c",
+"cccccc        cc"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/akregator.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/akregator.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/akregator.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,248 @@
+/* XPM */
+static char *akregator[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 210 2",
+"   c #000000",
+".  c #05050A",
+"X  c #0D0D0D",
+"o  c #111115",
+"O  c #25252F",
+"+  c #2A2A30",
+"@  c #32323B",
+"#  c #3A3A48",
+"$  c #454551",
+"%  c #474759",
+"&  c #4A4A59",
+"*  c #545464",
+"=  c #55556A",
+"-  c #585861",
+";  c #595969",
+":  c #646471",
+">  c #6F6F77",
+",  c #6B6B7E",
+"<  c #71717E",
+"1  c #6D6D83",
+"2  c #747485",
+"3  c #7A7A8C",
+"4  c #BA5A00",
+"5  c #BF752E",
+"6  c #BB7D45",
+"7  c #DE2900",
+"8  c #DE3300",
+"9  c #E20000",
+"0  c #E90000",
+"q  c #EE1E00",
+"w  c #F00000",
+"e  c #E22800",
+"r  c #EB2A00",
+"t  c #FD2700",
+"y  c #F73000",
+"u  c #F93000",
+"i  c #CB4B25",
+"p  c #CB6200",
+"a  c #DD6B00",
+"s  c #E37A01",
+"d  c #FF7C00",
+"f  c #FD6E25",
+"g  c #FD7027",
+"h  c #FD7129",
+"j  c #BB8009",
+"k  c #B69016",
+"l  c #BC8E3F",
+"z  c #AD8056",
+"x  c #B68C51",
+"c  c #B39557",
+"v  c #BF9768",
+"b  c #C5880E",
+"n  c #CE9A00",
+"m  c #DB9900",
+"M  c #C68E39",
+"N  c #DA8637",
+"B  c #C8A42E",
+"V  c #E1850A",
+"C  c #E39900",
+"Z  c #EE9701",
+"A  c #FF8200",
+"S  c #FF850B",
+"D  c #FF8B00",
+"F  c #FF8614",
+"G  c #FA8B14",
+"H  c #F39202",
+"J  c #FF9300",
+"K  c #FF9D00",
+"L  c #F7901C",
+"P  c #FF9B10",
+"I  c #E58123",
+"U  c #F08521",
+"Y  c #F4943A",
+"T  c #FF9A3C",
+"R  c #EFB502",
+"E  c #F7AE00",
+"W  c #FFA600",
+"Q  c #FCAB00",
+"!  c #FAAB0D",
+"~  c #FEAF1D",
+"^  c #FFB100",
+"/  c #FFB50B",
+"(  c #FFBA00",
+")  c #EBB835",
+"_  c #FEAF25",
+"`  c #FFAC2E",
+"'  c #C79159",
+"]  c #CE9F5D",
+"[  c #C39F6F",
+"{  c #CE9E67",
+"}  c #CF9F73",
+"|  c #C1A546",
+" . c #D0A85A",
+".. c #D6BD7B",
+"X. c #F09B42",
+"o. c #FF9F45",
+"O. c #E79F7E",
+"+. c #E0B643",
+"@. c #FFAA48",
+"#. c #FFAE52",
+"$. c #FFA959",
+"%. c #FFBC56",
+"&. c #FFBC5B",
+"*. c #E5B161",
+"=. c #EDB267",
+"-. c #FFAE62",
+";. c #FFBE6F",
+":. c #FFB570",
+">. c #FFBC7D",
+",. c #FFC200",
+"<. c #FFCB00",
+"1. c #FACA08",
+"2. c #FFD000",
+"3. c #FFC64A",
+"4. c #FFC272",
+"5. c #81818D",
+"6. c #818196",
+"7. c #838398",
+"8. c #8C8C96",
+"9. c #8D8D9D",
+"0. c #92929E",
+"q. c #8C8CA0",
+"w. c #9090A6",
+"e. c #9595AA",
+"r. c #9B9BAD",
+"t. c #9D9DB0",
+"y. c #A7A7B2",
+"u. c #A6A6B8",
+"i. c #ADADB7",
+"p. c #AAAABC",
+"a. c #B6AAB6",
+"s. c #BFB5BE",
+"d. c #AFAFC1",
+"f. c #B4B4C3",
+"g. c #B8B8C7",
+"h. c #BBBBCA",
+"j. c #D898A0",
+"k. c #CFAD85",
+"l. c #CCAD8F",
+"z. c #C6A994",
+"x. c #C3AF9C",
+"c. c #CFBF99",
+"v. c #DEB289",
+"b. c #C5B2BB",
+"n. c #C6BABF",
+"m. c #E3B992",
+"M. c #FFBE82",
+"N. c #C2BDC9",
+"B. c #DDC7A5",
+"V. c #DBC4AB",
+"C. c #DACBAD",
+"Z. c #D8C6B9",
+"A. c #EDD192",
+"S. c #F4C085",
+"D. c #FDC48B",
+"F. c #FFCA8E",
+"G. c #F7CD96",
+"H. c #FFC691",
+"J. c #FFCA98",
+"K. c #E3C2A9",
+"L. c #E0CBB8",
+"P. c #F3D6A7",
+"I. c #FFD1A7",
+"U. c #FFD4AB",
+"Y. c #F7D3B2",
+"T. c #F1D9B2",
+"R. c #FFD7B2",
+"E. c #FFDAB3",
+"W. c #FFDBB9",
+"Q. c #C0C0CD",
+"!. c #CFC7C9",
+"~. c #C6C6D1",
+"^. c #C8C4D0",
+"/. c #C8C8D3",
+"(. c #D1C6D0",
+"). c #D2CDD8",
+"_. c #D5D0D3",
+"`. c #D4D4DD",
+"'. c #D8D6DF",
+"]. c #D8D7E2",
+"[. c #DCDBE4",
+"{. c #DFDFE9",
+"}. c #E0CFC7",
+"|. c #E2D6C0",
+" X c #E3D8C9",
+".X c #E3DBD1",
+"XX c #E0D9DA",
+"oX c #ECDED1",
+"OX c #F7DFC9",
+"+X c #FFDEC0",
+"@X c #E0DEE3",
+"#X c #ECE2D8",
+"$X c #F3E2CE",
+"%X c #F6E8C4",
+"&X c #F7E3D1",
+"*X c #F3E9DA",
+"=X c #FDE5D0",
+"-X c #FBEAD9",
+";X c #E1E1E7",
+":X c #E4E4EA",
+">X c #EFE8E2",
+",X c #EAEAEF",
+"<X c #ECECF2",
+"1X c #F5ECE3",
+"2X c #FBF7EC",
+"3X c #F5F5F8",
+"4X c #FBF6F3",
+"5X c #FCF9F6",
+"6X c #FDFCFC",
+"7X c None",
+/* pixels */
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X        7X7X7X",
+"0 0 0 0 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 j.(.(.g.r.<     ",
+"t f h h h h h h h h h h h h h f h f f f f f f f O.[.).:X`.h.p.w.",
+"u M.E.W.W.U.U.U.U.U.R.+XW.U.U.U.U.+XE.U.U.I.I.J.K.`.].6X6X6X6Xp.",
+"y :.-X6X6X6XoXH.H.=X6X3X6XV.F.W.6X5X6X#XS.D.D.-.}./.{.3X<X`.h.9.",
+"y $.&X5X6 }.6X} M.6Xx.' { v 4.1X Xx ] [ =.;.#.S XXN./.i.0.: +   ",
+"y o.OX6Xv.*X>X6 $.1X6X$XG.&.3.T.6X*XY.3.` P J L ;Xb.X           ",
+"y S Y.6XoX6Xl.Y T X.k. X6XB._ ~  .C.3X1XZ K J Z.]./.8.          ",
+"y d Y.6X4 m.6XN S @.J H *XL.C 3./ E A.6Xb W *.:XQ.:X].r.O       ",
+"y d Y.6Xp F 4XL.G 5X4X2X6Xc E %X6X2X6Xc.m ! _.Q.`.<X<X:Xt.:     ",
+"y d U 5 a d I 5 s V M x p m ( R B | k n ) !.[.g.;X,X<X<X,Xu.=   ",
+"y d d d d d d A D J K Q ( ,.,.<.<.2.<...'.`.i.- 5.r.g.:X<Xp..   ",
+"y d d d d d d A D J K Q R ( ,.1.+.l.n.{.h.h.h..     $ 3 e.,     ",
+"q r e 7 7 7 7 7 8 8 8 8 i a.n.~.{.{./.d./.:X'.3         .       ",
+"                        ; d.g.p.p.r.2 /.,X:X:Xt.                ",
+"                        @ g.Q.].;Xy.  > /.,X:XQ.*             7X",
+"7X                        f.[.[.'.0.    9.Q.:X:X6.      7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X  r.`.[./.2       q.~.p.2       7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X  7.Q.[.f.*       X 1 o         7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X  , t./.r.#                   7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X  = % % .                 7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X              7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X          7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kaddressbook-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kaddressbook-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kaddressbook-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,134 @@
+/* XPM */
+static char *kaddressbook-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 112 2",
+"   c black",
+".  c #00004C",
+"X  c #091A4F",
+"o  c #1D3675",
+"O  c #1F3879",
+"+  c #243E72",
+"@  c #36477A",
+"#  c #52617F",
+"$  c #244183",
+"%  c #244184",
+"&  c #264386",
+"*  c #274489",
+"=  c #28458A",
+"-  c #2A498F",
+";  c #2A4A8F",
+":  c #2D4D94",
+">  c #2D4E96",
+",  c #39558A",
+"<  c #30529B",
+"1  c #32549D",
+"2  c #33559C",
+"3  c #3559A3",
+"4  c #3A5DA0",
+"5  c #3B5CA2",
+"6  c #395EAB",
+"7  c #3B62AF",
+"8  c #3D63AB",
+"9  c #3D63B2",
+"0  c #3F66B3",
+"q  c #52528B",
+"w  c #466196",
+"e  c #4663A0",
+"r  c #4367AD",
+"t  c #436DBE",
+"y  c #5578BD",
+"u  c #4773C6",
+"i  c #4D77C6",
+"p  c #4974C8",
+"a  c #4975C9",
+"s  c #4B77C9",
+"d  c #4E78C5",
+"f  c #4A78CB",
+"g  c #4A78CC",
+"h  c #4B79CD",
+"j  c #4B79CE",
+"k  c #4C79CC",
+"l  c #4C7ACF",
+"z  c #4D7BD0",
+"x  c #4E7DD2",
+"c  c #4F7FD6",
+"v  c #507FD7",
+"b  c #6680B2",
+"n  c #5881CE",
+"m  c #5B83CC",
+"M  c #5A83CF",
+"N  c #5281D7",
+"B  c #5180D8",
+"V  c #5284DB",
+"C  c #5284DC",
+"Z  c #5686DD",
+"A  c #5587E0",
+"S  c #5689E3",
+"D  c #5789E3",
+"F  c #578AE4",
+"G  c #5886E3",
+"H  c #5989E0",
+"J  c #588BE5",
+"K  c #5A90EB",
+"L  c #5C91ED",
+"P  c #5C92EE",
+"I  c #5C92EF",
+"U  c #5E94F1",
+"Y  c #6381C0",
+"T  c #6C8BCA",
+"R  c #678ED6",
+"E  c #708BC2",
+"W  c #7595D4",
+"Q  c #7B98D2",
+"!  c #6090E5",
+"~  c #6292E7",
+"^  c #6594E7",
+"/  c #6092EB",
+"(  c #6596ED",
+")  c #6096F3",
+"_  c #639BFA",
+"`  c #649DFD",
+"'  c #659FFF",
+"]  c #669FFF",
+"[  c #709AE5",
+"{  c #69A4FF",
+"}  c #6FA4FE",
+"|  c #6CA8FF",
+" . c #6DA9FF",
+".. c #71A1F3",
+"X. c #74A1F0",
+"o. c #7BAAFB",
+"O. c #8B9EC1",
+"+. c #87A0D2",
+"@. c #8FA0DB",
+"#. c #83ADF8",
+"$. c #8BBBFF",
+"%. c #8EBDFF",
+"&. c #90B1EC",
+"*. c #92B4EF",
+"=. c #90BAFF",
+"-. c #91BFFF",
+";. c #92C0FF",
+":. c #ACD0FF",
+">. c #BDD9FF",
+",. c #C1DAFF",
+"<. c gray100",
+"1. c None",
+/* pixels */
+"1.1.1.1.1.1.1.1.1.1.] >.>.:.$. .",
+"1.1.1.1.1.1.1.1.1.1.&.O.# *.} _ ",
+"1.1.1.1.1.1.1.1.1.] , b w R J V ",
+"1.1.1.1.1.1.1.1.1.P 4 r + i s p ",
+"1.1.1.1.1.1.1.1.1.x s 8 0 Y 9 p ",
+"1.1.1.1.1.1.1.1.1.P d 1 e T : z ",
+"1.1.1.1.1.1.1.1.P ~ v m W 5 < c ",
+"1.1.1.1.1.1.1.1.( H z m y O t 1.",
+"1.1.1.1.1.1.1.X.^ v p M o 3 s 1.",
+"1.1.1.1.1.] o.X.Z z N $ ; f 1.1.",
+"1.1.1. .-.=.#.K v D & * z 1.1.1.",
+"1.-.Q E @ [ ( F D = : x 1.1.1.1.",
+"1.%.+.X < s U u & 7 V 1.1.1.1.1.",
+"1. .{ ] K u < 6 c F 1.1.1.1.1.1.",
+"1. at .Z I Z c I ] 1.1.1.1.1.1.1.1.",
+"1.q . 1.1.1.1.1.1.1.1.1.1.1.1.1."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kaddressbook.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kaddressbook.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kaddressbook.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,192 @@
+/* XPM */
+static char *kaddressbook[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 154 2",
+"   c black",
+".  c #00004E",
+"X  c #060652",
+"o  c #182655",
+"O  c #192B5F",
+"+  c #1A2C61",
+"@  c #1D3066",
+"#  c #1F336B",
+"$  c #2B2B6B",
+"%  c #20356D",
+"&  c #273C6B",
+"*  c #223972",
+"=  c #263E79",
+"-  c #303D60",
+";  c #363673",
+":  c #2C416A",
+">  c #27407B",
+",  c #28407C",
+"<  c #2B4582",
+"1  c #2D4886",
+"2  c #2E4A88",
+"3  c #354D86",
+"4  c #324F8F",
+"5  c #35528F",
+"6  c #3B548C",
+"7  c #345293",
+"8  c #3D5792",
+"9  c #3B5A94",
+"0  c #3B5B9E",
+"q  c #3B5DA1",
+"w  c #3E5EB3",
+"e  c #3F62A7",
+"r  c #3F62A8",
+"t  c #435480",
+"y  c #466197",
+"u  c #456199",
+"i  c #4C6395",
+"p  c #516697",
+"a  c #506799",
+"s  c #536898",
+"d  c #4162A5",
+"f  c #4164AB",
+"g  c #4965A2",
+"h  c #4E6DAC",
+"j  c #456AB3",
+"k  c #486FB8",
+"l  c #4A72BC",
+"z  c #5170AB",
+"x  c #5F73A1",
+"c  c #5B7BB9",
+"v  c #6377A5",
+"b  c #677DAD",
+"n  c #6C7FAA",
+"m  c #607CB5",
+"M  c #4D76C2",
+"N  c #4F78C6",
+"B  c #527AC5",
+"V  c #527DCB",
+"C  c #597DC1",
+"Z  c #6D86BA",
+"A  c #7187B7",
+"S  c #7C8DB2",
+"D  c #788FBF",
+"F  c #7C92BC",
+"G  c #5C85CF",
+"H  c #5582D2",
+"J  c #5985D4",
+"K  c #5986D8",
+"L  c #5B88D6",
+"P  c #5B8ADB",
+"I  c #5D8DE1",
+"U  c #5F90E4",
+"Y  c #6385C5",
+"T  c #6185C8",
+"R  c #6B8AC6",
+"E  c #6B8DCC",
+"W  c #628DDC",
+"Q  c #6491DE",
+"!  c #6D91D4",
+"~  c #6994DF",
+"^  c #708DC6",
+"/  c #7590C4",
+"(  c #7492CB",
+")  c #7C92C1",
+"_  c #7B93CF",
+"`  c #7394D0",
+"'  c #7599DA",
+"]  c #7B9AD2",
+"[  c #7B9DDA",
+"{  c #6091E5",
+"}  c #6294EA",
+"|  c #6598EF",
+" . c #6996E4",
+".. c #6D99E5",
+"X. c #6E9BE8",
+"o. c #669AF2",
+"O. c #6A9EF6",
+"+. c #6A9FF9",
+"@. c #729BE3",
+"#. c #729FEC",
+"$. c #6CA3FE",
+"%. c #7AA3EA",
+"&. c #75A3F1",
+"*. c #76A9FF",
+"=. c #79ABFF",
+"-. c #8191B7",
+";. c #8495B9",
+":. c #9393B3",
+">. c #849CCC",
+",. c #8A9CC2",
+"<. c #80A1DE",
+"1. c #88A5DA",
+"2. c #8FAADC",
+"3. c #94A6CB",
+"4. c #94AAD3",
+"5. c #99ADD3",
+"6. c #9CB4DF",
+"7. c #80A8EC",
+"8. c #88AEEF",
+"9. c #84ADF2",
+"0. c #84B3FE",
+"q. c #8BB2F3",
+"w. c #8DB8FF",
+"e. c #92AEE0",
+"r. c #94B3E8",
+"t. c #99B2E0",
+"y. c #9AB6E9",
+"u. c #94BCFE",
+"i. c #9ABBF3",
+"p. c #99BEFB",
+"a. c #A3B6DB",
+"s. c #BBBBD4",
+"d. c #A8BFE8",
+"f. c #A3BFF0",
+"g. c #9BC1FF",
+"h. c #A8C1EE",
+"j. c #A7C8FF",
+"k. c #A9C4F2",
+"l. c #ADC8F7",
+"z. c #AACBFF",
+"x. c #B4C6E8",
+"c. c #B9C7E3",
+"v. c #BBCBEA",
+"b. c #B5CDF5",
+"n. c #BDD2F7",
+"m. c #B9D4FF",
+"M. c #CCCCDD",
+"N. c #C0D1F0",
+"B. c #C5DBFF",
+"V. c #CCDBF5",
+"C. c #D1E1FB",
+"Z. c #DDEAFF",
+"A. c #FEFEFF",
+"S. c None",
+/* pixels */
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.*.0.g.w.*.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.i.h.k.h.b.j.w.*.$.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.q.n.V.c.N.[ r.=.&.$.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.o.l.S F : 2.6.E &.} } $.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S...t 1.y.s a 2.B @.K V $.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.o.W : ] y <.y ! l ! V l $.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.o.P z @.y h & B l E l f +.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.{ H 8 0 V q 9 l k R j r | S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.V P 0 : 5 j M j / c q r U S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.N H H V M f g 4.r 7 k P S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.I G l l j 7 7 D ) 7 1 N S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.P W l 9 < 8 A 4.a 1 1 H S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.I W L V V Y R >.) 2 = f V S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.I W H V V Y ^ 5.6 = = V S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.P Q K V V C Y >.b > # r B S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.U { W V V N C E ,., # < N S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.U  .~ J V V M C 5.3 # + M S.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.S.} X. at .P V V N l 4.i % + q M S.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.S.| #.%. .J V B M ( v % + 4 M S.S.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.S.S.o.&.7. .P V V N ( S % + < N S.S.S.S.S.S.S.S.",
+"S.S.S.S.S.S.S.S.$.$.9.8. at .~ J V N ` -.* + # N S.S.S.S.S.S.S.S.S.",
+"S.S.S.S.S.$.=.w.u.i.q.%. .P V V ] ;.* + # k S.S.S.S.S.S.S.S.S.S.",
+"S.S.S.$.p.g.k.x m q.%...P J J t.n * + , l S.S.S.S.S.S.S.S.S.S.S.",
+"S.S.m.z.s 6 1 < < k } P J ' a.i * + 1 V S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.$.B.B.) o < < 2 k I  .d.,.3 * + q V S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.$.w.A.Z.Z B ..9.h.x.4.y , * = N K S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.$.$.p.C.V.V.c.5.c 0 7 < * r K P S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.S.$.$.} H V l f q 2 < r P } S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.S.s._ } U V N l j V O.+.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.M.:.$ . w $.$.$.$.$.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.:.; . . S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"S.S.X . S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kalarm-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kalarm-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kalarm-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,191 @@
+/* XPM */
+static char *kalarm-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 169 2",
+"   c black",
+".  c gray20",
+"X  c gray25",
+"o  c gray35",
+"O  c gray36",
+"+  c #656565",
+"@  c gray45",
+"#  c #7B7B7B",
+"$  c #8D3800",
+"%  c #8E3900",
+"&  c #974202",
+"*  c #9B4400",
+"=  c #9A4B08",
+"-  c #984B10",
+";  c #A34B00",
+":  c #A44C00",
+">  c #A74F00",
+",  c #AA5100",
+"<  c #AF5500",
+"1  c #B05600",
+"2  c #B05900",
+"3  c #B25A01",
+"4  c #B35C00",
+"5  c #B45900",
+"6  c #A76700",
+"7  c #AD6100",
+"8  c #AE6914",
+"9  c #B36200",
+"0  c #B66700",
+"q  c #B16009",
+"w  c #BB6707",
+"e  c #BC6A00",
+"r  c #BF6C10",
+"t  c #B37A00",
+"y  c #BC700E",
+"u  c #BF710C",
+"i  c #BC7820",
+"p  c #B37836",
+"a  c #AA744B",
+"s  c #B37943",
+"d  c #C26700",
+"f  c #C36600",
+"g  c #C66D00",
+"h  c #C96C00",
+"j  c #CD6E00",
+"k  c #CF6E00",
+"l  c #CC7700",
+"z  c #C97408",
+"x  c #CA7C0E",
+"c  c #CD7910",
+"v  c #D27300",
+"b  c #D27400",
+"n  c #D47500",
+"m  c #D47600",
+"M  c #D47A00",
+"N  c #B78B05",
+"B  c #BE9376",
+"V  c #BF9472",
+"C  c #C08805",
+"Z  c #C98900",
+"A  c #C98113",
+"S  c #CD8A19",
+"D  c #C49300",
+"F  c #C79D00",
+"G  c #CC901B",
+"H  c #D68C0E",
+"J  c #DB8304",
+"K  c #DA8405",
+"L  c #D79012",
+"P  c #C98528",
+"I  c #CA8A3F",
+"U  c #CD9525",
+"Y  c #D69D2D",
+"T  c #D09B39",
+"R  c #D4A500",
+"E  c #D9B600",
+"W  c #DFA423",
+"Q  c #DAA62B",
+"!  c #E28500",
+"~  c #E38800",
+"^  c #E58D02",
+"/  c #E7950D",
+"(  c #EA990C",
+")  c #E49710",
+"_  c #F89B00",
+"`  c #EBA100",
+"'  c #EBA500",
+"]  c #EAA815",
+"[  c #FFAB0A",
+"{  c #FDB100",
+"}  c #FFB502",
+"|  c #FFB414",
+" . c #FFBC1D",
+".. c #E4AF2C",
+"X. c #CC954D",
+"o. c #CDA355",
+"O. c #DBB744",
+"+. c #CDA165",
+"@. c #CEA56C",
+"#. c #DDA761",
+"$. c #E1A447",
+"%. c #E5B859",
+"&. c #DBC100",
+"*. c #DAC300",
+"=. c #DCC100",
+"-. c #E0CF00",
+";. c #FFC500",
+":. c #FFD600",
+">. c #FFDC00",
+",. c #F5C02C",
+"<. c #F8C32C",
+"1. c #FFC729",
+"2. c #FFC92B",
+"3. c #F2C535",
+"4. c #FFD539",
+"5. c #FFD639",
+"6. c #FFD93D",
+"7. c #EBE500",
+"8. c #FFE600",
+"9. c #FFF300",
+"0. c #FFF400",
+"q. c #FFFE00",
+"w. c yellow",
+"e. c #EACD4C",
+"r. c #EACE51",
+"t. c #F1CD41",
+"y. c #F3D258",
+"u. c #EEC565",
+"i. c #EAD166",
+"p. c #FFE044",
+"a. c #FFE247",
+"s. c #FFE74C",
+"d. c #FFE84E",
+"f. c #FFEE57",
+"g. c #FFEF59",
+"h. c #FFF05F",
+"j. c #FFF063",
+"k. c gray65",
+"l. c #ACACAC",
+"z. c #B4B4B4",
+"x. c gray",
+"c. c #CDA280",
+"v. c #DAB285",
+"b. c #DAC8B5",
+"n. c #E4C19D",
+"m. c #E1C3A0",
+"M. c #E2CDBF",
+"N. c #FFF484",
+"B. c #FFF699",
+"V. c #C5C5C5",
+"C. c gray80",
+"Z. c #EADACF",
+"A. c #E3DDDA",
+"S. c #E1E1E1",
+"D. c gray89",
+"F. c #E6E6E6",
+"G. c #EFE9E6",
+"H. c gray91",
+"J. c gray92",
+"K. c #ECECEC",
+"L. c #EEEEEE",
+"P. c gray94",
+"I. c gray95",
+"U. c gray96",
+"Y. c #F8F8F8",
+"T. c gray98",
+"R. c #FDFDFD",
+"E. c gray100",
+"W. c None",
+/* pixels */
+"W.W.$ 8 O.o.- W.W.W.W.W.W.W.W.W.",
+"W.W.y 5.d.j.r.$ $ $ $ s p $ W.W.",
+"W.> ) 1.p...C E &.6 i.B.N.e.= W.",
+"W.1 J / K ' >.9.w.N g.g.g.d.U W.",
+"W.$ 3 ^ M g m _ ;.-.G a.p.6.W W.",
+"W.& ( a A.T.K. at .c { *.L <.2.x W.",
+"W.y i O C.E.E.E.Z.r { 7.E R * W.",
+"W.A @.o X I.E.k.l.M.! >.w.w.t W.",
+"W.S +.E.# @ F.. z.Y.I } w.w.F W.",
+"W.3 T E.E.@ . V.U.P.B [ w.w.D W.",
+"W., Q v.E.x.+ K.L.H.V | 9.9.7 W.",
+"W.W.w Y n.U.P.J.F.S.P  .8.Z > W.",
+"W.W.2 z %.#.m.F.b.X.,.] e < W.W.",
+"W.W.j ! f $.u.y.t.3.H 0 9 W.W.W.",
+"W.W.f g W.b b b b 4 ` l * W.W.W.",
+"W.W.W.W.W.W.W.W.W.3 b j ; W.W.W."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kalarm.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kalarm.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kalarm.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,276 @@
+/* XPM */
+static char *kalarm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 238 2",
+"   c black",
+".  c gray20",
+"X  c #3D3D3D",
+"o  c gray25",
+"O  c #555555",
+"+  c gray35",
+"@  c #646464",
+"#  c #7C7C7C",
+"$  c #8D3800",
+"%  c #953F00",
+"&  c #954300",
+"*  c #96470D",
+"=  c #9B4400",
+"-  c #9D4F09",
+";  c #974A12",
+":  c #9D520C",
+">  c #9E6538",
+",  c #A34C00",
+"<  c #A25202",
+"1  c #AB5200",
+"2  c #A85900",
+"3  c #AD5D09",
+"4  c #A45D18",
+"5  c #AA5810",
+"6  c #B05600",
+"7  c #B45B00",
+"8  c #BB5E00",
+"9  c #B15F10",
+"0  c #A06000",
+"q  c #AC6C00",
+"w  c #AE7400",
+"e  c #B26007",
+"r  c #B1630B",
+"t  c #B76F0E",
+"y  c #BB6300",
+"u  c #BA670B",
+"i  c #BE6806",
+"p  c #B86C0E",
+"a  c #B17600",
+"s  c #B17800",
+"d  c #B87200",
+"f  c #BE7904",
+"g  c #B2711C",
+"h  c #BE7B13",
+"j  c #BF7D18",
+"k  c #AF6820",
+"l  c #A56434",
+"z  c #B2712B",
+"x  c #B87E2C",
+"c  c #B57D3B",
+"v  c #BC7730",
+"b  c #996A4A",
+"n  c #B67B4E",
+"m  c #C36500",
+"M  c #C26801",
+"N  c #C46E08",
+"B  c #CB6C00",
+"V  c #C67205",
+"C  c #C57A00",
+"Z  c #CC7200",
+"A  c #C9730A",
+"S  c #CD7D0A",
+"D  c #D27400",
+"F  c #D47B02",
+"G  c #D17A0B",
+"H  c #DB7600",
+"J  c #E47D00",
+"K  c #B88300",
+"L  c #BC801F",
+"P  c #BB9500",
+"I  c #BF892A",
+"U  c #9F806B",
+"Y  c #B88040",
+"T  c #B78767",
+"R  c #BA8962",
+"E  c #BD9273",
+"W  c #CD8302",
+"Q  c #C78419",
+"!  c #CD8514",
+"~  c #C88519",
+"^  c #CA881A",
+"/  c #C69C00",
+"(  c #D38402",
+")  c #D4830A",
+"_  c #D48C01",
+"`  c #DB8302",
+"'  c #D18612",
+"]  c #D48C14",
+"[  c #D08F1A",
+"{  c #DB8B11",
+"}  c #D59700",
+"|  c #D99202",
+" . c #D99B00",
+".. c #DE9312",
+"X. c #DF941C",
+"o. c #C78327",
+"O. c #C5842E",
+"+. c #C88436",
+"@. c #CE8837",
+"#. c #CD9423",
+"$. c #CD9A2A",
+"%. c #DC9E20",
+"&. c #D7953C",
+"*. c #CCAA00",
+"=. c #CDB700",
+"-. c #DEAE00",
+";. c #D5B200",
+":. c #D9B600",
+">. c #D4AB37",
+",. c #DDAE30",
+"<. c #E18500",
+"1. c #E58B01",
+"2. c #EB990B",
+"3. c #E19D1B",
+"4. c #E89F16",
+"5. c #F19600",
+"6. c #F39A02",
+"7. c #FB9200",
+"8. c #FA9B00",
+"9. c #E0AC00",
+"0. c #E4A21D",
+"q. c #EBA81D",
+"w. c #E0BE00",
+"e. c #F1AE00",
+"r. c #FEA200",
+"t. c #F8A60B",
+"y. c #FFAA01",
+"u. c #FFAD0C",
+"i. c #FFB300",
+"p. c #FDB314",
+"a. c #FEBA1B",
+"s. c #E1A322",
+"d. c #E3AD2C",
+"f. c #E5B42F",
+"g. c #ECB62C",
+"h. c #E7B138",
+"j. c #E5BF3B",
+"k. c #EABC34",
+"l. c #FFBF20",
+"z. c #C69642",
+"x. c #C99052",
+"c. c #C69960",
+"v. c #C79F7C",
+"b. c #DFA24A",
+"n. c #DBA050",
+"m. c #DBBA66",
+"M. c #E2A549",
+"N. c #E8B343",
+"B. c #D5C400",
+"V. c #DBC100",
+"C. c #D8D200",
+"Z. c #DBDB00",
+"A. c #E4D300",
+"S. c #F6CB00",
+"D. c #FFC500",
+"F. c #FECA00",
+"G. c #FFC119",
+"H. c #FFCD11",
+"J. c #FFDC00",
+"K. c #E8C13D",
+"L. c #FFC325",
+"P. c #FDC428",
+"I. c #FFC92B",
+"U. c #FECD31",
+"Y. c #FFD134",
+"T. c #FFD639",
+"R. c #FFD93D",
+"E. c #E4E400",
+"W. c #ECEC00",
+"Q. c #FFE201",
+"!. c #FFEA00",
+"~. c #F4F400",
+"^. c #FEF300",
+"/. c #FEFE00",
+"(. c #F5D341",
+"). c #FDDC42",
+"_. c #F2D758",
+"`. c #F6DE53",
+"'. c #ECC46E",
+"]. c #EDCB73",
+"[. c #F2D761",
+"{. c #F3D96F",
+"}. c #F4DB78",
+"|. c #FFE045",
+" X c #FEE44A",
+".X c #FFE94E",
+"XX c #F8E65C",
+"oX c #FFED53",
+"OX c #FFEF59",
+"+X c #FFF05B",
+"@X c #FFF163",
+"#X c #FFF26B",
+"$X c #FFF374",
+"%X c #FFF37C",
+"&X c #828282",
+"*X c #909090",
+"=X c gray60",
+"-X c #AF9F94",
+";X c gray64",
+":X c #AEAEAE",
+">X c #B3AEAA",
+",X c gray72",
+"<X c #C5A48B",
+"1X c #C6AB9A",
+"2X c #CFB396",
+"3X c #DEBA90",
+"4X c #D1B6A5",
+"5X c #D6BFA5",
+"6X c #DBC1AF",
+"7X c #DFC9B5",
+"8X c #E3C888",
+"9X c #E3CA98",
+"0X c #F6DE80",
+"qX c #F7DF8A",
+"wX c #E6CFB4",
+"eX c #F8E985",
+"rX c #F8EB97",
+"tX c #FFF482",
+"yX c #FFF591",
+"uX c #FFF69B",
+"iX c #FFF7A2",
+"pX c #FFF7A8",
+"aX c #FCF1BA",
+"sX c #FFF8B2",
+"dX c #CBCBCB",
+"fX c gray83",
+"gX c #DED9D5",
+"hX c #DCDCDC",
+"jX c #E1D5C7",
+"kX c #E2D2C8",
+"lX c #EADACF",
+"zX c #E4E4E4",
+"xX c #EBEBEB",
+"cX c #F3EDE6",
+"vX c #F8F3ED",
+"bX c #F3F3F3",
+"nX c #FEFEFE",
+"mX c None",
+/* pixels */
+"mXmXmXmXmXmX$ : I z.Y ; $ mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX",
+"mXmXmXmXmX$ #. XOX$XyXrXz $ mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX",
+"mXmXmXmX& [ T.|.oXOX#X$X#Xg $ mXmXmXmXmXmX$ $ $ $ $ mXmXmXmXmXmX",
+"mXmXmXmX7 L.Y.R.|..XoXOXOXL $ $ $ $ mX$ ; x.9X8Xm.I $ mXmXmXmXmX",
+"mXmXmX, ) l.I.Y.R.|.|.).h s / / / s & 4 eXiXpXuXtX#X>.$ mXmXmXmX",
+"mXmXmX1 2.a.L.P.I.Y.s.f A./././././.w XX$X%XtX%X#XOXoX$.$ mXmXmX",
+"mXmXmX7 ` p.p.a.0.W :.~./././././.~.0 OX+X at X@X at XOXoX.X).- mXmXmX",
+"mXmXmXmXD 1.F B 1.8.r.r.i.F.^././.~.P K.oXOXoXoX.X.X|.R.j mXmXmX",
+"mXmXmXmX= < ` r.r.r.r.r.r.r.8.D.^./.C.t ). X X X|.).R.Y.^ mXmXmX",
+"mXmXmX$ = t.y.6.y k z z u F r.r.r.J.W.=.~ ).).).R.T.Y.I.! mXmXmX",
+"mXmX$ & t.u.V b >XfXzXxXhX1Xl F r.r.F.E.*.' U.Y.Y.Y.I.L.7 mXmXmX",
+"mXmX$ ) g.S n dXnXnXnXnXnXnXnX4Xr 8.r.D.E.B.W q.I.L.L...1 mXmXmX",
+"mXmX$ p.p.> ;XdXnXnXnXnXnXnXnXnXlX5 6.r.J.W.Z.;._ ) F , mXmXmXmX",
+"mXmX< a.^ -X@ . ;XnXnXnXnXnXnXnXnXlX9 r.y.^./.~.E.E.W.K $ mXmXmX",
+"mXmX3 L.p dX@ . X gXnXnXnXnXbX=XdXnX6XZ r.D./././././.V.$ mXmXmX",
+"mXmXr I.c hXxXO . + nXnXnXnX# . *XnXnXn 8.r.^././././.~.$ mXmXmX",
+"mXmX9 U.g hXnXxXO . =XnXnXhX. . :XnXbXkXD r.F./././././.& mXmXmX",
+"mXmX= Y.~ gXnXnXxX+ . gXnX@ . ;XbXbXbXbXv t.i./././././.q mXmXmX",
+"mXmX, d.f.<XnXnXnXbX+ X o X ;XbXbXbXbXxXT u.r./././././.< mXmXmX",
+"mXmX, ~ ).c nXnXnXnXdX. . @ bXbXbXbXxXxXE p.u.!././././.& mXmXmX",
+"mXmXmX1 (.,.wXnXnXnXzX. . # bXbXxXxXxXzXE p.p.Q./.^.^.w.= mXmXmX",
+"mXmXmX1 ~ oXO.vXnXnXnX,X&XhXbXxXxXxXzXzXR a.p.J.!.^.!.d = mXmXmX",
+"mXmXmXmX6 j.`.O.nXnXbXbXbXxXxXxXzXzXzXhXo.G.a.Q.!.Q.-., mXmXmXmX",
+"mXmXmXmX7 i _.[.+.cXbXbXxXxXxXzXzXhXhXv.0.L.G.Q.Q.9.1 , mXmXmXmX",
+"mXmXmXmX1 2 N {.}.&.wXxXxXzXzXzXhXhX2X! I.P.H.S.W 1 1 mXmXmXmXmX",
+"mXmXmXmX6 1._ A ].sX'.n.3XkXhXhX6Xx.%.T.Y.P.| y 2 mXmXmXmXmXmXmX",
+"mXmXmXmXm 7.5._ M M.aXsX0XN.h.d.k.).|.T.3.M C  .1 mXmXmXmXmXmXmX",
+"mXmXmXmX8 J 7.B 2 Z G M.qXyX%X at XOX|.g.S W } < y 1 mXmXmXmXmXmXmX",
+"mXmXmXmXM m B B mXmXmXD D D X.X.{ Z y } e.i.e = mXmXmXmXmXmXmXmX",
+"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmX= ( y.r.` = mXmXmXmXmXmXmXmX",
+"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXM 8.8.J , mXmXmXmXmXmXmXmX",
+"mXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXmXy B H 8 1 mXmXmXmXmXmXmXmX"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/karm-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/karm-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/karm-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,159 @@
+/* XPM */
+static char *karm-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 137 2",
+"   c black",
+".  c gray3",
+"X  c #090909",
+"o  c gray5",
+"O  c #191919",
+"+  c gray23",
+"@  c #414141",
+"#  c gray28",
+"$  c #484848",
+"%  c #4B4B4B",
+"&  c #4C4C4C",
+"*  c gray30",
+"=  c #4E4E4E",
+"-  c #505050",
+";  c gray32",
+":  c #565656",
+">  c #5A5A5A",
+",  c #5B5B5B",
+"<  c #5D5D5D",
+"1  c #654D75",
+"2  c #606060",
+"3  c gray39",
+"4  c #656565",
+"5  c #686868",
+"6  c #6C6C6C",
+"7  c gray43",
+"8  c #797979",
+"9  c gray48",
+"0  c #6170A3",
+"q  c #6B78AC",
+"w  c #697CB9",
+"e  c #4469E0",
+"r  c #496EE1",
+"t  c #4E73E2",
+"y  c #5177E4",
+"u  c #567DE6",
+"i  c #6079D6",
+"p  c #788CBE",
+"a  c #5C83E8",
+"s  c #6189EB",
+"d  c #6890ED",
+"f  c #7297ED",
+"g  c #7993E8",
+"h  c #7BA6F5",
+"j  c #AB534B",
+"k  c #F8534B",
+"l  c #E06864",
+"z  c #848484",
+"x  c #868686",
+"c  c #898989",
+"v  c #8B8B8B",
+"b  c gray55",
+"n  c #8D8D8D",
+"m  c #8E8E8E",
+"M  c gray56",
+"N  c #909090",
+"B  c #929292",
+"V  c #959595",
+"C  c gray59",
+"Z  c #8B98BD",
+"A  c #B58080",
+"S  c #A0A0A0",
+"D  c #A2A2A2",
+"F  c #A7A7A7",
+"G  c gray66",
+"H  c #AAAAAA",
+"J  c gray67",
+"K  c #AEAEAE",
+"L  c #B1B1B1",
+"P  c #B0B5B9",
+"I  c #B9B9B9",
+"U  c #859CCA",
+"Y  c #869AD5",
+"T  c #9BACC8",
+"R  c #93A8DA",
+"E  c #8DA7EE",
+"W  c #8BAEE2",
+"Q  c #81ABF6",
+"!  c #86A9F2",
+"~  c #91B9F9",
+"^  c #9BB5F2",
+"/  c #A3BDE2",
+"(  c #A7B9F1",
+")  c #A4BFF6",
+"_  c #A8BDF3",
+"`  c #ABBEF2",
+"'  c #B9C8D8",
+"]  c #A7C3F7",
+"[  c #B2C9F7",
+"{  c #B6CCF8",
+"}  c #BBCBF5",
+"|  c #BBD1F9",
+" . c #BED5FB",
+".. c #FE8D8D",
+"X. c #FEB1B1",
+"o. c gray76",
+"O. c gray77",
+"+. c #C5C5C5",
+"@. c gray79",
+"#. c #CACACA",
+"$. c gray80",
+"%. c #D0D0D0",
+"&. c LightGray",
+"*. c gray84",
+"=. c #D7D6D6",
+"-. c #D7D7D7",
+";. c #D8D8D8",
+":. c #DDDDDD",
+">. c #C8D2E0",
+",. c #C8D3E3",
+"<. c #CAD7F8",
+"1. c #DBDDE0",
+"2. c #D3E2FC",
+"3. c #D1E4FE",
+"4. c #D6E8FE",
+"5. c #DBE7F7",
+"6. c gray88",
+"7. c gray89",
+"8. c #E4E3E3",
+"9. c gray92",
+"0. c #E1EEFE",
+"q. c #E4EDFC",
+"w. c #E4F1FE",
+"e. c #E7F2FE",
+"r. c #EDF6FE",
+"t. c #EEF6FE",
+"y. c #FEEBEB",
+"u. c #F1F1F1",
+"i. c gray95",
+"p. c #F5F9FE",
+"a. c #FBFBFB",
+"s. c #F9FCFE",
+"d. c #FBFCFE",
+"f. c #FDFDFE",
+"g. c #FEFEFE",
+"h. c gray100",
+"j. c None",
+/* pixels */
+"j.j.j.g.) T  .| { [ f j.j.j.j.j.",
+"j.j.s.r.R =.g.g.g.g.^ j.j.j.j.j.",
+"j.g.e.0.Y 7.g.g.g.g._ j.j.j.j.j.",
+"g.s.e.r.i #.g.g.g.g.E j.j.j.j.j.",
+"W U p w q #.7.%.F %.Z o j.j.j.j.",
+"/ 7.7.i.a.$.x 5 $ @ $ : ; j.j.j.",
+"~ g.g.g.%.7 > O B . O.> > 4 j.j.",
+"Q 2.g.i.S - 5 L -.g.g.& C < ; j.",
+"h ] p.:.B $ & g.X.y.K D > 7 3 j.",
+"j.! p.,.3 B g.g...l c g.g.F 9 j.",
+"j.d q.,.9 . g.C 7 1 :.g.-.+ c j.",
+"j.s <.5.z C O.g.g.X...g.9.-.B j.",
+"j.a _ 4.P > v g.g.g.k g.> D c j.",
+"j.u } 3.' F O.+ g.L X.j -.O.$ j.",
+"j.y ` ( g 0 I v -.< :.A #.7 j.j.",
+"j.t r e j.j.& F F -.I K & j.j.j."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/karm.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/karm.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/karm.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,183 @@
+/* XPM */
+static char *karm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 145 2",
+"   c black",
+".  c #0C0C0C",
+"X  c #131313",
+"o  c #1E1E1E",
+"O  c gray13",
+"+  c gray17",
+"@  c #353535",
+"#  c #3B3B3B",
+"$  c #14387B",
+"%  c #2C3966",
+"&  c #492C6E",
+"*  c #454545",
+"=  c #4B4B4B",
+"-  c #545454",
+";  c #5C5C5C",
+":  c #464E65",
+">  c #656565",
+",  c #626368",
+"<  c #6C6C6C",
+"1  c #6F7376",
+"2  c #757575",
+"3  c #777A7D",
+"4  c #7C7C7C",
+"5  c #3A5EDB",
+"6  c #3E62DC",
+"7  c #465EBE",
+"8  c #5C7293",
+"9  c #4F65BC",
+"0  c #556DA1",
+"q  c #576EBC",
+"w  c #61799C",
+"e  c #6E79A8",
+"r  c #6274B6",
+"t  c #687AB8",
+"y  c #4B65C8",
+"u  c #4266DD",
+"i  c #4469DE",
+"p  c #4A6EDB",
+"a  c #506DDD",
+"s  c #5570CB",
+"d  c #476CE0",
+"f  c #4A6FE1",
+"g  c #4E74E2",
+"h  c #5075E3",
+"j  c #547AE4",
+"k  c #587FE7",
+"l  c #607CCF",
+"z  c #7F8188",
+"x  c #6E81BB",
+"c  c #7487BD",
+"v  c #7A8FBF",
+"b  c #5A81E7",
+"n  c #5C84E8",
+"m  c #6A87D3",
+"M  c #7492D7",
+"N  c #6484E4",
+"B  c #6087E9",
+"V  c #638BEB",
+"C  c #6B92EC",
+"Z  c #6E98F0",
+"A  c #7594E9",
+"S  c #7995E8",
+"D  c #7B9BEC",
+"F  c #739BF1",
+"G  c #76A0F2",
+"H  c #79A4F4",
+"J  c #7FA9F6",
+"K  c #AB1913",
+"L  c #8D6B6B",
+"P  c #FB0A08",
+"I  c #FE1F1F",
+"U  c #FE4B4B",
+"Y  c #F8746B",
+"T  c #828282",
+"R  c #8C8C8C",
+"E  c #818D9A",
+"W  c #939394",
+"Q  c #989797",
+"!  c #9B9B9B",
+"~  c #A3A3A3",
+"^  c #AAAAAA",
+"/  c #B3B2B2",
+"(  c #BBBBBB",
+")  c #838DC2",
+"_  c #809FED",
+"`  c #81A0DB",
+"'  c #83A1ED",
+"]  c #8BAEE6",
+"[  c #86A5F0",
+"{  c #82AEF7",
+"}  c #8EABF0",
+"|  c #85B1F8",
+" . c #88B3F9",
+".. c #8CB8FB",
+"X. c #94A9EC",
+"o. c #98ACED",
+"O. c #93AEF0",
+"+. c #90BCFC",
+"@. c #9EB2F0",
+"#. c #9AB8F5",
+"$. c #AAB5C0",
+"%. c #AFBCDE",
+"&. c #B2BCC8",
+"*. c #A3B8F1",
+"=. c #93C0FD",
+"-. c #B6C2D0",
+";. c #BCC8D7",
+":. c #A3C2F7",
+">. c #A3C2F8",
+",. c #AEC4F5",
+"<. c #ACCBFB",
+"1. c #BBCAF5",
+"2. c #B1D3FE",
+"3. c #B8D6FE",
+"4. c #FE8D8D",
+"5. c #FEB1B1",
+"6. c #F8BCB1",
+"7. c #C2C2C2",
+"8. c #CACACA",
+"9. c #D4D4D4",
+"0. c #DBDBDB",
+"q. c #C5D6ED",
+"w. c #C6DEFE",
+"e. c #CBD6F6",
+"r. c #C8D8F9",
+"t. c #D1DBE7",
+"y. c #D0DEF9",
+"u. c #CBE1FE",
+"i. c #D7E1ED",
+"p. c #D4E3FB",
+"a. c #D6E8FE",
+"s. c #D8E4FB",
+"d. c #DCEBFD",
+"f. c #FED7D7",
+"g. c #E3E3E3",
+"h. c #ECECEC",
+"j. c #E2EDFD",
+"k. c #E4F0FE",
+"l. c #EBF3FE",
+"z. c #FBF0EB",
+"x. c #F3F3F3",
+"c. c #F1F5FD",
+"v. c #F5F9FD",
+"b. c #FEFEFE",
+"n. c None",
+/* pixels */
+"n.n.n.n.n.n.n.n.n.:.Z 8 | { J H G F Z Z C V V n.n.n.n.n.n.n.n.n.",
+"n.n.n.n.n.n.n.n.b.p.M ~ b.b.b.b.b.b.j.s.s.[ B n.n.n.n.n.n.n.n.n.",
+"n.n.n.n.n.n.v.j.v.,.v / b.b.b.b.b.b.b.b.b.} n n.n.n.n.n.n.n.n.n.",
+"n.n.n.n.n.b.l.d.v.X.c 8.b.b.b.b.b.b.b.b.b.' n.n.n.n.n.n.n.n.n.n.",
+"n.n.n.n.b.v.d.w.b.S x 8.b.b.b.b.b.b.b.b.b.D n.n.n.n.n.n.n.n.n.n.",
+"n.n.n.k.v.j.u.2.b.S t 8.b.b.b.b.b.b.b.b.b.D n.n.n.n.n.n.n.n.n.n.",
+"n.n.w.v.v.k.d.a.b.X.r ^ b.b.b.b.b.b.b.b.b.' j n.n.n.n.n.n.n.n.n.",
+"n.3.d.d.s.p.1. at .o.a 7 ^ b.b.b.b.b.b.b.b.b.*.g n.n.n.n.n.n.n.n.n.",
+"n.=.] ` M m s s y 9 e Q b.b.h.0.9.7.7.8.9.%.p n.n.n.n.n.n.n.n.n.",
+"n.w W Q Q Q ^ / / / / ( x.9.( 7.R T 2 < 3 , : # . n.n.n.n.n.n.n.",
+"n...p.b.b.b.b.b.b.b.b.g.7.( R < < - ; = = - - ; ; = . n.n.n.n.n.",
+"n...<.b.b.b.b.b.b.b.g.7./ < < - - 4 2 < # Q 4 - - ; ; @ n.n.n.n.",
+"n. .| b.b.b.b.b.b.x.( / 2 < - + ~ 9.9.; O 9.b.( < = ; > @ n.n.n.",
+"n.n.{ p.b.b.b.b.b.8.7.< < - 7.= R / b.R < 9.b.R ~ ~ - > - . n.n.",
+"n.n.J >.b.b.b.b.x.7.R 2 = / 9./ 0.9.b.b.b.b.b.9.+ 8.9.; < = n.n.",
+"n.n.J H c.b.b.b.0.7.< < + # # b.b.b.b.b.b.b.b.3 ! b.# 2 > < . n.",
+"n.n.n.H r.b.v.b.9.R T ; ~ ; # b.b.b.5.z.b.b.R T b.b.o 7.< 4 * n.",
+"n.n.n.F #.b.l.k.&.3 T 4 b.b.b.b.b.b.I Y b.^ > b.b.h./ h.^ T - n.",
+"n.n.n.C F b.l.k./ 1 T ( b.b.b.b.b.b.4.P 9.- h.b.b.b.b.b.9.4 > n.",
+"n.n.n.n.C p.v.j.-.1 4 ; + b.b.b.b.b.7.) 0 ( b.b.b.b.9.X 9.4 T . ",
+"n.n.n.n.V ,.b.d.;.L R ;   b.b./ - @ ; $ & h.b.b.b.b.0.o 7.R R . ",
+"n.n.n.n.V [ b.d.t.8 Q 8.b.b.b.9.9.b.b.b.U 6.b.b.b.b.b.b.g.Q < n.",
+"n.n.n.n.n D b.j.k.4 / T 7.~ b.b.b.b.b.b.f.U b.b.b.b.b.b.7.^ < n.",
+"n.n.n.n.n b b.j.d.~ / T < # b.b.b.b.b.b.b.U f.b.b.b.+ b.^ ( - n.",
+"n.n.n.n.b k b.d.p.q.R ~ < 8 b.b.b.b.b.b.b.f.U b.b.7.X / / ~ o n.",
+"n.n.n.n.k j b.d.u.u.z 9.W h.b.R < b.b.b.b.b.U L / b.v.^ 9.; n.n.",
+"n.n.n.n.j C b.d.a.d.i.R g.T z.R / b.b.! 7.b.f.K R x.( 0.Q . n.n.",
+"n.n.n.n.j S b.b.c.e.o.q T 9.W 4 b.b.b.X < b.b.Y Q ( g.! O n.n.n.",
+"n.n.n.n.g j A N u u 6 5 % 3 0.8.^ 7.g.R 7.x.9.7.8.h.Q O n.n.n.n.",
+"n.n.n.n.g f i u u n.n.n.n.. * ~ h.g.9./ / 9.g.h.( > . n.n.n.n.n.",
+"n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.. # 4 T / / Q T = o n.n.n.n.n.n.n.",
+"n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n.n."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kmail-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kmail-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kmail-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,257 @@
+/* XPM */
+static char *kmail-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 235 2",
+"   c #010101",
+".  c #020202",
+"X  c gray1",
+"o  c #000004",
+"O  c #000307",
+"+  c #020105",
+"@  c #040304",
+"#  c #060505",
+"$  c #070504",
+"%  c #020208",
+"&  c #05080F",
+"*  c #080A0D",
+"=  c #080A0E",
+"-  c #0A090C",
+";  c #0A090E",
+":  c #0E0C0B",
+">  c #0F0C0B",
+",  c #0E0C0C",
+"<  c #0F0D0D",
+"1  c #070911",
+"2  c #060B11",
+"3  c #070C10",
+"4  c #070C12",
+"5  c #070D12",
+"6  c #0B0C10",
+"7  c #0B0D10",
+"8  c #0E0E11",
+"9  c #110F0D",
+"0  c #100F0F",
+"q  c #110F0F",
+"w  c #121010",
+"e  c #131111",
+"r  c #131112",
+"t  c #131212",
+"y  c #141110",
+"u  c #151211",
+"i  c #141212",
+"p  c #171313",
+"a  c #151014",
+"s  c #161315",
+"d  c #171415",
+"f  c #11131D",
+"g  c #15161D",
+"h  c #191316",
+"j  c #181415",
+"k  c #1A1416",
+"l  c #1D1A1A",
+"z  c #1D1A1B",
+"x  c #171920",
+"c  c #181925",
+"v  c #1B1C2E",
+"b  c #1C1F28",
+"n  c #1D1E2F",
+"m  c #211D1C",
+"M  c #241F20",
+"N  c #353847",
+"B  c #442519",
+"V  c #482512",
+"C  c #4F2917",
+"Z  c #582208",
+"A  c #582308",
+"S  c #5A2608",
+"D  c #592B16",
+"F  c #603420",
+"G  c #664427",
+"H  c #66412C",
+"J  c #68492D",
+"K  c #6D5231",
+"L  c #7B5937",
+"P  c #464957",
+"I  c #58504C",
+"U  c #505267",
+"Y  c #5B5D62",
+"T  c #786042",
+"R  c #626271",
+"E  c #6E6D7E",
+"W  c #707073",
+"Q  c #7D7F87",
+"!  c #84400A",
+"~  c #825213",
+"^  c #975E01",
+"/  c #814B2E",
+"(  c #82562E",
+")  c #85532B",
+"_  c #85612C",
+"`  c #AA5201",
+"'  c #AF6B00",
+"]  c #AC6515",
+"[  c #BD6409",
+"{  c #C47400",
+"}  c #C37517",
+"|  c #D16413",
+" . c #DE6D1C",
+".. c #DA741C",
+"X. c #DF711C",
+"o. c #DF7E12",
+"O. c #C96427",
+"+. c #EF7B04",
+"@. c #E47316",
+"#. c #F67800",
+"$. c #F97B04",
+"%. c #BE8618",
+"&. c #968778",
+"*. c #C98106",
+"=. c #DD8116",
+"-. c #CC9732",
+";. c #D58F2D",
+":. c #D28C38",
+">. c #D58D3B",
+",. c #DE8B33",
+"<. c #E59A0D",
+"1. c #FF8500",
+"2. c #F88B00",
+"3. c #FF8E00",
+"4. c #FF9900",
+"5. c #FF9A00",
+"6. c #F49717",
+"7. c #F89413",
+"8. c #FF931F",
+"9. c #F68527",
+"0. c #F19322",
+"q. c #F19A2A",
+"w. c #FCA600",
+"e. c #F3A118",
+"r. c #FFB10A",
+"t. c #FFB50E",
+"y. c #E8A136",
+"u. c #F3AE2E",
+"i. c #FFB420",
+"p. c #FFB82A",
+"a. c #FFBC2C",
+"s. c #F9BD37",
+"d. c #CAA34A",
+"f. c #D4B678",
+"g. c #EEAB5D",
+"h. c #F6A742",
+"j. c #FFC530",
+"k. c #FFC33D",
+"l. c #FEC73E",
+"z. c #FFC140",
+"x. c #FEC741",
+"c. c #F9CE4C",
+"v. c #F3C25C",
+"b. c #FFD245",
+"n. c #FFD352",
+"m. c #F0CD67",
+"M. c #FBD770",
+"N. c #FFDA70",
+"B. c #FFE578",
+"V. c #9B8F83",
+"C. c #9A9AA0",
+"Z. c #9AA0AA",
+"A. c #B4A694",
+"S. c #A4A5A9",
+"D. c #AAABAA",
+"F. c #B7B7B7",
+"G. c #B3B4BA",
+"H. c #BBBAB8",
+"J. c gray73",
+"K. c gray",
+"L. c #BCBEC9",
+"P. c #DBB295",
+"I. c #CBBED6",
+"U. c #F0CE91",
+"Y. c #F9DB83",
+"T. c #E9CDA2",
+"R. c #EDCDAC",
+"E. c #EAD0B0",
+"W. c #FEE58E",
+"Q. c #FDF1B8",
+"!. c #C5C5C4",
+"~. c #C4C5CC",
+"^. c #CACAC9",
+"/. c #CACACA",
+"(. c #CBCBCB",
+"). c #CDCDCC",
+"_. c #CDC1D8",
+"`. c #CCCAD7",
+"'. c #D0C9C9",
+"]. c #D2D2D2",
+"[. c LightGray",
+"{. c #D4D4DA",
+"}. c #DADADA",
+"|. c #DDDDDC",
+" X c #DDDDDD",
+".X c #DFDFDE",
+"XX c #DAD2E1",
+"oX c #DBD3E1",
+"OX c #DDD5E4",
+"+X c #EFE7CC",
+"@X c #F7EDD2",
+"#X c gray88",
+"$X c #E1E2E1",
+"%X c #E3E2E4",
+"&X c #E4E4E4",
+"*X c #E6E6E6",
+"=X c #E7E7E8",
+"-X c #E6E8EA",
+";X c #E7E9ED",
+":X c #E8E8E7",
+">X c #ECE9E5",
+",X c #EAEAEA",
+"<X c #EBEAEA",
+"1X c gray92",
+"2X c #E9EBEF",
+"3X c #ECECEC",
+"4X c gray93",
+"5X c #EEECEF",
+"6X c #EFEFEF",
+"7X c #EDEFF3",
+"8X c #EFF5F6",
+"9X c #F0F0EF",
+"0X c gray94",
+"qX c #F1F1F1",
+"wX c #F0F0F2",
+"eX c #F1F1F3",
+"rX c #F2F1F3",
+"tX c gray95",
+"yX c #F3F2F2",
+"uX c #F3F3F3",
+"iX c #F3F6F7",
+"pX c gray96",
+"aX c #F6F5F6",
+"sX c #F8F8F9",
+"dX c #F8F9F8",
+"fX c #F9FBF9",
+"gX c gray98",
+"hX c #FBFBFB",
+"jX c #F8F9FC",
+"kX c #F8FFFF",
+"lX c #F9FEFF",
+"zX c #FDFFFF",
+"xX c #FEFFFF",
+"cX c gray100",
+"vX c None",
+/* pixels */
+"vXvXvXvXaXW I R.R.T.U.T vXvXvXvX",
+"vXvXvXOX%XrX'.P. at XQ.W.v.J 2 vXvX",
+"vXvXvXXX&XdXxXrX>X+XY.n.u.G & vX",
+"vXvXyXrX9XpXxXxXjX`.f.s.t.6.H 7 ",
+"vXvX4XaX6XaXsXrX3XA.d.m.x.a.>.a ",
+"vXiX*XrXrX,X1X8X{.( -.c.r.5...h ",
+"vX=X1XfX6X,X6X6XV.K ] e.2.$.O.h ",
+"8X=XrX4X}.|.4X~._ *.;. at .6.0.L 8 ",
+"Z.H.J.F.K.|.;X&.^ *.h.B.l.a.:.d ",
+"b D.%X^.[.=XL.) ' ` y.b.w.3.X.h ",
+"# Y .X^.[.$XE ! { } | 2.#. at ./ t ",
+"vXg S.^.).G.n V [ <.h.9.8.q.K < ",
+"vXvXP F.!.R + + C =.N.B.j.i.,.s ",
+"vXvXf Q C.v $ @ . F g.k.5.1. .h ",
+"vXvXvXN U * : X . & B S A A D d ",
+"vXvXvXg c 9 : . vXvX& 5 5 5 = 0 "
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kmail.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kmail.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kmail.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kmail[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #080707",
+".  c #0C0A0B",
+"X  c gray2",
+"o  c #110F0F",
+"O  c #131011",
+"+  c #181516",
+"@  c #1A1718",
+"#  c #1C191A",
+"$  c #1B1828",
+"%  c #181727",
+"&  c #121A3D",
+"*  c #211D1E",
+"=  c #231F20",
+"-  c #31241E",
+";  c #342926",
+":  c #3C2B24",
+">  c #141F51",
+",  c #20265F",
+"<  c #203055",
+"1  c #323B4C",
+"2  c #333C57",
+"3  c #2A2C62",
+"4  c #222B66",
+"5  c #2C3860",
+"6  c #354877",
+"7  c #4A3630",
+"8  c #6C3100",
+"9  c #7B3E00",
+"0  c #443F75",
+"q  c #7D400B",
+"w  c #604C3E",
+"e  c #56585C",
+"r  c #444B65",
+"t  c #5B5D74",
+"y  c #6D484D",
+"u  c #6E574A",
+"i  c #705147",
+"p  c #7E604A",
+"a  c #7A6255",
+"s  c gray39",
+"d  c #79797A",
+"f  c #404E83",
+"g  c #485185",
+"h  c #6C6D82",
+"j  c #747181",
+"k  c #76758B",
+"l  c #787587",
+"z  c #767881",
+"x  c #903200",
+"c  c #A73500",
+"v  c #8E4601",
+"b  c #9D450C",
+"n  c #9F4C10",
+"m  c #974A1A",
+"M  c #8D4826",
+"N  c #835E2A",
+"B  c #994C27",
+"V  c #9C6602",
+"C  c #996B18",
+"Z  c #A95601",
+"A  c #A25113",
+"S  c #B15900",
+"D  c #BE5F00",
+"F  c #B05502",
+"G  c #A3532C",
+"H  c #AC5731",
+"J  c #A26600",
+"K  c #A66800",
+"L  c #A76F0A",
+"P  c #AB6800",
+"I  c #A16E11",
+"U  c #AE7003",
+"Y  c #B26B00",
+"T  c #BB6D00",
+"R  c #BA7400",
+"E  c #AB7C38",
+"W  c #90745D",
+"Q  c #A36F57",
+"!  c #BE7D59",
+"~  c #AF7962",
+"^  c #B07C62",
+"/  c #CF4F00",
+"(  c #C56403",
+")  c #C17100",
+"_  c #CF7100",
+"`  c #CA7B01",
+"'  c #C27903",
+"]  c #D16E01",
+"[  c #DE7807",
+"{  c #DB7913",
+"}  c #C66622",
+"|  c #C0643D",
+" . c #DB743E",
+".. c #E56A00",
+"X. c #E96100",
+"o. c #EC6F00",
+"O. c #E37A00",
+"+. c #EA7400",
+"@. c #E87800",
+"#. c #E47719",
+"$. c #F46800",
+"%. c #FB6900",
+"&. c #F47300",
+"*. c #F37C00",
+"=. c #FF7600",
+"-. c #FD7B00",
+";. c #F9780F",
+":. c #E37621",
+">. c #E1773E",
+",. c #C56840",
+"<. c #C26F48",
+"1. c #C37556",
+"2. c #E17C42",
+"3. c #BC8011",
+"4. c #B58329",
+"5. c #BF9537",
+"6. c #B48A56",
+"7. c #AB927B",
+"8. c #BA8765",
+"9. c #CC890C",
+"0. c #C48511",
+"q. c #DC8F07",
+"w. c #DE9205",
+"e. c #C0953A",
+"r. c #D6952A",
+"t. c #D19839",
+"y. c #D9A638",
+"u. c #E58615",
+"i. c #F28800",
+"p. c #FD8400",
+"a. c #FE8E00",
+"s. c #FF8F0F",
+"d. c #FF840F",
+"f. c #FE8A10",
+"g. c #FD9300",
+"h. c #FC940E",
+"j. c #FD9B00",
+"k. c #F39200",
+"l. c #E08530",
+"z. c #E18838",
+"x. c #E0833C",
+"c. c #E39221",
+"v. c #E89B33",
+"b. c #F38823",
+"n. c #F2993F",
+"m. c #EBA118",
+"M. c #FEA300",
+"N. c #FEAA00",
+"B. c #FDAE0A",
+"V. c #FEA40E",
+"C. c #F2A519",
+"Z. c #FEB30A",
+"A. c #FDB211",
+"S. c #FEB815",
+"D. c #FFBD19",
+"F. c #E3A439",
+"G. c #F5AF22",
+"H. c #FBAD32",
+"J. c #FAB22D",
+"K. c #FDBB22",
+"L. c #FEB53B",
+"P. c #FEBC35",
+"I. c #FBBC3C",
+"U. c #F7B234",
+"Y. c #DE804A",
+"T. c #DD9552",
+"R. c #C08E6A",
+"E. c #D89761",
+"W. c #D1A748",
+"Q. c #E28042",
+"!. c #E48844",
+"~. c #E7A855",
+"^. c #EBB749",
+"/. c #F6AF40",
+"(. c #FDBD4A",
+"). c #F5B74A",
+"_. c #EAA546",
+"`. c #E5AE67",
+"'. c #E5B273",
+"]. c #EEB773",
+"[. c #D1AE6D",
+"{. c #FEC52E",
+"}. c #F7C338",
+"|. c #FEC53B",
+" X c #FDC93C",
+".X c #DBC37B",
+"XX c #FFC44F",
+"oX c #FECF41",
+"OX c #F9C64A",
+"+X c #FFCA54",
+"@X c #FDCC5B",
+"#X c #FFC554",
+"$X c #F9D15C",
+"%X c #E9C868",
+"&X c #E3CB78",
+"*X c #FEC965",
+"=X c #F4D069",
+"-X c #FED466",
+";X c #FED968",
+":X c #FCDA74",
+">X c #FDDC7C",
+",X c #FED277",
+"<X c #FFE17B",
+"1X c #878787",
+"2X c #948F98",
+"3X c #939393",
+"4X c #9C9C9C",
+"5X c #9A95A0",
+"6X c #9AA2B9",
+"7X c gray64",
+"8X c #AAAAAA",
+"9X c #ADA0BA",
+"0X c #B4B4B4",
+"qX c #BABABA",
+"wX c #D8A680",
+"eX c #CCBFD7",
+"rX c #DFC5BD",
+"tX c #F3D980",
+"yX c #EDDEAE",
+"uX c #FFE484",
+"iX c #FEE789",
+"pX c #FCE590",
+"aX c #FEE994",
+"sX c #FEEBA1",
+"dX c #F4E8B7",
+"fX c #FFF0A3",
+"gX c #FEF6BA",
+"hX c #C4C4C4",
+"jX c #CCCCCC",
+"kX c #D3CCD8",
+"lX c #D4D4D4",
+"zX c #D7D7D9",
+"xX c #DBDBDB",
+"cX c #DEDBE3",
+"vX c #DFD6E2",
+"bX c #E1CBC5",
+"nX c #E4D9D3",
+"mX c #E0DCE3",
+"MX c #F9EBC7",
+"NX c #F3EED5",
+"BX c #F7F2D7",
+"VX c #FDFDD4",
+"CX c #F9F0D8",
+"ZX c #E3E3E3",
+"AX c #E8E2E9",
+"SX c #EAEAEA",
+"DX c #E6E2E8",
+"FX c #EEEBF2",
+"GX c #ECF0F6",
+"HX c #F9F0E4",
+"JX c #FFFFEA",
+"KX c #F3F3F3",
+"LX c #F6FEFE",
+"PX c #FCFAF3",
+"IX c #FEFEFE",
+"UX c #F2F7FA",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXIXYXYXYXPXPXHXHXHXCXMXMXdX= = YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXIXFXAXKX= wXT.'.'.`.`.~.~.~.R.= = = YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXAXjXmXzXZXbX2.PXIXJXVXgXfX<XF.8.= = = YXYXYXYX",
+"YXYXYXYXYXYXYXYXIXxXlXIXPXmXcXrXdXBXVXgXsXtX>X$Xv.8.= = = YXYXYX",
+"YXYXYXYXYXYXYXeXkXSXxXIXIXIXPXZXlXnXNXdXpXtX;X+X Xc.~ = = = YXYX",
+"YXYXYXYXYXYXYXFXZXLXzXIXIXIXIXIXIXUXmXvXyX=X at XOX{.S.u.~ = = = YX",
+"YXYXYXYXYXYXIXmXIXPXzXIXIXIXIXIXIXIXIXjX9X%X).I.K.B.N.#.^ = = = ",
+"YXYXYXYXYXYXSXSXIXLXzXIXIXIXIXIXIXKXxXhX7..X^.G.B.M.j.g.#.~ = = ",
+"YXYXYXYXYXIXDXUXIXPXzXIXIXIXIXPXZXxXZX4X5.W..XtX:X-X at X#X(.E.= = ",
+"YXYXYXYXIXGXSXZXPXUXzXPXIXKXSXxXSXKXlXW 5.t.&X$X}.D.A.V.h.!.= = ",
+"YXYXYXYXIXmXKXZXIXLXnXUXZXZXSXKXKXSX3Xq 4.y.%X}.S.N.j.g.p.2.= = ",
+"YXYXYXLXmXSXDXFXIXUXcXSXGXKXKXSXKXqXa 8 v r.=XK.N.M.g.p.-.2.= = ",
+"YXYXYXUXzXSXmXIXPXUXnXPXKXSXSXSXZXl C N 9 Z ^.B.j.k.p.=.%.2.= = ",
+"YXYXLXcXZXLXUXPXPXUXzXSXSXSXAXSXqXu I 4.E Z _ @. at .@.o.#.!.1.= = ",
+"YXYXGXSXPXPXPXUXFXSXjXmXZXZXSXZXh C I 3.y.T._ O.i.g.j.#.6.= = = ",
+"YXLXzXlXZXZXzXjXjXhXqXZXZXZXAX0Xu V L 0.m.(.~._.L.L.L.H.v.[.= = ",
+"YX6X7X7X4X4X4X8X8X0XhXxXZXAXxXl V V U 9.C.J.iXiX;X+X|.P.H.~.= = ",
+"YX6 s qXlXjXlXjXqXlXzXxXZXZX0Xy V K U S C.I.>X XS.N.M.g.-.2.= = ",
+"YX= 1 3XzXxXxXzXqXxXZXxXZXxXk m J U R x ( I.<X{.Z.N.j.a.-.2.= = ",
+"YXYX+ e hXxXzXlXqXxXxXxXxX8Xr m P Y R A c { ).C.k.i. at .=.$.2.= = ",
+"YXYX= 2 3XxXzXlX0XlXxXxXjXk 7 b Y T ` r.} / ..+.&.&.o.x.! Q = = ",
+"YXYX= # e qXzXlX8XlXlXlX8X3 : M F ) _ w.).:.X.%.-.p.*.z.u = = = ",
+"YXYXYX= > 7.jXjX8XjXlXhXh $ O ; B D ` q.J.*Xb.;.d.f.f.h.l.w = = ",
+"YXYXYX= @ r 8XhX8XhXjX4X3 O o . - B ( q.U.*XsXpX>X;X at X+X(.].= = ",
+"YXYXYXYX= > d hX7XqXqXh O O o .   7 H @.(.,XaXoXD.B.M.g.p.Q.= = ",
+"YXYXYXYX= # 2 2X7XqX2X, O o .   X   : | u.>XpX{.A.N.j.a.p.Q.= = ",
+"YXYXYXYXYX$ & z 3X8Xt % o O o     o * i | _.uXD.N.M.g.p.=.2.= = ",
+"YXYXYXYXYXYX# 4 1Xd 4 + + + + # YX= = = ; <.c c c c c c c 2.= = ",
+"YXYXYXYXYXYX= + r h $ # * = = = YXYX= = = = = = = = = = = = = = ",
+"YXYXYXYXYXYXYX= f g * = = = = YXYXYXYX= = = = = = = = = = = = = ",
+"YXYXYXYXYXYXYX= = = = = = = = YXYXYXYXYX= = = = = = = = = = = = "
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kmailcvt-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kmailcvt-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kmailcvt-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,242 @@
+/* XPM */
+static char *kmailcvt-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 220 2",
+"   c black",
+".  c #010000",
+"X  c #020000",
+"o  c #030000",
+"O  c #000004",
+"+  c #040000",
+"@  c #070000",
+"#  c #0A0700",
+"$  c #0F0000",
+"%  c #110000",
+"&  c #130000",
+"*  c #150000",
+"=  c #180000",
+"-  c #1B0000",
+";  c #1C0100",
+":  c #1E0000",
+">  c #1F0300",
+",  c #1F0500",
+"<  c #1C1307",
+"1  c #210400",
+"2  c #230600",
+"3  c #230700",
+"4  c #240000",
+"5  c #240600",
+"6  c #240700",
+"7  c #250800",
+"8  c #260900",
+"9  c #270900",
+"0  c #2B0C00",
+"q  c #2D0E00",
+"w  c #231507",
+"e  c #22180A",
+"r  c #271C0B",
+"t  c #291C0B",
+"y  c #340900",
+"u  c #2E200D",
+"i  c #30210C",
+"p  c #3C2B0F",
+"a  c #3B2B11",
+"s  c #3F393B",
+"d  c #461500",
+"f  c #442E12",
+"g  c #483318",
+"h  c #4D3A17",
+"j  c #5D2300",
+"k  c #6E2A05",
+"l  c #7A2600",
+"z  c #5D4019",
+"x  c #784603",
+"c  c #7C4C02",
+"v  c #7A541E",
+"b  c #6E5522",
+"n  c #4D5252",
+"m  c #880D00",
+"M  c #8D0E00",
+"N  c #871000",
+"B  c #871100",
+"V  c #981200",
+"C  c #991400",
+"Z  c #9D1800",
+"A  c #9C2800",
+"S  c #A31F00",
+"D  c #A52401",
+"F  c #895F28",
+"G  c #94682A",
+"H  c #9B6C28",
+"J  c #B64A07",
+"K  c #BD5800",
+"L  c #AB6F0C",
+"P  c #B5750E",
+"I  c #A97B30",
+"U  c #B17A29",
+"Y  c #B67F2F",
+"T  c #B47E31",
+"R  c #967F56",
+"E  c #CD7404",
+"W  c #C17D10",
+"Q  c #DD6700",
+"!  c #C46A3F",
+"~  c #F36A00",
+"^  c #F87500",
+"/  c #FC7800",
+"(  c #FF7900",
+")  c #FF7A00",
+"_  c #9F845A",
+"`  c #9F9170",
+"'  c #A68452",
+"]  c #A58655",
+"[  c #A98656",
+"{  c #C98212",
+"}  c #D09332",
+"|  c #DDA02D",
+" . c #D6A835",
+".. c #E39419",
+"X. c #E4921D",
+"o. c #E49519",
+"O. c #E8961A",
+"+. c #EB9A1A",
+"@. c #F29F1B",
+"#. c #E59720",
+"$. c #EF9F26",
+"%. c #FF8621",
+"&. c #FCA41E",
+"*. c #FFB01C",
+"=. c #EAA43A",
+"-. c #EBB336",
+";. c #F1A024",
+":. c #F4A127",
+">. c #F5A126",
+",. c #F4A227",
+"<. c #F5A226",
+"1. c #F6A327",
+"2. c #FFAD27",
+"3. c #FFA828",
+"4. c #FFAB2D",
+"5. c #FEAE33",
+"6. c #FFAD3A",
+"7. c #FFB523",
+"8. c #F7BA30",
+"9. c #FFB031",
+"0. c #FFB535",
+"q. c #FFB737",
+"w. c #FFB93F",
+"e. c #FFBD3D",
+"r. c #C69644",
+"t. c #C09F4B",
+"y. c #C49B48",
+"u. c #CA9B47",
+"i. c #D6AD58",
+"p. c #FAB543",
+"a. c #FDB140",
+"s. c #FFB341",
+"d. c #FFB643",
+"f. c #FFB544",
+"g. c #FFB744",
+"h. c #FFB745",
+"j. c #FFB845",
+"k. c #FFBB45",
+"l. c #FFBB46",
+"z. c #FFBE41",
+"x. c #FFBC45",
+"c. c #FFB948",
+"v. c #FFC334",
+"b. c #FFC03B",
+"n. c #FFC13F",
+"m. c #FFCC3F",
+"M. c #FFC245",
+"N. c #FFC540",
+"B. c #FFC642",
+"V. c #FFC64D",
+"C. c #FFC94B",
+"Z. c #FFCF48",
+"A. c #FFCC4E",
+"S. c #FFCE4E",
+"D. c #FFCB52",
+"F. c #FFCC52",
+"G. c #FFD352",
+"H. c #FFD556",
+"J. c #FFDA55",
+"K. c #FFDE55",
+"L. c #FFD37C",
+"P. c #FFEE5B",
+"I. c #938A80",
+"U. c #9B9B9B",
+"Y. c #999B9F",
+"T. c #849FBD",
+"R. c #A5A5A5",
+"E. c gray66",
+"W. c #BFB9A9",
+"Q. c #B2B4B5",
+"!. c gray71",
+"~. c #B5BBBC",
+"^. c #B9B9B9",
+"/. c #BABBBB",
+"(. c #9EB0D2",
+"). c #ADB4C0",
+"_. c #A8BEE0",
+"`. c #BCC1AB",
+"'. c #B7C4D6",
+"]. c #C3B697",
+"[. c #D3BF9A",
+"{. c #FFE7B1",
+"}. c #C2C3C4",
+"|. c gray77",
+" X c #C3CACD",
+".X c #C8C8C8",
+"XX c #CBCBCB",
+"oX c #C0CDDF",
+"OX c #D4C8CE",
+"+X c gray82",
+"@X c #D5D6D6",
+"#X c #D3D6DD",
+"$X c #D4D7D9",
+"%X c #C4D0E1",
+"&X c #CCD3E1",
+"*X c #CADAE6",
+"=X c #DEE5EF",
+"-X c #DAE3F2",
+";X c #FFEBC7",
+":X c #FAEACC",
+">X c #FFF6C5",
+",X c #FFF1CB",
+"<X c #FFF0D2",
+"1X c #E3E3E4",
+"2X c #E5E6E8",
+"3X c #EBECED",
+"4X c #EDEEEE",
+"5X c #E2E8F6",
+"6X c #E2F6FE",
+"7X c #F3F6FA",
+"8X c #F3FAFF",
+"9X c #F6F8FD",
+"0X c #F8F8F9",
+"qX c #F8F9FA",
+"wX c #F9FFFF",
+"eX c #FFF8FD",
+"rX c #FDFFFF",
+"tX c #FEFFFF",
+"yX c gray100",
+"uX c None",
+/* pixels */
+"uXuXk A M m N N V V Z D D l   uX",
+"uXJ m.e.L.{.,X<X:X;X[.} 7.*.K   ",
+"uX%.>XyXyXyXyXyXyX*XT._ 5.p. at .4 ",
+"s eXyXyXyXyXyXqX}.Y.'.[ 4.a.$.8 ",
+"~. XQ./.|.XX.XU.R.2X%X' 9.a.;.3 ",
+"n wX4X1X+X!.R./. at X$X'.] q.f.,.6 ",
+"uXOXyXyXyX0XyXyXyX&X(._ q.h.>.3 ",
+"uX! 6X7X4X9XyX8X#XW.` r.z.f.>.6 ",
+"uX~ `.-X-X5X].t. .-.b.M.k.f.>.3 ",
+"uX) i._.~.y.8.B.K.H.F.V.k.k.1.6 ",
+"uX) e.I.u.| #   b H.G.h.f Y 3.8 ",
+"uX^ N.6.Z.a i F.I u H w   r #.q ",
+"@ ) z.f.C.t z P.S.<   v e U 2.0 ",
+"uXQ v.c.A.T O g G F   =.a h X.: ",
+"uXy E o.o.&.P c { o.L +.W x j   ",
+"uXuX  % $ % 3 8 : * , * : - uXuX"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kmailcvt.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kmailcvt.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kmailcvt.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kmailcvt[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #010000",
+".  c #090000",
+"X  c #0C0A02",
+"o  c #160100",
+"O  c #110C04",
+"+  c #1C0000",
+"@  c #161006",
+"#  c #191106",
+"$  c #1D1508",
+"%  c #1A1900",
+"&  c #260F00",
+"*  c #2A0706",
+"=  c #241000",
+"-  c #241909",
+";  c #281D0A",
+":  c #320000",
+">  c #3E0B00",
+",  c #330A07",
+"<  c #311B00",
+"1  c #2E220C",
+"2  c #3B290E",
+"3  c #392B11",
+"4  c gray15",
+"5  c #490300",
+"6  c #590300",
+"7  c #511F00",
+"8  c #422D10",
+"9  c #45300F",
+"0  c #463010",
+"q  c #493917",
+"w  c #4A3313",
+"e  c #583C0E",
+"r  c #50360B",
+"t  c #5A3E15",
+"y  c #600F00",
+"u  c #651100",
+"i  c #6E1200",
+"p  c #750C00",
+"a  c #7A0E00",
+"s  c #721200",
+"d  c #761E00",
+"f  c #663B00",
+"g  c #7C2100",
+"h  c #7B2A00",
+"j  c #773200",
+"k  c #7F3F00",
+"l  c #5D4018",
+"z  c #634519",
+"x  c #6D4A19",
+"c  c #674512",
+"v  c #734E19",
+"b  c #7A531A",
+"n  c #6E5221",
+"m  c #7A5923",
+"M  c #585858",
+"N  c #726A5F",
+"B  c #797979",
+"V  c #862800",
+"C  c #843A00",
+"Z  c #922800",
+"A  c #A83400",
+"S  c #AA3C00",
+"D  c #BC2D00",
+"F  c #BA3301",
+"G  c #B8352D",
+"H  c #844200",
+"J  c #884400",
+"K  c #8C5807",
+"L  c #805717",
+"P  c #875B17",
+"I  c #8A5D16",
+"U  c #9C4300",
+"Y  c #915403",
+"T  c #8A5F21",
+"R  c #835B21",
+"E  c #9A6205",
+"W  c #9C6A1E",
+"Q  c #856225",
+"!  c #926523",
+"~  c #9C6B27",
+"^  c #9B732E",
+"/  c #AB4400",
+"(  c #AC7106",
+")  c #B36701",
+"_  c #B27506",
+"`  c #BB7A07",
+"'  c #BC7C08",
+"]  c #BB7706",
+"[  c #B67C10",
+"{  c #A66908",
+"}  c #AF792A",
+"|  c #A8742B",
+" . c #A37E33",
+".. c #AC7E32",
+"X. c #B37B2B",
+"o. c #BA7F29",
+"O. c #B77C25",
+"+. c #887F73",
+"@. c #C70A00",
+"#. c #CA0900",
+"$. c #CB3600",
+"%. c #D23600",
+"&. c #DC3600",
+"*. c #D3310D",
+"=. c #E13700",
+"-. c #E13800",
+";. c #D5550D",
+":. c #C07E08",
+">. c #C57702",
+",. c #D37C00",
+"<. c #E44507",
+"1. c #EE5325",
+"2. c #E76701",
+"3. c #F46530",
+"4. c #D65442",
+"5. c #A8893F",
+"6. c #AB8238",
+"7. c #B68132",
+"8. c #BF8738",
+"9. c #BA8635",
+"0. c #BC943B",
+"q. c #9D8854",
+"w. c #9B8A63",
+"e. c #90867A",
+"r. c #90887A",
+"t. c #988C77",
+"y. c #968A76",
+"u. c #A1844A",
+"i. c #A28750",
+"p. c #AA8B54",
+"a. c #B78D41",
+"s. c #B29244",
+"d. c #A69168",
+"f. c #AC9776",
+"g. c #B59565",
+"h. c #C7860A",
+"j. c #C98303",
+"k. c #C38414",
+"l. c #CA8916",
+"z. c #CE8B18",
+"x. c #DF8D02",
+"c. c #D28E19",
+"v. c #DE930C",
+"b. c #D49019",
+"n. c #D89119",
+"m. c #C38525",
+"M. c #C48629",
+"N. c #CD8B29",
+"B. c #C18631",
+"V. c #C38C3A",
+"C. c #CB8B30",
+"Z. c #C58D37",
+"A. c #C4913E",
+"S. c #C39B3F",
+"D. c #D18E2B",
+"F. c #D89220",
+"G. c #DA942B",
+"H. c #D2902D",
+"J. c #DE9934",
+"K. c #D59A3D",
+"L. c #D2A03F",
+"P. c #EA9605",
+"I. c #EE9905",
+"U. c #E79405",
+"Y. c #E29717",
+"T. c #E1971E",
+"R. c #E89B1C",
+"E. c #F19B05",
+"W. c #F09011",
+"Q. c #F99D1D",
+"!. c #F49B1A",
+"~. c #E49B2D",
+"^. c #EB9C2B",
+"/. c #E59D34",
+"(. c #E99F30",
+"). c #E29F3A",
+"_. c #F49D21",
+"`. c #F5A21E",
+"'. c #FCA11B",
+"]. c #EEA021",
+"[. c #E3A23B",
+"{. c #EBA135",
+"}. c #EDA339",
+"|. c #F5A427",
+" X c #F1A63A",
+".X c #F4A93C",
+"XX c #F8AC3E",
+"oX c #FEB03F",
+"OX c #F8BA3F",
+"+X c #CB9E42",
+"@X c #C8A245",
+"#X c #D9A445",
+"$X c #DDB576",
+"%X c #FF9647",
+"&X c #E7A845",
+"*X c #E1AF59",
+"=X c #E7B046",
+"-X c #E3B44A",
+";X c #EBB648",
+":X c #F3AB41",
+">X c #FBAD40",
+",X c #F7B648",
+"<X c #FDB344",
+"1X c #FEB846",
+"2X c #FEBB4A",
+"3X c #F1B94A",
+"4X c #FEC14D",
+"5X c #F5C04E",
+"6X c #F3C250",
+"7X c #FDC551",
+"8X c #FECB54",
+"9X c #FED37F",
+"0X c gray53",
+"qX c #8C8C8C",
+"wX c #8F8F90",
+"eX c #96928D",
+"rX c #9C9C9C",
+"tX c gray59",
+"yX c #A89F8B",
+"uX c #A49A81",
+"iX c #A09B97",
+"pX c #A68788",
+"aX c #B8AA91",
+"sX c #A4A4A3",
+"dX c #ABABAB",
+"fX c #ABA8A2",
+"gX c #AEB0B2",
+"hX c #B9B5AD",
+"jX c #BAB5A7",
+"kX c #B4B4B4",
+"lX c #BBBCBC",
+"zX c #BAB8B2",
+"xX c #D9BF8E",
+"cX c #C4BFB3",
+"vX c #CBC1AF",
+"bX c #DBCCAE",
+"nX c #D2CABB",
+"mX c #E5C08D",
+"MX c #E8D5B8",
+"NX c #C4C4C4",
+"BX c #CBCBCB",
+"VX c #DAD3C6",
+"CX c #D4D4D4",
+"ZX c #D8D7D6",
+"AX c #DBDBDB",
+"SX c #E2DACD",
+"DX c #E3DDD2",
+"FX c #EFDADA",
+"GX c #E6E1D5",
+"HX c #EEE4D5",
+"JX c #E3E3E2",
+"KX c #E6E7E8",
+"LX c #EBEBEB",
+"PX c #F4F4F4",
+"IX c #FCFDFD",
+"UX c #F6F8FA",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYX. . . . . . . . . . . . . . . . . . . X YXYXYXYXYX",
+"YXYXYXYX7 Z %. at .#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#. at .#.F p = YXYXYX",
+"YXYXf F 3.%X|.'.'.'.|.|.{. X X X}. X{.^.^._._._.Q.Q.W.2.F s   YX",
+"YXYXF 1.9XOX`.|.[.*XxXbXSXDXDXDXDXDXVXnXcXaXp.~.R.R.n.U.,.S o   ",
+"YX% ;.XX].;XmXDXIXIXIXIXIXIXUXUXLXLXJXJXBXwXN ..}.{././.n.>.s . ",
+"YX< <.!.$XHXUXIXIXIXIXIXIXIXUXPXLXKXLXCX0XrX+.X. X}.{./.J.h.V + ",
+"YX, 4.MXUXUXUXIXIXIXIXIXIXIXUXPXLXPXlXqXgXNXe.8..X X}.{./.l.C + ",
+"4 rXFXLXLXLXPXUXUXIXIXIXUXPXLXKXLXcXwXgXBXBXe.V.:X.X}.{./.z.J + ",
+"sXAXCXCXAXJXKXKXLXLXLXLXKXJXGXJXsXtXNXZXCXBXe.V.>XXX X}./.z.J + ",
+"rXrXrXrXfXkXNXCXAXGXAXAXCXCXBXrXrXBXAXZXCXBXe.V.>X>X.X}.{.c.J + ",
+"B lXCXNXlXkXdXdXdXdXdXdXdXdXqX0XNXJXAXZXBXNXe.V.<X>X.X X{.c.J + ",
+"M sXKXLXLXPXPXLXAXCXBXkXsXdXlXCXNXNXCXCXBXNXe.+X<X>XXX X}.c.J + ",
+"  M NXKXPXPXUXIXIXIXIXJXUXPXIXIXUXZXlXNXNXcX0XV.1X>XXX.X}.b.J + ",
+"YX* pXAXKXPXPXUXIXIXLXJXIXIXIXIXIXPXZXkXgXlXe.A.1X>XXX.X}.b.J + ",
+"YX: G hXJXLXPXPXPXPXKXPXIXIXIXIXIXUXPXKXkXsXe.+X<X>XXX.X&Xb.J + ",
+"YX: *.f.CXJXKXKXPXKXCXUXIXIXIXIXLXZXhXyXw.i.a.&X1X<XXX.X Xc.J + ",
+"YX: =.c.dXZXAXJXAXCXPXUXUXJXcXuXq.s.a.#X;X3X,X2X1X>XXX X Xc.J + ",
+"YX: =.E.f.lXAXAXCXCXPXKXjXd.s. at X-X6X7X8X7X4X4X2X1X<XXX X{.c.J + ",
+"YX: =.E.#XrXNXBXBXKXzXw.0.-X8X8X8X8X8X7X7X4X2X1X<X<X.X X{.c.J + ",
+"YX: =.E.:Xg.gXNXNXfXu.+X6X8X8X8X8X8X7X7X4X2X2X1X<XXX.X X{.c.J + ",
+"YX: &.E.XX:XeXdXt.6.=X5X .q 1 3 Q -X7X4X4X2X1X1XB.R C.}.).z.J + ",
+"YX: &.I.XX>Xg.y.6.=X5X6.X   ; $ @ 6.4X4X2X2X1X1Xm   I /./.z.H + ",
+"YX: &.I.XX<X.XK.:X2XK.1 X n K.#X^ m 3 m 1X7.2 l $   # 2 C.l.H + ",
+"YX: &.P..X>X>XXX1X1X9.@ - ..3X2X,XZ.  1 [.z X z -   ; 9 o.k.k + ",
+"YX: &.P. X.XXX<X<X<Xo.O 1 Z.1X1X1X,X3 X ! - - } x   v M.D.k.C + ",
+"YX: %.U.}. X.XXX>X<X8.# - 7.1X>X<X:X!   2 X 8 C.x   b D.G.k.k + ",
+"YX= $.x.{.}.}. X.X.X[.w   2 } | t X.B.-     W G.v   t O.H.[ h o ",
+"YXX A ,.n.{.}. X X X.XX.#   X X @ ~ J.0   O } ~.! X X ; O.{ u   ",
+"YXYXs / j.n.~.~.~.^.{.~.M.b e c ~ M.~.m.b P m.G.N.I r e K C .   ",
+"YXYX: 6 U ) ` ' ' ' ' h.:.] ( ( _ ` ` ] ( ( _ _ _ ( E Y j >     ",
+"YXYXYX  + 6 a g g g g g g g g g g g g g g d d d d d i 5       YX",
+"YXYXYXYX    . .   . . . . . . . .   . . . . .   . .         YXYX"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/knode-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/knode-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/knode-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,115 @@
+/* XPM */
+static char *knode-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 93 2",
+"   c #434343",
+".  c #5A5A5A",
+"X  c #5F5F5F",
+"o  c gray38",
+"O  c gray39",
+"+  c #686868",
+"@  c #6A6A6A",
+"#  c gray44",
+"$  c gray46",
+"%  c #767676",
+"&  c gray47",
+"*  c #7B7B7B",
+"=  c #7C7C7C",
+"-  c gray49",
+";  c #808080",
+":  c #818181",
+">  c gray51",
+",  c #838383",
+"<  c #848484",
+"1  c gray52",
+"2  c #888888",
+"3  c #898989",
+"4  c #8D8D8D",
+"5  c #8E8E8E",
+"6  c #909090",
+"7  c gray57",
+"8  c #929292",
+"9  c #959595",
+"0  c gray59",
+"q  c #979797",
+"w  c #989898",
+"e  c #9A9A9A",
+"r  c gray61",
+"t  c gray63",
+"y  c #A2A2A2",
+"u  c gray64",
+"i  c #A4A4A4",
+"p  c gray68",
+"a  c #AEAEAE",
+"s  c #AFAFAF",
+"d  c gray69",
+"f  c #B1B1B1",
+"g  c #B4B4B4",
+"h  c #B6B6B6",
+"j  c #B7B7B7",
+"k  c gray72",
+"l  c gray73",
+"z  c #BBBBBB",
+"x  c #BCBCBC",
+"c  c gray74",
+"v  c gray",
+"b  c #C0C0C0",
+"n  c #C1C1C1",
+"m  c gray76",
+"M  c gray77",
+"N  c #C5C5C5",
+"B  c gray78",
+"V  c #C8C8C8",
+"C  c gray79",
+"Z  c #CACACA",
+"A  c #CECECE",
+"S  c gray81",
+"D  c LightGray",
+"F  c gray83",
+"G  c #D5D5D5",
+"H  c gray84",
+"J  c #D7D7D7",
+"K  c #D8D8D8",
+"L  c gray86",
+"P  c gainsboro",
+"I  c #DDDDDD",
+"U  c gray87",
+"Y  c gray88",
+"T  c #E1E1E1",
+"R  c #E2E2E2",
+"E  c gray89",
+"W  c #E4E4E4",
+"Q  c #E6E6E6",
+"!  c #E7E7E7",
+"~  c gray91",
+"^  c #EAEAEA",
+"/  c gray92",
+"(  c gray93",
+")  c #EFEFEF",
+"_  c gray94",
+"`  c #F3F3F3",
+"'  c gray96",
+"]  c gray97",
+"[  c gray98",
+"{  c #FBFBFB",
+"}  c #FDFDFD",
+"|  c gray100",
+" . c None",
+/* pixels */
+" . . . . . . . . . . . . . . . .",
+"X t t t t t t t q - - - - - $   ",
+"q / / { | | | | | | | | | ` ` $ ",
+"6 S k S S S m t a N S S S r k 1 ",
+"q ( D | @ : e $ : @ $ 4 4 | ` 1 ",
+"t L x S t t k k a t a a a m f * ",
+"e / L L | { | | | ` E | / E / 3 ",
+"3 L E N | ( R k t e e ( m x h q ",
+"4 m L x / / / R k k q R V L L i ",
+"i | | / ( / R E D r q S L x x r ",
+"e V V x R D L L D x x S V m f 3 ",
+"6 N S N R D L E L R L D V N h 4 ",
+"6 x f f D f N R L x D R k S h 1 ",
+"3 x x i D h h V L N x D f x m 1 ",
+". + O * - - * : : * * : @ : 1 O ",
+" . . . . . . . . . . . . . . . ."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/knode.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/knode.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/knode.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,156 @@
+/* XPM */
+static char *knode[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 118 2",
+"   c black",
+".  c #464646",
+"X  c gray31",
+"o  c gray32",
+"O  c #565656",
+"+  c gray34",
+"@  c gray35",
+"#  c #5A5A5A",
+"$  c #606060",
+"%  c gray38",
+"&  c #626262",
+"*  c #656565",
+"=  c gray40",
+"-  c #6A6A6A",
+";  c #6C6C6C",
+":  c #6D6D6D",
+">  c gray43",
+",  c #6F6F6F",
+"<  c gray44",
+"1  c #717171",
+"2  c #727272",
+"3  c #747474",
+"4  c gray46",
+"5  c #767676",
+"6  c gray48",
+"7  c #7E7E7E",
+"8  c #818181",
+"9  c #848484",
+"0  c gray53",
+"q  c gray55",
+"w  c #8D8D8D",
+"e  c #939393",
+"r  c gray58",
+"t  c #959595",
+"y  c gray59",
+"u  c #979797",
+"i  c #989898",
+"p  c gray60",
+"a  c #9B9B9B",
+"s  c gray61",
+"d  c #9D9D9D",
+"f  c gray62",
+"g  c #9F9F9F",
+"h  c #A0A0A0",
+"j  c #A4A4A4",
+"k  c gray65",
+"l  c #A7A7A7",
+"z  c gray66",
+"x  c #ACACAC",
+"c  c gray68",
+"v  c #AEAEAE",
+"b  c gray69",
+"n  c #B2B2B2",
+"m  c gray71",
+"M  c #B6B6B6",
+"N  c #B7B7B7",
+"B  c #B9B9B9",
+"V  c gray73",
+"C  c #BCBCBC",
+"Z  c gray74",
+"A  c gray",
+"S  c gray75",
+"D  c #C1C1C1",
+"F  c gray76",
+"G  c #C3C3C3",
+"H  c gray77",
+"J  c #C5C5C5",
+"K  c #C6C6C6",
+"L  c gray78",
+"P  c gray79",
+"I  c #CACACA",
+"U  c #CBCBCB",
+"Y  c gray80",
+"T  c #CDCDCD",
+"R  c #CECECE",
+"E  c gray81",
+"W  c gray82",
+"Q  c #D2D2D2",
+"!  c LightGray",
+"~  c gray83",
+"^  c #D5D5D5",
+"/  c gray84",
+"(  c #D8D8D8",
+")  c gray85",
+"_  c #DADADA",
+"`  c gray86",
+"'  c gainsboro",
+"]  c #DDDDDD",
+"[  c gray87",
+"{  c gray88",
+"}  c #E1E1E1",
+"|  c #E2E2E2",
+" . c gray89",
+".. c #E4E4E4",
+"X. c gray90",
+"o. c #E6E6E6",
+"O. c gray91",
+"+. c #E9E9E9",
+"@. c #EAEAEA",
+"#. c gray92",
+"$. c #ECECEC",
+"%. c gray93",
+"&. c #EFEFEF",
+"*. c gray94",
+"=. c #F1F1F1",
+"-. c gray95",
+";. c #F3F3F3",
+":. c #F4F4F4",
+">. c gray96",
+",. c gray97",
+"<. c #F8F8F8",
+"1. c #F9F9F9",
+"2. c gray98",
+"3. c #FBFBFB",
+"4. c gray99",
+"5. c #FDFDFD",
+"6. c gray100",
+"7. c None",
+/* pixels */
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.. . . . . . . . . . . . . . . . . . . . . . . . . . . . 7.7.7.",
+". & 7 7 7 7 7 7 7 7 7 7 7 7 7 0 x D D D D D D Z Z D Z p & . 7.7.",
+"+ Q ] $.6.6.6.6. .] ] ] ] ] ] ] ` ` ] ` ` ` ] ] ] ]  .6.6 . 7.7.",
+"+  .o.o.o.o.o.o.$.o.o.$.o.$.o.o.$.o.$.o.$.o.o.$.o.$.o.o.D . 7.7.",
+"o $.6.$.-.6.6.6.6.6.6.6.6.-. .-.-.-.6.6.6.6.6.6.$.L ] ` T . 7.7.",
+"- o.:.N Z L T T Q  .o.$.$.^ ^ ^  .` Q T T T T T T T V v D . 7.7.",
+"2  .6.$.$.$.$.^ Z L  .T x x D T T T g N  .o.$.$.$.^ V ` 6.. 7.7.",
+"2  .6.L ^ :.6.T p 8 v v V & w 8 8 8 w w e w w p -.6.6.6.6.. 7.7.",
+"2  .6.^ ] 1.6.-.v p w Q V V v V v p e Q 5 8 v w $.$.$.$.6.. 7.7.",
+"- ] o.e e e e e e e e e e e e e e l v v v v v v v v v v -.. 7.7.",
+"2 T 6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.. 7.7.",
+"-  .1.$.-.] -.T 6.6.6.1.6.1.1.6.6.6.6.o.-.6.6.` 1.$.-.` o.. 7.7.",
+"-  .` L ] o.] T 6.6.]  .]  .] D N N g u u 6.6.T  .` ` ] o.- 7.7.",
+"2  .6.-.:.:.-.T 6.6. . .o.Q v j g u u u p 1.6.] o.` ] ] :.5 7.7.",
+"- ` L T T ^ ] T 6.6. . .o.D Z v g g x u p o.6.o. .T Q T  .5 7.7.",
+"-  .L T ` ` ] T 6.6.] ] $. .$. .v Z  .e p o.6.` 6.6.1.6.6.5 7.7.",
+"- o.:.$.$.-.$.L 6.6.]  .$.] o.] ` v D u u L 6.L -.` ]  .] 5 7.7.",
+"& -.6.6.6.6.6.L 6.6.] ] ] ] ] ] ^ p u u u T 6.L  .L ] ] ` 5 7.7.",
+"# :.` T ` ` ` ^ 6.6.1.1.1.1.1.1. .^ L T T -.6.L Q D ^ ` ] 5 7.7.",
+"# -.]  .^ T  .Q Z T L L L L ^ L L T Z D Z T D L ` ` T ` ] 2 7.7.",
+"& o.Q T ^ ^ ] L D N v L  .D  .Z N Q v Z v N x D $.^ ^  .T 5 . 7.",
+"2 $.^ Q ^ ] ` L  . . . .:.:.6.-.$.6.:.-. . .o.L  .T ^ ] Q 7 . 7.",
+"2 o.^ Q L Q ] D o.^ L ^ ^ ` $.6.] ` ^ ] ^ ^ 1.D Q L ^ ^ ^ g . 7.",
+"2  .Q ^ L ^ ` D  .^ L ^ ` `  .1.` ^ ^ ^ ^ ^ 1.D ` Q T ] ` g . 7.",
+"- ` L L ` ` T Q ] T Q L L T  .-.T T T Q L ] -.T ` Q L L ` p . 7.",
+"o ^ T Q ` ] D L Q L L L L L Q ] L D D L L L ] v T L ^ ] ` e . 7.",
+". 0 p g g Z l Z D Z Z Z Z Z L T Z Z Z D Z D T j L D D L D q . 7.",
+". . . . . . . . . * * * * * * * * * * * * * * # * * * * + . . 7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/knotes-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/knotes-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/knotes-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,181 @@
+/* XPM */
+static char *knotes-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 159 2",
+"   c black",
+".  c #090806",
+"X  c #090906",
+"o  c #0D0E0A",
+"O  c #10100B",
+"+  c #161610",
+"@  c #1C1B13",
+"#  c #1E1D14",
+"$  c #1E1E15",
+"%  c #212116",
+"&  c #25251B",
+"*  c #2A2A1C",
+"=  c #2E2E20",
+"-  c #313121",
+";  c #333322",
+":  c #343523",
+">  c #3C3D27",
+",  c #533D13",
+"<  c #44452C",
+"1  c #48482F",
+"2  c #49492E",
+"3  c #555339",
+"4  c #595731",
+"5  c #5E5932",
+"6  c #5D5D3D",
+"7  c #61572B",
+"8  c #625837",
+"9  c #665B33",
+"0  c #765E24",
+"q  c #726129",
+"w  c #7D6121",
+"e  c #7F6023",
+"r  c #79683F",
+"t  c #716743",
+"y  c #716F45",
+"u  c #835E17",
+"i  c #81611E",
+"p  c #86621C",
+"a  c #8A641C",
+"s  c #8E651D",
+"d  c #95670B",
+"f  c #93680F",
+"g  c #96690A",
+"h  c #996C0D",
+"j  c #996C0E",
+"k  c #916614",
+"l  c #916715",
+"z  c #946B1A",
+"x  c #966B1E",
+"c  c #966C1A",
+"v  c #966C1F",
+"b  c #9A6D11",
+"n  c #9A6E11",
+"m  c #9D7009",
+"M  c #9C7019",
+"N  c #9F741C",
+"B  c #9B7221",
+"V  c #A57605",
+"C  c #A0720A",
+"Z  c #AC811A",
+"A  c #B18105",
+"S  c #B98F1E",
+"D  c #939263",
+"F  c #9A9968",
+"G  c #A28555",
+"H  c #A28556",
+"J  c #A28855",
+"K  c #B39662",
+"L  c #C19824",
+"P  c #D3A925",
+"I  c #DCBD38",
+"U  c #C19C52",
+"Y  c #D7BC57",
+"T  c #D7BF7D",
+"R  c #DDC77C",
+"E  c #E2C554",
+"W  c #EAD67D",
+"Q  c #ECD87C",
+"!  c #F8DF78",
+"~  c #FFDF79",
+"^  c #F2E27D",
+"/  c #FFE07A",
+"(  c #FFE17B",
+")  c #FFE27C",
+"_  c #FFE47E",
+"`  c #FFE57F",
+"'  c #A4A688",
+"]  c #B9BA8C",
+"[  c #BABA8E",
+"{  c #C2C18E",
+"}  c #C5C48F",
+"|  c #C5C68F",
+" . c #C7C78F",
+".. c #CBC88F",
+"X. c #CCCB90",
+"o. c #CDCF90",
+"O. c #D0D18E",
+"+. c #D7D392",
+"@. c #D6D792",
+"#. c #D7D49B",
+"$. c #DADA93",
+"%. c #E0DE93",
+"&. c #E0DD98",
+"*. c #EFEB8E",
+"=. c #E2E294",
+"-. c #EBE093",
+";. c #E8E691",
+":. c #EFE997",
+">. c #EFF097",
+",. c #F4E380",
+"<. c #F2E28F",
+"1. c #FFE680",
+"2. c #FFE882",
+"3. c #FFE982",
+"4. c #FEEB84",
+"5. c #FFEC86",
+"6. c #FFEE88",
+"7. c #FFEF89",
+"8. c #F7EC97",
+"9. c #F0EA98",
+"0. c #F0EB9A",
+"q. c #F8EC92",
+"w. c #FFF28C",
+"e. c #FFF48E",
+"r. c #FFF68F",
+"t. c #F0F096",
+"y. c #F7F696",
+"u. c #F1F198",
+"i. c #F8F599",
+"p. c #FBF798",
+"a. c #FCF399",
+"s. c #FFF49B",
+"d. c #FFF699",
+"f. c #FFF799",
+"g. c #FCF79E",
+"h. c #FFFA94",
+"j. c #FFFD97",
+"k. c #FCFC99",
+"l. c #FEFD99",
+"z. c #FFFC99",
+"x. c #FEF7A0",
+"c. c #FFF6A0",
+"v. c #FFF6A2",
+"b. c #FFF7A9",
+"n. c #FFF8A1",
+"m. c #FFF8A2",
+"M. c #FFF8A3",
+"N. c #FFF8A5",
+"B. c #FFF8A6",
+"V. c #FEFAAB",
+"C. c #FFFCAE",
+"Z. c #FFFAB6",
+"A. c #FFFCB2",
+"S. c #FFFCB4",
+"D. c #FFFDB4",
+"F. c #F8FABA",
+"G. c #FFFCBC",
+"H. c #FFFCCA",
+"J. c None",
+/* pixels */
+"J.J.J.J.J.J.J.J.J.J.J.J.J.J.J.J.",
+"J.J.J.J.J.J.J.J.) W 4.e.J.J.J.J.",
+"J.J.J.J.J.) _ 3.5.*.O.k.k.J.J.J.",
+"J.J.~ _ 3.5.r.;.u.o.>.$.f.f.J.J.",
+"! 1.5.e.h.j.k.]  .]  .i.f.f.v.J.",
+"R h.y. at .u.%.....$.#.v.n.v.V.Q I ",
+"G -.=. .' { +.0.V.Z.D.D.,.P A m ",
+"y K g.f.:.0.n.B.G.H.Q L m j h n ",
+"D r T n.B.C.A.8.Y Z b N M l u , ",
+"F 6 G <.q.E S j z B x a w 7 : o ",
+"J.3 t U V f z x s i q 4 > * = J.",
+"J.+ < G d l p 0 5 1 ; % X J.J.J.",
+"J.J.$ 8 e 9 1 ; @ X   J.J.J.J.J.",
+"J.J.  O & $ X   J.J.J.J.J.J.J.J.",
+"J.J.J.      J.J.J.J.J.J.J.J.J.J.",
+"J.J.J.J.J.J.J.J.J.J.J.J.J.J.J.J."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/knotes.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/knotes.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/knotes.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,236 @@
+/* XPM */
+static char *knotes[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 198 2",
+"   c #000000",
+".  c #090906",
+"X  c #0D0C08",
+"o  c #100F0B",
+"O  c #11100B",
+"+  c #151411",
+"@  c #1D1C13",
+"#  c #24241A",
+"$  c #28271B",
+"%  c #29291C",
+"&  c #2D2D20",
+"*  c #322F21",
+"=  c #343323",
+"-  c #3B3B27",
+";  c #3E3E28",
+":  c #423F2B",
+">  c #44432C",
+",  c #4C4D2E",
+"<  c #484731",
+"1  c #4D4D32",
+"2  c #4C4E3E",
+"3  c #574823",
+"4  c #584921",
+"5  c #535335",
+"6  c #55553B",
+"7  c #585732",
+"8  c #5B5A34",
+"9  c #5C5C3B",
+"0  c #6E4E14",
+"q  c #7C5D1F",
+"w  c #645C2F",
+"e  c #635934",
+"r  c #645D38",
+"t  c #7A5F22",
+"y  c #7F601F",
+"u  c #6F652E",
+"i  c #646136",
+"p  c #61603E",
+"a  c #6B6333",
+"s  c #766127",
+"d  c #74612B",
+"f  c #7C6323",
+"g  c #766739",
+"h  c #605E40",
+"j  c #666445",
+"k  c #6D6B4A",
+"l  c #707247",
+"z  c #7D8180",
+"x  c #875E16",
+"c  c #815E1B",
+"v  c #895F15",
+"b  c #8E6003",
+"n  c #8E610C",
+"m  c #84601B",
+"M  c #8C6115",
+"N  c #936404",
+"B  c #91640B",
+"V  c #96680B",
+"C  c #9D6C01",
+"Z  c #996D0B",
+"A  c #916512",
+"S  c #916518",
+"D  c #956A13",
+"F  c #94691C",
+"G  c #996E12",
+"H  c #996F1D",
+"J  c #9F7108",
+"K  c #9F7210",
+"L  c #9A701A",
+"P  c #976E23",
+"I  c #986F25",
+"U  c #9B7323",
+"Y  c #A57400",
+"T  c #AC7C02",
+"R  c #A17513",
+"E  c #A17619",
+"W  c #A77A17",
+"Q  c #A2781C",
+"!  c #A57B20",
+"~  c #866C42",
+"^  c #817044",
+"/  c #8C764E",
+"(  c #8C7950",
+")  c #957749",
+"_  c #B28001",
+"`  c #B68708",
+"'  c #B88500",
+"]  c #BC8A00",
+"[  c #8D8C5E",
+"{  c #908057",
+"}  c #979565",
+"|  c #9A9868",
+" . c #A6814F",
+".. c #AF8848",
+"X. c #B28C5A",
+"o. c #B39158",
+"O. c #AE8D62",
+"+. c #BA9461",
+"@. c #BC9A6D",
+"#. c #A6A570",
+"$. c #B5B47C",
+"%. c #C69400",
+"&. c #C99400",
+"*. c #CC9900",
+"=. c #C49A1E",
+"-. c #C89B17",
+";. c #D49F00",
+":. c #CEA31E",
+">. c #D8AB05",
+",. c #D9AC1B",
+"<. c #D8AC21",
+"1. c #DCB225",
+"2. c #E4AD00",
+"3. c #E1B524",
+"4. c #E3B928",
+"5. c #C19B5D",
+"6. c #DAB648",
+"7. c #D4B159",
+"8. c #C0A066",
+"9. c #C7A772",
+"0. c #CDAD72",
+"q. c #D2BB7B",
+"w. c #D5C67D",
+"e. c #EACA4B",
+"r. c #E5C956",
+"t. c #E9CC59",
+"y. c #E9CA67",
+"u. c #EDDA70",
+"i. c #F1D868",
+"p. c #FAD765",
+"a. c #FCD865",
+"s. c #F3DF72",
+"d. c #FFDD77",
+"f. c #FFDE78",
+"g. c #F1E17A",
+"h. c #FEE17B",
+"j. c #FFE87D",
+"k. c #868982",
+"l. c #898D82",
+"z. c #939384",
+"x. c #9B9D86",
+"c. c #9EA186",
+"v. c #A3A287",
+"b. c #A4A488",
+"n. c #AAA98F",
+"m. c #B4B48B",
+"M. c #BEBB85",
+"N. c #BCBC8B",
+"B. c #C7BF81",
+"V. c #C1BE8D",
+"C. c #C3C38D",
+"Z. c #C8C58E",
+"A. c #CAC88F",
+"S. c #C5C292",
+"D. c #CCCA90",
+"F. c #DDC88E",
+"G. c #D3CE90",
+"H. c #D3D190",
+"J. c #D8D793",
+"K. c #DCDC94",
+"L. c #E1CC82",
+"P. c #E2DB8D",
+"I. c #E3E294",
+"U. c #E3E298",
+"Y. c #E9E495",
+"T. c #EBE098",
+"R. c #EBEB96",
+"E. c #EDEC9E",
+"W. c #F6E58A",
+"Q. c #FDE682",
+"!. c #FEEB84",
+"~. c #FAEB8A",
+"^. c #F2EC95",
+"/. c #F2EB9D",
+"(. c #FEF28C",
+"). c #F3F197",
+"_. c #F3F298",
+"`. c #FFF691",
+"'. c #FEF59A",
+"]. c #FEFB94",
+"[. c #FEFC9A",
+"{. c #EBE9A1",
+"}. c #F3E8A0",
+"|. c #F5F0A3",
+" X c #FEF6A2",
+".X c #FCF5AC",
+"XX c #FEF8A5",
+"oX c #FEFAAC",
+"OX c #F5F6B3",
+"+X c #F6FABC",
+"@X c #FEFCB2",
+"#X c #FEFDBA",
+"$X c #FFFEC1",
+"%X c #FFFECD",
+"&X c #FFFFD7",
+"*X c #FFFFE2",
+"=X c gray100",
+"-X c None",
+/* pixels */
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-Xh.j.h.j.~.-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-Xh.h.h.j.w.!.(.(.].-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-Xh.h.h.j.j.!.(.M.N.].].].].-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-Xh.h.h.Q.Q.(.(.`.].].C.C.[.[.[.`.-X-X-X-X-X-X",
+"-X-X-X-X-X-Xf.f.h.h.Q.!.(.(.(.].].[.R.[.[.C.m.[.[.[.'.-X-X-X-X-X",
+"-X-X-X-Xf.f.h.j.!.!.(.(.`.].R.N.K.I.l.C.[.[.R.Z.R.[.'.'.-X-X-X-X",
+"a.f.f.h.j.Q.!.(.`.`.].].[.[.R.b.z R.C.l.K.D.[.I.^.'.'.'.'.-X-X-X",
+"y.!.!.!.(.(.`.].].[.[.[.[.).b.m.I.A.U.m.z.J.'.[.'.'.'.'. XoX+X-X",
+"@.~.(.`.].].[.R.R.[.).Y.C.I.K.Z.H.E.n.S.'.'.'.'.'.'.XXoX at X.XP.-X",
+"q.q.[.].[.K.x.H.K.[.Y.N.V.D.V.Z.C.XX.X|.XXXXXXXX XoX at XoXu.4.>.-X",
+"Z.o.U.[.[.c.x.c.k.I._.D.m.D.H.Y.'..X at X.X.XoXoX@X#X at Xi.3.>.%.T Z ",
+"} I 9..X[.R.^.R.z.z.b.v.R.T.[.'. X+X#X#X#X#X#X at Xg.1.*._ V n n V ",
+"#.9  .F.XX[.[.[.[.V.H.[.'.'. X XXX$X%X%X&X.Xi.,.' Y n n V V G Q ",
+"J.k g +.}.[.'.'.'.'.E. XXXXXoXoX at X&X*X.Xt.-.Y V A D K K Z N G E ",
+"{.[ 7 ) 0.XX'.'. X XXXXXoX at X#X#X at XW.6.` C n F W W E L V A A 0 4 ",
+"-X| p r X.L. at XXXXXoX@X#X#X at X~.r.=.Y N M L Q Q U F S M M q 4 O 2 ",
+"-X| j 5 / o.^. at X#X#X.X~.e.:.T N n S H L U U F S M m s w < @ . & ",
+"-X-Xj j r +.7.'.W.e.,.] C n M F U U U U S M m f u 8 , ; = * @ -X",
+"-X-X< h 7 ( @.1.*.T N n A F L U P F M v c d a 8 , ; % $ & -X-X-X",
+"-X-X@ < 5 9 @...N n D D H P F S v q s a i 9 , ; & @ X -X-X-X-X-X",
+"-X-X  # > 1 ( o.N Z D D D M m t w a 8 1 ; = % @ . -X-X-X-X-X-X-X",
+"-X-X-X. $ > j o.V B M M m w i 5 1 > = % + O . -X-X-X-X-X-X-X-X-X",
+"-X-X-X  X % > ^ S q d r 9 5 > = # @ X .     -X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X  X $ > e h 6 < = $ @ X .       -X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X    X @ & = % @ X .           -X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X    . X o X           -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X                -X  -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X        -X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X",
+"-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X-X"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kontact-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kontact-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kontact-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,134 @@
+/* XPM */
+static char *kontact-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 112 2",
+"   c black",
+".  c #343434",
+"X  c #333845",
+"o  c #393F49",
+"O  c gray35",
+"+  c gray40",
+"@  c DimGray",
+"#  c #727272",
+"$  c #767676",
+"%  c gray47",
+"&  c #7C7C82",
+"*  c #416FD2",
+"=  c #4A71C6",
+"-  c #5883DF",
+";  c #749BF0",
+":  c #FFD048",
+">  c gray51",
+",  c gray53",
+"<  c #80848D",
+"1  c #888888",
+"2  c gray55",
+"3  c #8D8D8D",
+"4  c gray57",
+"5  c #979797",
+"6  c gray61",
+"7  c #9D9D9D",
+"8  c #9F9F9F",
+"9  c #A19C8F",
+"0  c #A2A2A2",
+"q  c #A4A4A4",
+"w  c gray65",
+"e  c gray66",
+"r  c #A9A9A9",
+"t  c gray68",
+"y  c #AEAEAE",
+"u  c #A4A8B0",
+"i  c #ACAEB2",
+"p  c #AEACB6",
+"a  c gray69",
+"s  c #B2B2B2",
+"d  c #B6B6B6",
+"f  c #B7B7B7",
+"g  c #B0B2BA",
+"h  c #B9B9B9",
+"j  c #BBBBBB",
+"k  c gray75",
+"l  c #889DC5",
+"z  c #94A9CE",
+"x  c #95A9CF",
+"c  c #A5B1CB",
+"v  c #A9B2C2",
+"b  c #A1B2D7",
+"n  c #B5B9C2",
+"m  c #A1B4E3",
+"M  c #AABDE2",
+"N  c #A9BBED",
+"B  c #BEC2C9",
+"V  c #C5BB9F",
+"C  c gray76",
+"Z  c #C5C5C5",
+"A  c gray79",
+"S  c #CBCBCB",
+"D  c #CDCDCD",
+"F  c #CECECE",
+"G  c #C2C2D3",
+"H  c #C6C9D6",
+"J  c #C9C9D8",
+"K  c #D2D2D2",
+"L  c gray83",
+"P  c gray84",
+"I  c #DADADE",
+"U  c gainsboro",
+"Y  c #C3D4FF",
+"T  c #C9DBFE",
+"R  c #D6D6E8",
+"E  c #D7DAE2",
+"W  c #D2DAEF",
+"Q  c #DADAE4",
+"!  c #DCDCE3",
+"~  c #DBDBE8",
+"^  c #CDE0FF",
+"/  c #D7E8FF",
+"(  c #DAE7FF",
+")  c #DAEBFF",
+"_  c #DCEDFF",
+"`  c #E8E0DE",
+"'  c #FCE4C1",
+"]  c #FBF1D8",
+"[  c gray88",
+"{  c #E4E4E4",
+"}  c #E7E7E7",
+"|  c #E3E3ED",
+" . c #E7E7EC",
+".. c #E3E3FC",
+"X. c #EBEDF1",
+"o. c #E9E9FF",
+"O. c gray94",
+"+. c #F0F0F1",
+"@. c #F1F1F1",
+"#. c #F3F3F3",
+"$. c #F4F4F4",
+"%. c gray96",
+"&. c #F1F4F8",
+"*. c #F4F4FF",
+"=. c #FBFBFB",
+"-. c #FBFDFF",
+";. c gray99",
+":. c #FDFDFD",
+">. c #FCFCFE",
+",. c #FEFEFE",
+"<. c gray100",
+"1. c None",
+/* pixels */
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.",
+"O % % % % % 4 Z F i x l . 1.1.1.",
+"r P <.<.<.#.[ &._ / <.^ < %.<.1.",
+"P d S + 7 $ v T -.<.<.<.| J #.1.",
+"S 7 U k P =.<.Z d <.<.' Q G #.0 ",
+"K [ X.5 $ O O Z { <.<.: p 9  .7 ",
+"B ) W 5 , + r <.<.<.<.] V ` <.w ",
+"z *.R <.<.<.<.<.<.<.%.Z & # 2 d ",
+"u ( ..<.P { q 5 $ , a S <.<.=.F ",
+"y M o.I O , + <.<.<.<.<.<.<.#.C ",
+"2 n Y ! d { <.<.<.<.{ P y q , > ",
+"+ y b H <.#.E c g y j j + 1.1.1.",
+". . o m ~ N = X . . . . . 1.1.1.",
+"1.1.1.- ; * 1.1.1.1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kontact.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kontact.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kontact.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,165 @@
+/* XPM */
+static char *kontact[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 127 2",
+"   c black",
+".  c gray9",
+"X  c gray14",
+"o  c #2C2C2C",
+"O  c #2A2C33",
+"+  c #333333",
+"@  c #3E3E3E",
+"#  c #172C58",
+"$  c #3A404B",
+"%  c #404040",
+"&  c #4A4B4B",
+"*  c #545454",
+"=  c #595959",
+"-  c #555D6F",
+";  c #5E656F",
+":  c #5E6A7D",
+">  c #646464",
+",  c #6B6B6B",
+"<  c #757575",
+"1  c #7C7C7C",
+"2  c #375192",
+"3  c #385BAE",
+"4  c #3460CD",
+"5  c #3B66CD",
+"6  c #476AB6",
+"7  c #5E76AD",
+"8  c #607293",
+"9  c #416BCD",
+"0  c #5279D8",
+"q  c #6F87BF",
+"w  c #7B92C2",
+"e  c #7E96D3",
+"r  c #7294E8",
+"t  c #7A9BED",
+"y  c #BDAF79",
+"u  c #D1AC2C",
+"i  c #C4BC52",
+"p  c #E9AD4B",
+"a  c #FFCB00",
+"s  c #FFC429",
+"d  c #EFD37D",
+"f  c #858585",
+"g  c #8C8C8C",
+"h  c #949494",
+"j  c #9C9C9C",
+"k  c #9090A6",
+"l  c #A5A5A5",
+"z  c #A4A6AE",
+"x  c #A6A8AC",
+"c  c #AFA7AF",
+"v  c #ACABAB",
+"b  c #A2A2B6",
+"n  c #A7A7BB",
+"m  c #A6AFBF",
+"M  c #AFB4BE",
+"N  c #B5B5B5",
+"B  c #B0B4BF",
+"V  c #BDBDBD",
+"C  c #879EDA",
+"Z  c #99AFDC",
+"A  c #91ADE6",
+"S  c #9FB7E8",
+"D  c #A6B0C4",
+"F  c #A5B6D4",
+"G  c #B3B3C4",
+"H  c #BFBFC4",
+"J  c #BCBCCA",
+"K  c #BFBFD0",
+"L  c #A3BAEE",
+"P  c #ACBFE8",
+"I  c #A5BEF1",
+"U  c #AABFF7",
+"Y  c #BAC2D0",
+"T  c #AAC3EE",
+"R  c #AFC9F7",
+"E  c #BDC3E1",
+"W  c #BFCDE7",
+"Q  c #B5CBFF",
+"!  c #BBD1FE",
+"~  c #DACD93",
+"^  c #DFD394",
+"/  c #DEC9A6",
+"(  c #E0D2BD",
+")  c #E8D1B0",
+"_  c #F5D5AA",
+"`  c #C4C4C4",
+"'  c #C4C4CB",
+"]  c #C5C9CC",
+"[  c #CBCBCB",
+"{  c #C4C4D3",
+"}  c #CACAD3",
+"|  c #CCCCD8",
+" . c #C6D0DE",
+".. c #CDD2DB",
+"X. c #D2D2D2",
+"o. c #D2D2DC",
+"O. c #D9D9D9",
+"+. c #CCCCE4",
+"@. c #C2D0E7",
+"#. c #C3D3FE",
+"$. c #C5D9FE",
+"%. c #C9D5FF",
+"&. c #CDDFFF",
+"*. c #D2D2E4",
+"=. c #D2D2ED",
+"-. c #D3D8E1",
+";. c #DEDEE4",
+":. c #DBDBEF",
+">. c #D1DAF4",
+",. c #D3DEFF",
+"<. c #DCDCF7",
+"1. c #D9DBF9",
+"2. c #D5E0FF",
+"3. c #DAE8FF",
+"4. c #E4E4E4",
+"5. c #E3E3E9",
+"6. c #ECECEC",
+"7. c #E2E2F7",
+"8. c #E5E5FF",
+"9. c #EEEEF3",
+"0. c #E8E8FF",
+"q. c #EDF1FF",
+"w. c #F4F4F4",
+"e. c #F4F4F8",
+"r. c #F7F9FF",
+"t. c #FEFEFE",
+"y. c None",
+/* pixels */
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"o + % = = = * = = * = * = 1 1 < > > , > > - 8 ; o y.y.y.y.y.y.y.",
+"= ` [ X.X.[ X.X.X.[ X.X.X.X.6.w.e.e.6.Y L &.! D o y.y.y.y.y.y.y.",
+"* 4.4.t.t.t.4.4.4.4.4.4.4.4.4.4.4.;.Z ! r.t.t.A @ y.y.y.y.y.y.y.",
+"* t.6.` 6.t.t.t.t.t.t.X.` X.X.t.$.! r.t.t.t.t.$.; [ 4.6.6.l y.y.",
+"> 6.N j N V V V V ` V V l j F Q q.t.r.e.6.6.w.4.6.r.;.} t.V y.y.",
+"> 4.6.X.6.t.g = N N y - W T >.9.9.9.t.t.t.t.r.9.t.| e.} t.V y.y.",
+"> w.X.N 6.t.` f > 1 { G w.t.t.t.t.t.t.t.t.e.t.( t.| { t.t.` y.y.",
+"> 4.N j j V O.w.t.t.r.t.t.t.f l > N t.t.t.t.) _ 9.{ | n 5.O.h y.",
+"> w.t.t.w.w.t.` e.e.X.X + = l f N 6.t.t.t.9.p s ;.y c b ' 4.h y.",
+"= 4.N N x ;.l X % = h h O.O.t.t.t.t.t.t.t.9./ a b i u k o.e.g y.",
+"> 4.t.3.T ..w.f 6.h , . & f t.t.t.t.t.t.t.t.5.~ d ^ c G w.w.v y.",
+"=  .R 2.=.o.t., > f O.w.t.t.t.t.t.t.t.t.t.t.;.w.J G t.;.w.w.N y.",
+": #.0.0.=.K t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.r.o.` l 1 > ` f ",
+"& ! 8.0.1.{ w.t.t.t.t.t.t.t.t.t.t.t.t.t.t.4.N > % * 1 * N w.X.y ",
+"& @.,.0.8.+.4.t.t.t.t.t.t.t.t.` O.f , = = h g 6.t.w.w.w.6.6.;.8 ",
+", [ I 0.8.+.4.t.` N O.N < = = f < ` w.t.t.t.t.w.w.w.w.w.6.6.4.j ",
+"< 4.m %.0.+.o.4.@ = h h O.` t.t.t.t.t.t.t.t.w.t.w.w.6.6.w.6.4.v ",
+", O.V S 0.=.' t.l h N 1 = f t.t.t.t.t.t.e.t.w.w.w.w.w.6.6.4.[ h ",
+"< O.O.D Q <.{ w.h , l 4.t.t.t.t.t.t.t.e.w.w.w.w.4.X.N j g , - y ",
+"= V N V Z 1.| O.t.t.t.t.t.t.t.t.t.t.t.4.X.V N j h &       y.y.y.",
+"* ] V V G U *.} t.t.t.t.t.t.6.X.V v j j N l l N l o y.y.y.y.y.y.",
+"@ f h v v w @.' t.4.O.` H B q 7 z N ` g ` N V V j o y.y.y.y.y.y.",
+"o o o o o O C { K } *.*.C 2 $ & & & & % & & & & @ o y.y.y.y.y.y.",
+"y.y.y.y.y.  6 K :.7.L 0 4 y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.# t #.r 5   y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.  3 9   y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.",
+"y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y.y."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/korganizer-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/korganizer-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/korganizer-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,220 @@
+/* XPM */
+static char *korganizer-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 198 2",
+"   c black",
+".  c #000200",
+"X  c #020300",
+"o  c #000700",
+"O  c #000800",
+"+  c #000900",
+"@  c #000B00",
+"#  c #001003",
+"$  c #001F04",
+"%  c #032708",
+"&  c #002903",
+"*  c #002B04",
+"=  c #002F06",
+"-  c #042E04",
+";  c #003106",
+":  c #063108",
+">  c #033E05",
+",  c #003C0A",
+"<  c #003E0B",
+"1  c #273E0A",
+"2  c #00400B",
+"3  c #004716",
+"4  c #01451A",
+"5  c #005213",
+"6  c #005915",
+"7  c #005F1A",
+"8  c #085018",
+"9  c #006B19",
+"0  c #006F18",
+"q  c #006F1A",
+"w  c #0F661E",
+"e  c #0D7415",
+"r  c #096430",
+"t  c #146B25",
+"y  c #4E617B",
+"u  c #79737D",
+"i  c #4E6380",
+"p  c #5D7A97",
+"a  c #637FA6",
+"s  c #008C1D",
+"d  c #008C1E",
+"f  c #008425",
+"g  c #008927",
+"h  c #008B2C",
+"j  c #008F2F",
+"k  c #098922",
+"l  c #02952F",
+"z  c #009934",
+"x  c #138D21",
+"c  c #198220",
+"v  c #0DA72F",
+"b  c #0FA62F",
+"n  c #0FA82F",
+"m  c #0EA13D",
+"M  c #0CA830",
+"N  c #07B034",
+"B  c #09B034",
+"V  c #09B036",
+"C  c #0DB337",
+"Z  c #10A62F",
+"A  c #279E22",
+"S  c #08B841",
+"D  c #24915F",
+"F  c #2C9B66",
+"G  c #35966C",
+"H  c #09C04D",
+"J  c #1CC056",
+"K  c #34CB64",
+"L  c #409E20",
+"P  c #5B833F",
+"I  c #6E9816",
+"U  c #6D9920",
+"Y  c #47B16A",
+"T  c #53AA7D",
+"R  c #5EDB44",
+"E  c #3BAF8C",
+"W  c #3DA49F",
+"Q  c #6482A3",
+"!  c #7091B8",
+"~  c #78BF9A",
+"^  c #6793CA",
+"/  c #6699D7",
+"(  c #6A9BD8",
+")  c #709ED3",
+"_  c #77A0D3",
+"`  c #74A2D7",
+"'  c #72A0DA",
+"]  c #7DA8D8",
+"[  c #6EA2E1",
+"{  c #6ED792",
+"}  c #60C5AA",
+"|  c #B01702",
+" . c #8D4B10",
+".. c #8D6111",
+"X. c #AC6F3E",
+"o. c #896357",
+"O. c #D57207",
+"+. c #E94600",
+"@. c #ED7500",
+"#. c #F26500",
+"$. c #F66400",
+"%. c #F26800",
+"&. c #F76A00",
+"*. c #F96900",
+"=. c #FD6F00",
+"-. c #FE6D00",
+";. c #F57300",
+":. c #F57700",
+">. c #F67800",
+",. c #FD7200",
+"<. c #FE7000",
+"1. c #FE7300",
+"2. c #FD7700",
+"3. c #FE7400",
+"4. c #FE7800",
+"5. c #FE7900",
+"6. c #FC7C00",
+"7. c #FE7C00",
+"8. c #D57C53",
+"9. c #8C7D84",
+"0. c #8D870D",
+"q. c #83B354",
+"w. c #AC9674",
+"e. c #B2846D",
+"r. c #FD8100",
+"t. c #FE8400",
+"y. c #F1922D",
+"u. c #FCAA00",
+"i. c #FDAA00",
+"p. c #FEA800",
+"a. c #FDA906",
+"s. c #FEA212",
+"d. c #FEBD08",
+"f. c #F5B11B",
+"g. c #FEA434",
+"h. c #F5B73A",
+"j. c #D79559",
+"k. c #F1AC51",
+"l. c #FDD000",
+"z. c #FED200",
+"x. c #FED007",
+"c. c #FED704",
+"v. c #FED62F",
+"b. c #FEE219",
+"n. c #FEE026",
+"m. c #FECB40",
+"M. c #E3D17B",
+"N. c #FEEE47",
+"B. c #95868B",
+"V. c #81AADA",
+"C. c #89ACD6",
+"Z. c #8CACD3",
+"A. c #81B3EC",
+"S. c #90BDF0",
+"D. c #89D1BB",
+"F. c #99CCB9",
+"G. c #90E3B3",
+"H. c #A6C293",
+"J. c #95C0EB",
+"K. c #9EC4E8",
+"L. c #A2D8DE",
+"P. c #A1C8E9",
+"I. c #A7C9E9",
+"U. c #A9C2E1",
+"Y. c #ACC3ED",
+"T. c #A3CCF2",
+"R. c #A4D2FD",
+"E. c #A4D7FE",
+"W. c #ABD8FD",
+"Q. c #ABDBFE",
+"!. c #B8C8E6",
+"~. c #B8D8F0",
+"^. c #BCDAF7",
+"/. c #BEDCF5",
+"(. c #AEE9ED",
+"). c #B8E6FE",
+"_. c #B9ECF2",
+"`. c #D6AB85",
+"'. c #E9C8A6",
+"]. c #FEF891",
+"[. c #F3F5BC",
+"{. c #C3C2C6",
+"}. c #CFD6ED",
+"|. c #D5D7F6",
+" X c #C9F3DE",
+".X c #CEE6E0",
+"XX c #C4F2E2",
+"oX c #DEE4F6",
+"OX c #DAEEFE",
+"+X c #DCE9FE",
+"@X c #D7F6FE",
+"#X c #E7FCFE",
+"$X c #EBF2FE",
+"%X c #E9F9FE",
+"&X c #FEE4E3",
+"*X c #F1F3FE",
+"=X c #F2F6FE",
+"-X c None",
+/* pixels */
+"-X-X-X-X-X-X-X:.h.8.| -X-X-X-X-X",
+"-X-X-X-X-X-X-Xu.x.g. .k q -X-X-X",
+"-X-X-X-X-X-X2.z.u.+.P S d , -X-X",
+"-X-X-X-X-X-Xu.z.t...XX.Xm q -X-X",
+"-X-X-X-X-Xr.c.d.O.H.%X+XF.l g -X",
+"-X-X-X-X-Xa.b.s.j. at X^./.$X~ f j ",
+"-X-X-X-X6.n.v.y.{.E.T.I.U.}.T h ",
+"-X-X-X-Xf.N.m.X.] A.V.Z.Z.|.D.3 ",
+"-XC K { M.].k.u i ^ ' _ Y.L.r   ",
+"x e.*XoX`.'.B.( a y / S.).F @ -X",
+"> G _.~.o.9.` ) [ Q p W.E $ -X-X",
+"  6 R [.!.P.K.J.R.W.! W 4 -X-X-X",
+"-X@ e w.&XOX=X#X(.} F 8   -X-X-X",
+"-X-X@ c q.XXG.Y t - @   -X-X-X-X",
+"-X-X-X% k w : @   -X-X-X-X-X-X-X",
+"-X-X-X      -X-X-X-X-X-X-X-X-X-X"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/korganizer.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/korganizer.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/korganizer.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *korganizer[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #001C00",
+"X  c #033708",
+"o  c #0C4302",
+"O  c #00450E",
+"+  c #005E1B",
+"@  c #1B5401",
+"#  c #006B1F",
+"$  c #19610E",
+"%  c #0E680B",
+"&  c #026321",
+"*  c #0E7E31",
+"=  c #1D722B",
+"-  c #2A7A57",
+";  c #4C7214",
+":  c #4E5968",
+">  c #505968",
+",  c #576A75",
+"<  c #577263",
+"1  c #616972",
+"2  c #61707F",
+"3  c #637387",
+"4  c #677A94",
+"5  c #008129",
+"6  c #008E35",
+"7  c #008839",
+"8  c #01943B",
+"9  c #019C3B",
+"0  c #049637",
+"q  c #118636",
+"w  c #129B32",
+"e  c #03AA3C",
+"r  c #00A73E",
+"t  c #1CAE35",
+"y  c #20851F",
+"u  c #3C911F",
+"i  c #219B2D",
+"p  c #3B9725",
+"a  c #299536",
+"s  c #2AA43B",
+"d  c #37B139",
+"f  c #058F5E",
+"g  c #009D43",
+"h  c #029A46",
+"j  c #07995A",
+"k  c #118A4C",
+"l  c #189943",
+"z  c #0E9176",
+"x  c #13976B",
+"c  c #00A343",
+"v  c #00AB43",
+"b  c #0BA444",
+"n  c #09BB43",
+"m  c #04B644",
+"M  c #1AAB4F",
+"N  c #17B941",
+"B  c #1CBB56",
+"V  c #19B557",
+"C  c #1AA36F",
+"Z  c #35946B",
+"A  c #29B444",
+"S  c #2FBA50",
+"D  c #31BB48",
+"F  c #28AC7F",
+"G  c #2DB37F",
+"H  c #0CC445",
+"J  c #20C859",
+"K  c #38C14C",
+"L  c #44A02A",
+"P  c #5E9141",
+"I  c #4FAC41",
+"U  c #45D178",
+"Y  c #50D97E",
+"T  c #5EE56B",
+"R  c #3CA08E",
+"E  c #3CA497",
+"W  c #409F9F",
+"Q  c #50B3A9",
+"!  c #43AAA9",
+"~  c #6D8197",
+"^  c #70839F",
+"/  c #7B95B5",
+"(  c #68AD97",
+")  c #7EBCA9",
+"_  c #7F9CC2",
+"`  c #74A2D6",
+"'  c #7CAADC",
+"]  c #78A6D8",
+"[  c #7AACE1",
+"{  c #76ADE5",
+"}  c #70C9B9",
+"|  c #7BD0B9",
+" . c #73E09C",
+".. c #7FC6CD",
+"X. c #7CC3E2",
+"o. c #AE1F00",
+"O. c #B93100",
+"+. c #98542B",
+"@. c #AD5300",
+"#. c #A55E3E",
+"$. c #B2703E",
+"%. c #80574B",
+"&. c #8A655D",
+"*. c #B76541",
+"=. c #AB6D4F",
+"-. c #C23100",
+";. c #D14100",
+":. c #C96310",
+">. c #D86A1B",
+",. c #CF6024",
+"<. c #C36331",
+"1. c #D67035",
+"2. c #EB5C00",
+"3. c #F56F04",
+"4. c #F77E00",
+"5. c #FF4545",
+"6. c #8D9A32",
+"7. c #918550",
+"8. c #AE8067",
+"9. c #ACFF7B",
+"0. c #FE8503",
+"q. c #FD8A00",
+"w. c #FA8A04",
+"e. c #FF8A1C",
+"r. c #FD9200",
+"t. c #FF9A0E",
+"y. c #FF961D",
+"u. c #FF972F",
+"i. c #EB8937",
+"p. c #FEA200",
+"a. c #FFAE02",
+"s. c #FFAE09",
+"d. c #FFB400",
+"f. c #FFBA00",
+"g. c #FFB70D",
+"h. c #FFA923",
+"j. c #FFA432",
+"k. c #FFBA36",
+"l. c #DC9852",
+"z. c #C3896B",
+"x. c #DAB243",
+"c. c #EE9B4E",
+"v. c #FFB24B",
+"b. c #F9B259",
+"n. c #FFB570",
+"m. c #FFC200",
+"M. c #FFCA00",
+"N. c #FFC40B",
+"B. c #FFCB14",
+"V. c #FFC61F",
+"C. c #FFD400",
+"Z. c #FFCC27",
+"A. c #FFD32B",
+"S. c #FFD337",
+"D. c #FFEC01",
+"F. c #FFE009",
+"G. c #FFE81C",
+"H. c #FFF200",
+"J. c #FFF714",
+"K. c #FFE821",
+"L. c #FFED38",
+"P. c #FFF738",
+"I. c #FFC749",
+"U. c #FFD948",
+"Y. c #FFDE50",
+"T. c #FFC866",
+"R. c #FFD763",
+"E. c #FFD778",
+"W. c #FFE244",
+"Q. c #FFE15B",
+"!. c #F7FF41",
+"~. c #FFFE55",
+"^. c #FFE867",
+"/. c #FFFC63",
+"(. c #FFFA73",
+"). c #809BB9",
+"_. c #9597A3",
+"`. c #8BAACB",
+"'. c #82AAD6",
+"]. c #84ADDC",
+"[. c #8AADD6",
+"{. c #8CB2DA",
+"}. c #9AB1CF",
+"|. c #96B4D6",
+" X c #95B6DB",
+".X c #8CB4E3",
+"XX c #85BBEE",
+"oX c #95BBE4",
+"OX c #9ABCE6",
+"+X c #89BCF2",
+"@X c #AABACF",
+"#X c #A2BCD9",
+"$X c #8EE8B1",
+"%X c #82C6FF",
+"&X c #9DC8EE",
+"*X c #91C2EE",
+"=X c #9BC9F5",
+"-X c #97CCFC",
+";X c #8DC8EB",
+":X c #82E0D8",
+">X c #A4CFC6",
+",X c #A4C0DC",
+"<X c #B5DDDA",
+"1X c #A6C3E5",
+"2X c #A3C8E7",
+"3X c #ADCCE7",
+"4X c #ACCCEA",
+"5X c #A6C8EC",
+"6X c #A2C8F2",
+"7X c #ACD0EE",
+"8X c #A5D4FF",
+"9X c #A9D3FA",
+"0X c #B5CBE6",
+"qX c #B6D5EE",
+"wX c #B5D4EB",
+"eX c #B2DEFF",
+"rX c #BBDAF7",
+"tX c #B5D8FA",
+"yX c #BAE5FF",
+"uX c #D1A08A",
+"iX c #FB8F97",
+"pX c #FF9B94",
+"aX c #FF9BAC",
+"sX c #FFB4E0",
+"dX c #FFD58A",
+"fX c #E0CFBD",
+"gX c #FFEC9E",
+"hX c #FFFBA0",
+"jX c #C5D9EE",
+"kX c #C1DFFE",
+"lX c #C6DBF3",
+"zX c #D2DCEB",
+"xX c #D3DFF2",
+"cX c #C3FAD8",
+"vX c #C2E6FF",
+"bX c #CCE4F7",
+"nX c #CAECFF",
+"mX c #CBE6FE",
+"MX c #D3ECFD",
+"NX c #DBEEFE",
+"BX c #D6E3F6",
+"VX c #DCF3FD",
+"CX c #D4F5F9",
+"ZX c #FFE8C9",
+"AX c #FFE5C2",
+"SX c #FFF4C1",
+"DX c #FFF9DB",
+"FX c #E9FBE8",
+"GX c #E1F3FD",
+"HX c #ECFDFF",
+"JX c #E7FCF9",
+"KX c #F5FFFF",
+"LX c #FEFEFF",
+"PX c #FFFFF3",
+"IX c #E4E6F2",
+"UX c #D3CFCF",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXw.c.1.O.o.YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXw.C.(.DXZX,.o.YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXr.H.m.Z.dXn.o.YX# YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYX0.M.D.d.a.0.2.o.H H 5 YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXr.H.M.d.t.0.-.H e n e * YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYX0.m.H.d.d.q.2.o.Y JX0 H e # YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXw.H.C.f.p.w.;.J LXLX<Xr e 9 O YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXq.f.H.m.m.t.3.; cXLXKXKX} e m 0 YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXr.H.F.N.g.y. at . .LXLXqXGXPXZ v v 6 YXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXm.J.B.B.h.e.P LXLXbXGXbXbXLXk v c 6 YXYX",
+"YXYXYXYXYXYXYXYXYXYXYXq.G.G.V.Z.j.:.CXKXMXNXqXqXKXGXJX7 v 9 v YX",
+"YXYXYXYXYXYXYXYXYXYXYXf.P.A.Z.k.u.uXHXVXrX4XNXNXqXbXLX>X7 c 8 YX",
+"YXYXYXYXYXYXYXYXYXYXq.L.!.S.S.v.>.VXGX&XtXmXrXwXBXzX0XLX( h g g ",
+"YXYXYXYXYXYXYXYXYXYXd.~.U.U.I.v.z.MX*XtXyX&X4X0X,X|.zX#XLXZ h b ",
+"YXYXYXYXYXYXYXYXYXr.U.~.Y.Y.T.>. at X=XeX=X.X1X1X[.0X0X|.IXKX<Xh + ",
+"YXYXYXYXYXYXYXYXYXs.(.^.Q.R.T.+., tX' ].oX{.'.0X X[.xXBXBXC q   ",
+"YXYXYXYXYXYXn n Q x.hX^.^.E.i._.3 , OX].` ].5X'. X0XxXxXR 0     ",
+"YXYXYXH H U $XJXPXb.DXSXgXdX*.' ).> 4 ] .X.X` OXOXlXbX..h X   YX",
+"YXH s &.FXLXLXLXVXl.DXDXZX$.}.'..X^ > / ] ' .X].kXMXyXj +   YXYX",
+"YXt = 5.iXLXqXqXGX$.fXZX=.`.'.] ] 6X4 > _ { { yXvXnXx l   YXYXYX",
+"YXo N - %XMXLX2XwX8.&.$.{.[.'.{.` [ `.4 , XXeXyXvXW M     YXYXYX",
+"YX  % m W :XFXGX,X#.%.|.,X[.'.OX] [ -X6X2 , 8XeXX.h O   YXYXYXYX",
+"YXYX  i e T 9.PXqXUXwX3XjX4XoXoXmX+XXX8X`.~ ~ -Xj q   YXYXYXYXYX",
+"YXYX    t w !./.LXqXGXqX7XMX5X&X6XMXnXyXyX/ X.z l   YXYXYXYXYXYX",
+"YXYXYX  X N a aXsXKXbXqXqXlXKXHXGXCXMXvX;X! f S .   YXYXYXYXYXYX",
+"YXYXYXYX  @ m < pXAXGXKXLXLXLXKXHXwXQ j V s p .   YXYXYXYXYXYXYX",
+"YXYXYXYXYX  y b 6.I.DXLXLXLXVX} F B D u X       YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYX  s b L Z VX| G B K L @         YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYX    A v c B D L @         YXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYX  @ d p @         YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYX            YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYX    YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/korn-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/korn-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/korn-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,31 @@
+/* XPM */
+static char *korn-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 9 1",
+"  c black",
+". c #585858",
+"X c #C00000",
+"o c red",
+"O c #808080",
+"+ c #A0A0A4",
+"@ c #C0C0C0",
+"# c gray100",
+"$ c None",
+/* pixels */
+"$$$  $$$$$$$$$$$",
+"$$ @@  $$$$$$$$$",
+"$ ###@@  $$$$$$$",
+"$ @####oo  $$$$$",
+" @@@@##ooX@  $$$",
+" @@@@@@#@X#@.  $",
+" @@@@@@@@X#O+.. ",
+" @@@@@@@+X#+ at O# ",
+" @@@@@@@+X@@@O# ",
+"  @@@@@@@X at O@#  ",
+"$$  @@@@@X at O##  ",
+"$$$$  @@@X at +#.. ",
+"$$$$$$  @+ at O#  $",
+"$$$$$$$$  @  $$$",
+"$$$$$$$$$$ $$$$$",
+"$$$$$$$$$$$$$$$$"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/korn.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/korn.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/korn.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,119 @@
+/* XPM */
+static char *korn[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 81 1",
+"  c #000000",
+". c #0C0C0C",
+"X c #131313",
+"o c #1A1A1A",
+"O c #242424",
+"+ c #2D2D2D",
+"@ c #333333",
+"# c #3B3B3B",
+"$ c #3D4040",
+"% c #7D1919",
+"& c #434444",
+"* c #4B4B4B",
+"= c #545454",
+"- c #555959",
+"; c #5B5B5B",
+": c #646464",
+"> c #6C6C6C",
+", c #737373",
+"< c #7B7B7C",
+"1 c #821919",
+"2 c #8B1D1D",
+"3 c #932222",
+"4 c #9C2525",
+"5 c #954646",
+"6 c #A54646",
+"7 c #B27272",
+"8 c #B67E7E",
+"9 c #C12A2A",
+"0 c #C93939",
+"q c #DF3535",
+"w c #DB3A3A",
+"e c #C95B5B",
+"r c #C77777",
+"t c #E44141",
+"y c #ED4D4D",
+"u c #EC5757",
+"i c #F05454",
+"p c #EF7F7F",
+"a c #F66363",
+"s c #F07676",
+"d c #828283",
+"f c #8B8B8B",
+"g c #8E8E90",
+"h c #908E8E",
+"j c #949394",
+"k c #979799",
+"l c #9A9A9B",
+"z c #9E9EA2",
+"x c #AF9393",
+"c c #AF9A9A",
+"v c #B29797",
+"b c #A2A2A5",
+"n c #A4A4A9",
+"m c #ABABAB",
+"M c #B3B3B3",
+"N c #B6BBBB",
+"B c #BEBEBE",
+"V c #BFC0C0",
+"C c #C2B7B7",
+"Z c #C3B9B9",
+"A c #CBBFBF",
+"S c #D2A8A8",
+"D c #DBA1A1",
+"F c #EF8383",
+"G c #C1C1C1",
+"H c #C8C6C6",
+"J c #CBCBCB",
+"K c #C7D2D2",
+"L c #D3D3D3",
+"P c #DDD4D4",
+"I c #DCDCDC",
+"U c #D6E3E3",
+"Y c #F3C6C6",
+"T c #F3CCCC",
+"R c #E4E4E4",
+"E c #EAE2E2",
+"W c #ECECEC",
+"Q c #ECF3F3",
+"! c #F4F4F4",
+"~ c #FBFBFB",
+"^ c None",
+/* pixels */
+"^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
+"^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
+"^^^^^^^     ^^^^^^^^^^^^^^^^^^^^",
+"^^^^^  X+++.   ^^^^^^^^^^^^^^^^^",
+"^^^^ o#<HGH;@@.  ^^^^^^^^^^^^^^^",
+"^^^ Xj!IJGGHHV=$   ^^^^^^^^^^^^^",
+"^^ Xj~WIILKHVS8v;&  ^^^^^^^^^^^^",
+"^ Xk~~!!WUILKF0e7x;&  ^^^^^^^^^^",
+"^ +!!!~~~!WIUpau96HM:&  ^^^^^^^^",
+" XfIIRW!~~!!Qsyyt4VGHm,#  ^^^^^^",
+" oJLLIIR!!~~~TDuq4JHGGJmd@  ^^^^",
+" oGGHLLIIR!!~~!Yw4LLJHNj>&@.#^^^",
+" oGVGGHJLIIR!!REt4IIIM,,-**&O#^^",
+" oGVVGVGHJLIIRLPw3LWJ<djjd:-*o ^",
+" oGGVVVVGGHJLIJCw3GIm,zbnzc<:X&^",
+" oGGVVVVVVGGJJLCw2HLdzzbl,dGN=X ",
+" oVVVVVVGVBVVVHAw2Mb,nnnd:fIL:. ",
+" oGVVVVVVVVVVVHZw2mk<zznzjLI:*. ",
+" oNGVVVVVVVVVVVCw1j,zlgmK~~N&*. ",
+" X<lBGVVVBVVVVVCw1h>glkgV~W;#=. ",
+"^  o,kGHVVVVVVVCw%j>jfkK!~B*&=. ",
+"^^^  O>kGGVGVVVCw%h;hkbU~I,@&=. ",
+"^^^^^  +:lGHBVGZw5l:bznQ~B=#;;. ",
+"^^^^^^^  @;lHGBZrcm=7mVQW<*><&  ",
+"^^^^^^^^^  @-bHGNMm**<BWB>>*#. ^",
+"^^^^^^^^^^^  @*bGVm&;;<bj*+X  ^^",
+"^^^^^^^^^^^^^  @*mm*:<f;OX  ^^^^",
+"^^^^^^^^^^^^^^   +#*>:OX  ^^^^^^",
+"^^^^^^^^^^^^^^^^   XoX  ^^^^^^^^",
+"^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^",
+"^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^",
+"^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kpalmdoc-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kpalmdoc-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kpalmdoc-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,122 @@
+/* XPM */
+static char *kpalmdoc-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 100 2",
+"   c black",
+".  c #090909",
+"X  c #343634",
+"o  c gray26",
+"O  c #494949",
+"+  c #4C4C4C",
+"@  c gray30",
+"#  c #4E4E4E",
+"$  c #515151",
+"%  c gray33",
+"&  c gray35",
+"*  c #526646",
+"=  c #6A6A6A",
+"-  c #6C6C6C",
+";  c #717171",
+":  c #727272",
+">  c gray45",
+",  c #767676",
+"<  c #797979",
+"1  c gray48",
+"2  c #7E7E7E",
+"3  c gray50",
+"4  c #7AAA7A",
+"5  c #838383",
+"6  c #868688",
+"7  c #898989",
+"8  c gray54",
+"9  c #8B8B8B",
+"0  c gray57",
+"q  c #929292",
+"w  c #909790",
+"e  c gray58",
+"r  c #95959C",
+"t  c #929F92",
+"y  c #979997",
+"u  c #979C97",
+"i  c gray61",
+"p  c #9D9D9D",
+"a  c #9898A0",
+"s  c #9C9CB6",
+"d  c #82B282",
+"f  c #8ABA86",
+"g  c #96A796",
+"h  c #9BBB9B",
+"j  c gray65",
+"k  c #A8A9A8",
+"l  c #AAAAAA",
+"z  c #A6B9A6",
+"x  c #B0B0B3",
+"c  c #B6B6B6",
+"v  c #B0B0B8",
+"b  c #B3B3BD",
+"n  c #BBBBC0",
+"m  c #B9B9C6",
+"M  c #A7CAA6",
+"N  c #B3DFB3",
+"B  c #BEF2BE",
+"V  c #C2C2CA",
+"C  c #C4C4D2",
+"Z  c #C6C6D5",
+"A  c #D1D1D9",
+"S  c #D0D0DF",
+"D  c #D3D3E1",
+"F  c #D6D6E1",
+"G  c #D5D5E4",
+"H  c #DADAE7",
+"J  c #DEDEE6",
+"K  c #C2F2C2",
+"L  c #C6F6C6",
+"P  c #CAFAC6",
+"I  c #CEFECE",
+"U  c #D0EFD0",
+"Y  c #D1FED1",
+"T  c #D6FED6",
+"R  c #D9FED9",
+"E  c #E0E0EC",
+"W  c #E1E1ED",
+"Q  c #E4E4EB",
+"!  c #E5E5EF",
+"~  c #E7E7ED",
+"^  c #E9E9EF",
+"/  c #EAEAEF",
+"(  c #E6E6F0",
+")  c #E7E7F0",
+"_  c #E9E9F2",
+"`  c #EAEAF3",
+"'  c #EBEBF4",
+"]  c #ECECF4",
+"[  c #EEEEF5",
+"{  c #EFEFF6",
+"}  c #F1F1F8",
+"|  c #F3F3F9",
+" . c #F7F7F9",
+".. c #F5F5FC",
+"X. c #F6F6FD",
+"o. c #F8F8FE",
+"O. c #F9F9FE",
+"+. c #FCFCFF",
+"@. c gray100",
+"#. c None",
+/* pixels */
+"  $ $ $ $ $ $ * $ m C S s #.#.#.",
+"$ c k w w w w 4 w $ V J S s #.#.",
+"o 7 y U R T K f d < $ A D D s #.",
+"X # 5 z Y I S S S S S S s s s s ",
+"  o 7 u P L S @.X.X.' ' S s Z s ",
+"    # i M B S @. at .X.' ' S D s s ",
+"#.  o ; g N D @. at .X.{ ' s s s s ",
+"#.    # k h D @.3 3 3 3 H r ~ s ",
+"#.    o 7 t S @. at .@.| ' G b F s ",
+"    o # > 0 S @.3 2 3 2 3 r ^ s ",
+"  o = = O - S @.X.[ ( ( J x  .s ",
+"o = , 2 & + S @.3 3 3 3 3 v ~ s ",
+"o ; 3 7 < = D @.{ { ' ' ( 6 @.s ",
+"  o 9 e i j S @.3 3 3 3 3 n ^ s ",
+"    o % 3 0 D X.} { { ' ( ( J s ",
+"#.    . o o s s s s s s s s s s "
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kpalmdoc.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kpalmdoc.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kpalmdoc.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,150 @@
+/* XPM */
+static char *kpalmdoc[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 112 2",
+"   c black",
+".  c #3F3F3F",
+"X  c #424242",
+"o  c #4C4C4C",
+"O  c #535353",
+"+  c #595959",
+"@  c #526646",
+"#  c gray40",
+"$  c #6B6B6B",
+"%  c #737373",
+"&  c #717C71",
+"*  c #7A7A7A",
+"=  c #6B9B6B",
+"-  c #7E807E",
+";  c #739E73",
+":  c #72A272",
+">  c #7AA67A",
+",  c #7CAB7C",
+"<  c #838383",
+"1  c #8B8B8B",
+"2  c #859385",
+"3  c #849D85",
+"4  c #8F978F",
+"5  c #8B9C8B",
+"6  c #929592",
+"7  c #949894",
+"8  c #9D9D9D",
+"9  c #8D9CB5",
+"0  c #84AE82",
+"q  c #89A38A",
+"w  c #8EAA8D",
+"e  c #82B282",
+"r  c #8AB686",
+"t  c #8ABA86",
+"y  c #8BBC8B",
+"u  c #92B391",
+"i  c #95BA96",
+"p  c #9EACBE",
+"a  c #A4A4A4",
+"s  c #ABABAB",
+"d  c #A4ADBE",
+"f  c #B3B3B3",
+"g  c #BBBBBB",
+"h  c #A2AEC0",
+"j  c #AAB4C4",
+"k  c #AEB9CA",
+"l  c #B2B9C4",
+"z  c #B2BCCA",
+"x  c #B9BFC9",
+"c  c #92C28E",
+"v  c #95C294",
+"b  c #9AC69E",
+"n  c #9ACA96",
+"m  c #9CCC9C",
+"M  c #A2D29E",
+"N  c #A4D6A4",
+"B  c #AAD7AA",
+"V  c #AEDEAE",
+"C  c #ACDCB0",
+"Z  c #BCCABC",
+"A  c #BCDFBC",
+"S  c #AEE2AE",
+"D  c #AEE2B2",
+"F  c #B4E4B6",
+"G  c #B4E4B8",
+"H  c #BAEEBA",
+"J  c #BEF1BD",
+"K  c #B4C0CD",
+"L  c #BAC0CA",
+"P  c #B4C2D2",
+"I  c #B5C3D9",
+"U  c #BAC5D3",
+"Y  c #B9C6DA",
+"T  c #BDC8D5",
+"R  c #BECADD",
+"E  c #C0C0C0",
+"W  c #C2C6CE",
+"Q  c #C6C9CF",
+"!  c #CDCECE",
+"~  c #C0C6D1",
+"^  c #C2C9D3",
+"/  c #C0CBDB",
+"(  c #C6D3C6",
+")  c #C2CDE0",
+"_  c #C5D0E1",
+"`  c #CAD3E4",
+"'  c #CED8EA",
+"]  c #D3DCEA",
+"[  c #D8DFEC",
+"{  c #C1EBC1",
+"}  c #C6F6C6",
+"|  c #CAFAC6",
+" . c #CCFDCC",
+".. c #D8EBD8",
+"X. c #D2F5D2",
+"o. c #D6FED4",
+"O. c #D9F4D9",
+"+. c #DBFEDB",
+"@. c #D7E0EF",
+"#. c #DAE1EE",
+"$. c #DDE4F1",
+"%. c #E0E6F1",
+"&. c #E4E9F3",
+"*. c #E6EEFA",
+"=. c #E9EDF6",
+"-. c #EAEFF8",
+";. c #ECF1F9",
+":. c #F6F6F6",
+">. c #F1F5FB",
+",. c #F5F8FE",
+"<. c #FEFEFE",
+"1. c None",
+/* pixels */
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.+ + + + + + + + + + + + + + + + 1.1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.+ ,.<.<.<.<.<.<.<.,.,.;.&.&.[ + + 1.1.1.1.1.1.",
+"1.1.1.1.1.1.1.1.1.+ ,.<.<.<.<.<.<.<.,.>.-.&.#.] + *.+ 1.1.1.1.1.",
+"1.X X X X X X X X @ X X <.! ! ! ! ! Q >.;.-.&.[ + *.$.+ 1.1.1.1.",
+"X f s 4 4 4 4 4 4 , 4 4 X <.<.<.<.<.,.,.>.-.&.#.+ ,.&.$.+ 1.1.1.",
+"X * 6 ( ..O.X.{ N e > * O :.<.<.<.<.<.,.>.;.&.#.+ <.,.&.$.+ 1.1.",
+"X f 6 Z +.+.o.| S t e ; a X ! ! ! ! ! Q W x =.%.+ =.=.%.] ] + 1.",
+"1.O < * +.o. .| V t y y * O <.<.<.<.<.,.>.>.=.&.+ + + + + + + + ",
+"1.X s 7 A  . .H M y c v 0 s X ! ! ! ! Q W L =.=.&.#.[ _ Y Y z + ",
+"1.1.O 8 & | } F M y v n n * O :.<.<.<.<.,.>.;.=.&.[ ` / R R Y + ",
+"1.1.X < 7 J H G m i m M N v f X ! ! ! ! ,.,.>.=.%.] ` _ ) ) ) + ",
+"1.1.X a s i F F b e : = = ; * O <.<.<.<.,.,.;.&.[ ] ` ` ` ) _ + ",
+"1.1.1.O 1 $ C B y ; = = = , 0 f X ! ! Q ^ L l h d h p p h ` ' + ",
+"1.1.1.X 8 s q b v , , r c m M * O <.,.>.;.&.#.[ [ ] ] ' ' ' ' + ",
+"1.1.1.1.O 1 % 2 i i u w 5 2 < f Z X W x l d l d j j k j j ' ] + ",
+"1.1.1.X X 8 f % $ * * 1 7 s g ! s X =.&.&.&.%.%.%.#.[ [ [ ] [ + ",
+"1.X . # o % a f f f g g E g g s < X x x z z z z z k k z k [ @.+ ",
+"X # # * + o 7 s g g f f g g a * X o -.=.=.*.&.&.%.%.%.[ $.$.$.+ ",
+"# $ % * % + $ 1 8 f s 8 1 % o O $ 1 X W x x x z K K K P z $. at .+ ",
+"$ * - < 1 % o + % * O X X O # < 8 s s X -.-.*.&.%.&.$.#.$.$.$.+ ",
+"% * < 1 6 7 6 - o + - 1 . 8 X s f f g . U U U x U P P I I @.$.+ ",
+"X < 1 6 8 8 s f 8 8 a a 1 . 6 f g g . ;.-.-.=.=.&.&.%.$.$.$.$.+ ",
+"1.X 6 8 8 s f f a s s f f f g Z X X U U T T U U U I P I P #.$.+ ",
+"1.1.X X 8 s f s s f f g f X X X >.;.:.;.;.-.=.=.&.&.&.&.$.&.$.+ ",
+"1.1.1.1.X X X X X X X X X ^ ^ ^ Q T T Q T T U T T U U Y Y $.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ ,.<.<.>.>.>.;.;.;.-.;.=.=.=.&.&.&.#.$.$.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ ,.<.,.>.;.:.>.;.;.;.;.;.=.=.&.&.&.$.$.$.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ ,.<.<.>.,.>.>.;.;.;.T T =.$.&.$.$.$.$.&.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ ;.<.,.>.>.>.>.;.;.;.;.-.-.&.&.&.$.&.$.$.$.+ ",
+"1.1.1.1.1.1.1.1.1.+ + + + + + + + + + + + + + + + + + + + + + + "
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kpilot-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kpilot-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kpilot-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,194 @@
+/* XPM */
+static char *kpilot-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 172 2",
+"   c black",
+".  c gray2",
+"X  c #111111",
+"o  c #131313",
+"O  c gray12",
+"+  c gray14",
+"@  c #292629",
+"#  c gray16",
+"$  c gray18",
+"%  c gray21",
+"&  c gray22",
+"*  c #3A3A3A",
+"=  c gray23",
+"-  c #3A383C",
+";  c #3C393E",
+":  c #3C3C3C",
+">  c #3F3F3F",
+",  c #4F6736",
+"<  c #526B37",
+"1  c #577139",
+"2  c #577238",
+"3  c #57703C",
+"4  c #57703D",
+"5  c #414141",
+"6  c #444244",
+"7  c #484648",
+"8  c #4C4B4E",
+"9  c #4D4B4F",
+"0  c #4E4E4E",
+"q  c #4F4F51",
+"w  c #515051",
+"e  c #5B5B5B",
+"r  c #5C7641",
+"t  c #5D7742",
+"y  c #617D47",
+"u  c #62794B",
+"i  c #637F48",
+"p  c #657C4B",
+"a  c #697D54",
+"s  c gray38",
+"d  c gray44",
+"f  c #797979",
+"g  c #7C7A7D",
+"h  c #668445",
+"j  c #65804C",
+"k  c #65814D",
+"l  c #69864B",
+"z  c #6A8153",
+"x  c #6B8751",
+"c  c #6D8952",
+"v  c #6E904A",
+"b  c #728D56",
+"n  c #758E5A",
+"m  c #73964C",
+"M  c #719053",
+"N  c #749355",
+"B  c #75935A",
+"V  c #7A9F52",
+"C  c #799B58",
+"Z  c #7B9A5A",
+"A  c #7EA057",
+"S  c #7EA257",
+"D  c #7EA258",
+"F  c #7DA05C",
+"G  c #817E82",
+"H  c #869F6B",
+"J  c #80A458",
+"K  c #82A260",
+"L  c #86A961",
+"P  c #8AA46E",
+"I  c #88AB69",
+"U  c #8EAA6F",
+"Y  c #8CB464",
+"T  c #8CB16A",
+"R  c #93A97A",
+"E  c #91B06D",
+"W  c #92B76D",
+"Q  c #90B96B",
+"!  c #91B670",
+"~  c #91B770",
+"^  c #95B375",
+"/  c #94BB70",
+"(  c #9BB67C",
+")  c #99BF75",
+"_  c #9CC479",
+"`  c #808080",
+"'  c #8A878C",
+"]  c #918D92",
+"[  c gray57",
+"{  c #919092",
+"}  c #959297",
+"|  c #99969A",
+" . c #9A989C",
+".. c #9B999D",
+"X. c #9C9B9C",
+"o. c #9CB481",
+"O. c #A0BA83",
+"+. c #A5BE89",
+"@. c #A5BF8A",
+"#. c gray63",
+"$. c #A3A2A4",
+"%. c #A7A7A7",
+"&. c gray66",
+"*. c #A9A9A9",
+"=. c #A9A8AB",
+"-. c gray67",
+";. c gray68",
+":. c #ADACAE",
+">. c #B0AFB0",
+",. c #B3BCAB",
+"<. c #B3BDAC",
+"1. c #B4BDAD",
+"2. c #B4BEAD",
+"3. c #B1B1B1",
+"4. c #B1B0B2",
+"5. c #B2B2B2",
+"6. c #B3B3B2",
+"7. c gray70",
+"8. c #B3B1B4",
+"9. c gray72",
+"0. c #BBBBBB",
+"q. c #BCBBBD",
+"w. c #BCBBBE",
+"e. c gray74",
+"r. c #A2C980",
+"t. c #A2CA80",
+"y. c #A4CA83",
+"u. c #A6CD85",
+"i. c #A6CE85",
+"p. c #A8CF86",
+"a. c #A8CF87",
+"s. c #ACC393",
+"d. c #B7CAA0",
+"f. c #B9CBA4",
+"g. c #B9CBA5",
+"h. c #B9CCA4",
+"j. c #BACDA5",
+"k. c #BBCEA7",
+"l. c #B7C1B0",
+"z. c #B9C1B1",
+"x. c #BAC3B3",
+"c. c #BFCDB0",
+"v. c #BFCEB1",
+"b. c #C0C7B9",
+"n. c #C0CEB1",
+"m. c #C4CCBD",
+"M. c #C2D0B4",
+"N. c #C4D1B4",
+"B. c #C5D2B7",
+"V. c #CAD6BC",
+"C. c #C1C0C3",
+"Z. c #C3C3C4",
+"A. c #C3C6C1",
+"S. c #C8CFC1",
+"D. c #C9CFC2",
+"F. c #CECED0",
+"G. c #CBD2C3",
+"H. c #CBD3C3",
+"J. c #CDD4C5",
+"K. c #CED5C6",
+"L. c #CED6C6",
+"P. c #D2DDC5",
+"I. c #D2D0D3",
+"U. c #D5D7D4",
+"Y. c #D6D5D7",
+"T. c #D8DED1",
+"R. c #D8DED2",
+"E. c #DAE0D4",
+"W. c #DEE6D4",
+"Q. c #DFE5D9",
+"!. c #F0F2ED",
+"~. c None",
+/* pixels */
+"~.~.# Z.I.F.F.F.F.F.F.Y.`   ~.~.",
+"~.~.e !.T.T.T.T.T.T.R.Q.U.X ~.~.",
+"~.~.g W.d.k.k.k.k.k.s.( D.@ ~.~.",
+"~.~.{ P.o.+.+.R ( U v V H.; ~.~.",
+"~.~...V.^ P H a b 2 2 J L.7 ~.~.",
+"~.~...N.E n z u , < m J L.9 ~.~.",
+"~.~.| N.Z p K t 3 3 h C L.q ~.~.",
+"~.~.} n.D l Z i N y r L G.w ~.~.",
+"~.~.] v.Y N j x c k F W G.8 ~.~.",
+"~.~.' v.W T T B I ! / ) m.6 ~.~.",
+"~.~.` M._ t.i.i.a.a.t.y.x.- ~.~.",
+"~.~.d A.2.2.x.2.z.z.<.z.7.$ ~.~.",
+"~.~.s >.6.q.$.q.8.=.C.;.X.+ ~.~.",
+"~.~.0 6.6.9.#.0.6.%.e.6.} o ~.~.",
+"~.~.% ;.=.%.-.%.=.-.%.-.f . ~.~.",
+"~.~.  % 6 > : : : : = = O   ~.~."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/kpilot.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/kpilot.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/kpilot.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,177 @@
+/* XPM */
+static char *kpilot[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 139 2",
+"   c #000000",
+".  c #0B0B0B",
+"X  c gray7",
+"o  c #1A1A1A",
+"O  c #222222",
+"+  c #2D2D2D",
+"@  c #343434",
+"#  c #3B3B3B",
+"$  c #4D6434",
+"%  c #506735",
+"&  c #516936",
+"*  c #546B3B",
+"=  c #57703D",
+"-  c #5A723F",
+";  c #444444",
+":  c #4A4A4A",
+">  c #5C5C5C",
+",  c #5B6E47",
+"<  c #5C6D49",
+"1  c #5B7345",
+"2  c #5F7249",
+"3  c #5E7942",
+"4  c #617D45",
+"5  c #637C4B",
+"6  c #697E52",
+"7  c #656565",
+"8  c #6D6D6D",
+"9  c #727272",
+"0  c #797979",
+"q  c #638044",
+"w  c #65804B",
+"e  c #68844A",
+"r  c #698847",
+"t  c #6C8C4A",
+"y  c #668050",
+"u  c #6A8352",
+"i  c #6C8950",
+"p  c #6F904B",
+"a  c #71855B",
+"s  c #708E53",
+"d  c #75895F",
+"f  c #71924D",
+"g  c #769B4E",
+"h  c #789D4F",
+"j  c #729153",
+"k  c #769559",
+"l  c #779B50",
+"z  c #78955B",
+"x  c #799D50",
+"c  c #79995C",
+"v  c #7F9664",
+"b  c #7DA254",
+"n  c #7FA15A",
+"m  c #839F65",
+"M  c #849A6B",
+"N  c #82A55C",
+"B  c #83A85C",
+"V  c #83A361",
+"C  c #86A06A",
+"Z  c #86AB60",
+"A  c #8AA66C",
+"S  c #88AD63",
+"D  c #8BAC6B",
+"F  c #8BB165",
+"G  c #8EB36A",
+"H  c #91AF6E",
+"J  c #92AF70",
+"K  c #90B36D",
+"L  c #91B86D",
+"P  c #94B174",
+"I  c #95BC70",
+"U  c #98B477",
+"Y  c #99B47B",
+"T  c #98BF75",
+"R  c #9CB87D",
+"E  c #96C070",
+"W  c #98C074",
+"Q  c #9DC47A",
+"!  c #A0C87E",
+"~  c #858585",
+"^  c #8B8B8B",
+"/  c #919191",
+"(  c #9B9B9B",
+")  c #9DB881",
+"_  c #A4BD89",
+"`  c #A8BF8E",
+"'  c #A4A4A4",
+"]  c #AAAAAA",
+"[  c #AEACB0",
+"{  c #B0ADB2",
+"}  c #B3B2B3",
+"|  c #B6B3B8",
+" . c #B8B6BA",
+".. c #BABABB",
+"X. c #BEBDC0",
+"o. c #A7C18C",
+"O. c #A3CC81",
+"+. c #A9C08F",
+"@. c #ABC191",
+"#. c #ADC993",
+"$. c #A6D084",
+"%. c #A8D286",
+"&. c #B3C79B",
+"*. c #B1CC96",
+"=. c #B5C99E",
+"-. c #B6D29D",
+";. c #B7CAA0",
+":. c #BAC5AC",
+">. c #B8CBA1",
+",. c #BBCBAD",
+"<. c #BEC9B0",
+"1. c #BED0AA",
+"2. c #C0CDB3",
+"3. c #C0D1AD",
+"4. c #C3D4B3",
+"5. c #C6D2BA",
+"6. c #C9D5BC",
+"7. c #CAD9BA",
+"8. c #C3C3C3",
+"9. c #C7C5C9",
+"0. c #C9C7CB",
+"q. c #CBCBCB",
+"w. c #CFCDD1",
+"e. c #C9D1C3",
+"r. c #CFDCC4",
+"t. c #D0CFD0",
+"y. c #D5DFC9",
+"u. c #D4D4D4",
+"i. c #D6D4D8",
+"p. c #DADADA",
+"a. c #DFDDE1",
+"s. c #E0DEE2",
+"d. c #E3E3E2",
+"f. c #E4E8E0",
+"g. c #ECECEC",
+"h. c #F0F0EF",
+"j. c #F2F2F2",
+"k. c #FBFBFB",
+"l. c None",
+/* pixels */
+"l.l.l.l.l.  ( ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 9 . l.l.l.l.l.l.",
+"l.l.l.l.l.> d.j.j.h.j.j.j.h.h.h.h.j.j.h.h.h.h.j.j.~   l.l.l.l.l.",
+"l.l.l.l.  ( k.g.f.f.d.d.f.a.d.a.d.d.d.d.d.d.d.d.k.9.. l.l.l.l.l.",
+"l.l.l.l.  | j.5.} 2.2.2.2.2.2.2.2.:.2.2.2.:.2.3.f.u.O l.l.l.l.l.",
+"l.l.l.l.o 8.j.7.4.4.4.4.4.7.4.4.3.4.4.7.4.7.>.` y.p.# l.l.l.l.l.",
+"l.l.l.l.O q.g.1.=.>.=.>.=.>.>.>.>.;.&.&.` J N g 6.a.: l.l.l.l.l.",
+"l.l.l.l.+ p.g.=.` ` ` ` +.+.` ` ` _ _ R B N g g 6.s.7   l.l.l.l.",
+"l.l.l.l.# p.d. at .R R R R _ R M d M R U r 4 p g g 6.s.8   l.l.l.l.",
+"l.l.l.l.; p.f.+.U Y Y Y R R a < d G p $ $ * g x 6.s.0   l.l.l.l.",
+"l.l.l.l.; p.p.+.J U A 6 M M 6 2 i p & $ $ p x h 6.s.~   l.l.l.l.",
+"l.l.l.l.: i.p.` H J M 5 < 5 6 < - & $ & r b l h 5.p.^   l.l.l.l.",
+"l.l.l.l.: p.p._ A H H 6 5 C 6 * % % $ - b b x h 5.p.^   l.l.l.l.",
+"l.l.l.l.; u.p._ V V d 4 m D 4 % * & * - f t l b 5.i.^   l.l.l.l.",
+"l.l.l.l.; t.p._ N 5 * 4 B N 4 * 4 4 & * 3 = f b 5.u./   l.l.l.l.",
+"l.l.l.l.; q.p._ N j e 1 N S 4 * t V q - = e n N 5.w.^ . l.l.l.l.",
+"l.l.l.l.; q.u._ N B B q s F 5 = i F s 3 * 3 B Z 5.q.^ . l.l.l.l.",
+"l.l.l.l.; q.t.o.n F n q 1 k i i k i 3 i i n D S <.w.^ . l.l.l.l.",
+"l.l.l.l.; 9.t.#.n L v , w y w u 5 u 5 1 n I G G e.0.~ . l.l.l.l.",
+"l.l.l.l.; X.w.#.E E G c G W c 1 c Q K v L I L L 7.8.0   l.l.l.l.",
+"l.l.l.l.# X.w.#.F E W Q Q Q D y D Q Q Q W W I E r...0   l.l.l.l.",
+"l.l.l.l.# X.9.#.L W W Q Q Q $.Q Q $.Q O.O.Q W W 6. .9   l.l.l.l.",
+"l.l.l.l.@ :.0.-.E W ! O.$.%.%.%.%.%.%.%.O.Q Q O.r.| 7   l.l.l.l.",
+"l.l.l.l.+ } X.e.,.,.,.,.<.<.<.<.<.<.<.,.,.,.,.<.q.] >   l.l.l.l.",
+"l.l.l.l.O ] } | | [ | ..| | ..}  . ...|  .} |  .} ' :   l.l.l.l.",
+"l.l.l.l.o ' } ] / ] ' ' } ] ( ' ' } } } ' ] ( ( } ( ;   l.l.l.l.",
+"l.l.l.l.o ( } ( ] h.a.] ] ~ 8.g.8.( ] ( 8.h.0.~ } / @   l.l.l.l.",
+"l.l.l.l.X / } ] ( 8.p.[ ] / | p.2.' ] ' 9.u.] ' ] ^ + l.l.l.l.l.",
+"l.l.l.l.  ~ [ ] ] ' ' ] ] ] ' ' ' ] ] ] ' ' ' ] ] 0 o l.l.l.l.l.",
+"l.l.l.l.  0 ] ' ' ] ' ' ' ] ] ' ' ' ] ' ' ' ' ' ' 8 X l.l.l.l.l.",
+"l.l.l.l.l.> ] ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ~ >   l.l.l.l.l.",
+"l.l.l.l.l.X 7 0 0 0 9 0 9 9 9 9 9 9 8 8 9 8 8 7 > O   l.l.l.l.l.",
+"l.l.l.l.l.l.                                        l.l.l.l.l.l."
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/ksync-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/ksync-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/ksync-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+/* XPM */
+static char *ksync-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 7 1",
+"  c black",
+". c blue",
+"X c #00C0C0",
+"o c #808080",
+"O c #C0C0C0",
+"+ c gray100",
+"@ c None",
+/* pixels */
+"@@@@@@  @@@@@@@@",
+"@@@@@@ O  @@@@@@",
+"@@  @@  ..  @@@@",
+"@@ O   +  ..  @@",
+"@@  ..  ++  Oo @",
+"@@ +  ..  ++   @",
+"@@ +++  Oo O++ @",
+"   +++++   O++ @",
+" X  ++++++ O++ @",
+"  XX  ++++ O++ @",
+" +  O O+++ OO+ @",
+" O++  O+++   O @",
+"  OO+  OO+ @@  @",
+"@@  O @  O @@@@@",
+"@@@@  @@@  @@@@@",
+"@@@@@@@@@@@@@@@@"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/ksync.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/ksync.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/ksync.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,47 @@
+/* XPM */
+static char *ksync[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 9 1",
+"  c black",
+". c #0000C0",
+"X c blue",
+"o c #008080",
+"O c #00C0C0",
+"+ c #808080",
+"@ c #C0C0C0",
+"# c gray100",
+"$ c None",
+/* pixels */
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$  $$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$ +  $$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$ @@   $$$$$$$$$$$$$",
+"$$$$$  $$$$$$ @@ ..  $$$$$$$$$$$",
+"$$$$$ +  $$$$  + XX..  $$$$$$$$$",
+"$$$$$ @@   $$ @  ..XX..  $$$$$$$",
+"$$$$$ @@ ..   ##@  ..XX.   $$$$$",
+"$$$$$  + XX..  @##@  ..X @+  $$$",
+"$$$$$ @  ..XX..  @##@  . @@ +  $",
+"$$$$$ ##@  ..XX.   @##@  +@ @@ $",
+"$$$$$ ####@  ..X @+  @##@   @@ $",
+"$$$$$ ######@  . @@ +  ###@  + $",
+"$$$$$ ########@  +@ @@ @####@  $",
+"$  $$ ##########@   @@ @@####@ $",
+"$ o   ############@  + @@####@ $",
+"$ Ooo  @############@  @@####@ $",
+"$ oOOoo  @###########@ @@####@ $",
+"$  ooOOoo  @#########@ @@####@ $",
+"$ @  ooOO +  ########@ @@####@ $",
+"$ ##@  oo @@ @#######@ @@####@ $",
+"$ ####@   @@ @@######@ @@####@ $",
+"$ ######@  + @@######@ @@@###@ $",
+"$ ########@  @@######@   @@@#@ $",
+"$ @@#######@ @@@#####@ $$  @@@ $",
+"$  @@@#####@   @@@###@ $$$$  @ $",
+"$$$  @@@###@ $$  @@@#@ $$$$$$  $",
+"$$$$$  @@@#@ $$$$  @@@ $$$$$$$$$",
+"$$$$$$$  @@@ $$$$$$  @ $$$$$$$$$",
+"$$$$$$$$$  @ $$$$$$$$  $$$$$$$$$",
+"$$$$$$$$$$$  $$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/ktnef-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/ktnef-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/ktnef-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,257 @@
+/* XPM */
+static char *kmail-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 235 2",
+"   c #010101",
+".  c #020202",
+"X  c gray1",
+"o  c #000004",
+"O  c #000307",
+"+  c #020105",
+"@  c #040304",
+"#  c #060505",
+"$  c #070504",
+"%  c #020208",
+"&  c #05080F",
+"*  c #080A0D",
+"=  c #080A0E",
+"-  c #0A090C",
+";  c #0A090E",
+":  c #0E0C0B",
+">  c #0F0C0B",
+",  c #0E0C0C",
+"<  c #0F0D0D",
+"1  c #070911",
+"2  c #060B11",
+"3  c #070C10",
+"4  c #070C12",
+"5  c #070D12",
+"6  c #0B0C10",
+"7  c #0B0D10",
+"8  c #0E0E11",
+"9  c #110F0D",
+"0  c #100F0F",
+"q  c #110F0F",
+"w  c #121010",
+"e  c #131111",
+"r  c #131112",
+"t  c #131212",
+"y  c #141110",
+"u  c #151211",
+"i  c #141212",
+"p  c #171313",
+"a  c #151014",
+"s  c #161315",
+"d  c #171415",
+"f  c #11131D",
+"g  c #15161D",
+"h  c #191316",
+"j  c #181415",
+"k  c #1A1416",
+"l  c #1D1A1A",
+"z  c #1D1A1B",
+"x  c #171920",
+"c  c #181925",
+"v  c #1B1C2E",
+"b  c #1C1F28",
+"n  c #1D1E2F",
+"m  c #211D1C",
+"M  c #241F20",
+"N  c #353847",
+"B  c #442519",
+"V  c #482512",
+"C  c #4F2917",
+"Z  c #582208",
+"A  c #582308",
+"S  c #5A2608",
+"D  c #592B16",
+"F  c #603420",
+"G  c #664427",
+"H  c #66412C",
+"J  c #68492D",
+"K  c #6D5231",
+"L  c #7B5937",
+"P  c #464957",
+"I  c #58504C",
+"U  c #505267",
+"Y  c #5B5D62",
+"T  c #786042",
+"R  c #626271",
+"E  c #6E6D7E",
+"W  c #707073",
+"Q  c #7D7F87",
+"!  c #84400A",
+"~  c #825213",
+"^  c #975E01",
+"/  c #814B2E",
+"(  c #82562E",
+")  c #85532B",
+"_  c #85612C",
+"`  c #AA5201",
+"'  c #AF6B00",
+"]  c #AC6515",
+"[  c #BD6409",
+"{  c #C47400",
+"}  c #C37517",
+"|  c #D16413",
+" . c #DE6D1C",
+".. c #DA741C",
+"X. c #DF711C",
+"o. c #DF7E12",
+"O. c #C96427",
+"+. c #EF7B04",
+"@. c #E47316",
+"#. c #F67800",
+"$. c #F97B04",
+"%. c #BE8618",
+"&. c #968778",
+"*. c #C98106",
+"=. c #DD8116",
+"-. c #CC9732",
+";. c #D58F2D",
+":. c #D28C38",
+">. c #D58D3B",
+",. c #DE8B33",
+"<. c #E59A0D",
+"1. c #FF8500",
+"2. c #F88B00",
+"3. c #FF8E00",
+"4. c #FF9900",
+"5. c #FF9A00",
+"6. c #F49717",
+"7. c #F89413",
+"8. c #FF931F",
+"9. c #F68527",
+"0. c #F19322",
+"q. c #F19A2A",
+"w. c #FCA600",
+"e. c #F3A118",
+"r. c #FFB10A",
+"t. c #FFB50E",
+"y. c #E8A136",
+"u. c #F3AE2E",
+"i. c #FFB420",
+"p. c #FFB82A",
+"a. c #FFBC2C",
+"s. c #F9BD37",
+"d. c #CAA34A",
+"f. c #D4B678",
+"g. c #EEAB5D",
+"h. c #F6A742",
+"j. c #FFC530",
+"k. c #FFC33D",
+"l. c #FEC73E",
+"z. c #FFC140",
+"x. c #FEC741",
+"c. c #F9CE4C",
+"v. c #F3C25C",
+"b. c #FFD245",
+"n. c #FFD352",
+"m. c #F0CD67",
+"M. c #FBD770",
+"N. c #FFDA70",
+"B. c #FFE578",
+"V. c #9B8F83",
+"C. c #9A9AA0",
+"Z. c #9AA0AA",
+"A. c #B4A694",
+"S. c #A4A5A9",
+"D. c #AAABAA",
+"F. c #B7B7B7",
+"G. c #B3B4BA",
+"H. c #BBBAB8",
+"J. c gray73",
+"K. c gray",
+"L. c #BCBEC9",
+"P. c #DBB295",
+"I. c #CBBED6",
+"U. c #F0CE91",
+"Y. c #F9DB83",
+"T. c #E9CDA2",
+"R. c #EDCDAC",
+"E. c #EAD0B0",
+"W. c #FEE58E",
+"Q. c #FDF1B8",
+"!. c #C5C5C4",
+"~. c #C4C5CC",
+"^. c #CACAC9",
+"/. c #CACACA",
+"(. c #CBCBCB",
+"). c #CDCDCC",
+"_. c #CDC1D8",
+"`. c #CCCAD7",
+"'. c #D0C9C9",
+"]. c #D2D2D2",
+"[. c LightGray",
+"{. c #D4D4DA",
+"}. c #DADADA",
+"|. c #DDDDDC",
+" X c #DDDDDD",
+".X c #DFDFDE",
+"XX c #DAD2E1",
+"oX c #DBD3E1",
+"OX c #DDD5E4",
+"+X c #EFE7CC",
+"@X c #F7EDD2",
+"#X c gray88",
+"$X c #E1E2E1",
+"%X c #E3E2E4",
+"&X c #E4E4E4",
+"*X c #E6E6E6",
+"=X c #E7E7E8",
+"-X c #E6E8EA",
+";X c #E7E9ED",
+":X c #E8E8E7",
+">X c #ECE9E5",
+",X c #EAEAEA",
+"<X c #EBEAEA",
+"1X c gray92",
+"2X c #E9EBEF",
+"3X c #ECECEC",
+"4X c gray93",
+"5X c #EEECEF",
+"6X c #EFEFEF",
+"7X c #EDEFF3",
+"8X c #EFF5F6",
+"9X c #F0F0EF",
+"0X c gray94",
+"qX c #F1F1F1",
+"wX c #F0F0F2",
+"eX c #F1F1F3",
+"rX c #F2F1F3",
+"tX c gray95",
+"yX c #F3F2F2",
+"uX c #F3F3F3",
+"iX c #F3F6F7",
+"pX c gray96",
+"aX c #F6F5F6",
+"sX c #F8F8F9",
+"dX c #F8F9F8",
+"fX c #F9FBF9",
+"gX c gray98",
+"hX c #FBFBFB",
+"jX c #F8F9FC",
+"kX c #F8FFFF",
+"lX c #F9FEFF",
+"zX c #FDFFFF",
+"xX c #FEFFFF",
+"cX c gray100",
+"vX c None",
+/* pixels */
+"vXvXvXvXaXW I R.R.T.U.T vXvXvXvX",
+"vXvXvXOX%XrX'.P. at XQ.W.v.J 2 vXvX",
+"vXvXvXXX&XdXxXrX>X+XY.n.u.G & vX",
+"vXvXyXrX9XpXxXxXjX`.f.s.t.6.H 7 ",
+"vXvX4XaX6XaXsXrX3XA.d.m.x.a.>.a ",
+"vXiX*XrXrX,X1X8X{.( -.c.r.5...h ",
+"vX=X1XfX6X,X6X6XV.K ] e.2.$.O.h ",
+"8X=XrX4X}.|.4X~._ *.;. at .6.0.L 8 ",
+"Z.H.J.F.K.|.;X&.^ *.h.B.l.a.:.d ",
+"b D.%X^.[.=XL.) ' ` y.b.w.3.X.h ",
+"# Y .X^.[.$XE ! { } | 2.#. at ./ t ",
+"vXg S.^.).G.n V [ <.h.9.8.q.K < ",
+"vXvXP F.!.R + + C =.N.B.j.i.,.s ",
+"vXvXf Q C.v $ @ . F g.k.5.1. .h ",
+"vXvXvXN U * : X . & B S A A D d ",
+"vXvXvXg c 9 : . vXvX& 5 5 5 = 0 "
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/icons/ktnef.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/icons/ktnef.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/icons/ktnef.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kmail[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #080707",
+".  c #0C0A0B",
+"X  c gray2",
+"o  c #110F0F",
+"O  c #131011",
+"+  c #181516",
+"@  c #1A1718",
+"#  c #1C191A",
+"$  c #1B1828",
+"%  c #181727",
+"&  c #121A3D",
+"*  c #211D1E",
+"=  c #231F20",
+"-  c #31241E",
+";  c #342926",
+":  c #3C2B24",
+">  c #141F51",
+",  c #20265F",
+"<  c #203055",
+"1  c #323B4C",
+"2  c #333C57",
+"3  c #2A2C62",
+"4  c #222B66",
+"5  c #2C3860",
+"6  c #354877",
+"7  c #4A3630",
+"8  c #6C3100",
+"9  c #7B3E00",
+"0  c #443F75",
+"q  c #7D400B",
+"w  c #604C3E",
+"e  c #56585C",
+"r  c #444B65",
+"t  c #5B5D74",
+"y  c #6D484D",
+"u  c #6E574A",
+"i  c #705147",
+"p  c #7E604A",
+"a  c #7A6255",
+"s  c gray39",
+"d  c #79797A",
+"f  c #404E83",
+"g  c #485185",
+"h  c #6C6D82",
+"j  c #747181",
+"k  c #76758B",
+"l  c #787587",
+"z  c #767881",
+"x  c #903200",
+"c  c #A73500",
+"v  c #8E4601",
+"b  c #9D450C",
+"n  c #9F4C10",
+"m  c #974A1A",
+"M  c #8D4826",
+"N  c #835E2A",
+"B  c #994C27",
+"V  c #9C6602",
+"C  c #996B18",
+"Z  c #A95601",
+"A  c #A25113",
+"S  c #B15900",
+"D  c #BE5F00",
+"F  c #B05502",
+"G  c #A3532C",
+"H  c #AC5731",
+"J  c #A26600",
+"K  c #A66800",
+"L  c #A76F0A",
+"P  c #AB6800",
+"I  c #A16E11",
+"U  c #AE7003",
+"Y  c #B26B00",
+"T  c #BB6D00",
+"R  c #BA7400",
+"E  c #AB7C38",
+"W  c #90745D",
+"Q  c #A36F57",
+"!  c #BE7D59",
+"~  c #AF7962",
+"^  c #B07C62",
+"/  c #CF4F00",
+"(  c #C56403",
+")  c #C17100",
+"_  c #CF7100",
+"`  c #CA7B01",
+"'  c #C27903",
+"]  c #D16E01",
+"[  c #DE7807",
+"{  c #DB7913",
+"}  c #C66622",
+"|  c #C0643D",
+" . c #DB743E",
+".. c #E56A00",
+"X. c #E96100",
+"o. c #EC6F00",
+"O. c #E37A00",
+"+. c #EA7400",
+"@. c #E87800",
+"#. c #E47719",
+"$. c #F46800",
+"%. c #FB6900",
+"&. c #F47300",
+"*. c #F37C00",
+"=. c #FF7600",
+"-. c #FD7B00",
+";. c #F9780F",
+":. c #E37621",
+">. c #E1773E",
+",. c #C56840",
+"<. c #C26F48",
+"1. c #C37556",
+"2. c #E17C42",
+"3. c #BC8011",
+"4. c #B58329",
+"5. c #BF9537",
+"6. c #B48A56",
+"7. c #AB927B",
+"8. c #BA8765",
+"9. c #CC890C",
+"0. c #C48511",
+"q. c #DC8F07",
+"w. c #DE9205",
+"e. c #C0953A",
+"r. c #D6952A",
+"t. c #D19839",
+"y. c #D9A638",
+"u. c #E58615",
+"i. c #F28800",
+"p. c #FD8400",
+"a. c #FE8E00",
+"s. c #FF8F0F",
+"d. c #FF840F",
+"f. c #FE8A10",
+"g. c #FD9300",
+"h. c #FC940E",
+"j. c #FD9B00",
+"k. c #F39200",
+"l. c #E08530",
+"z. c #E18838",
+"x. c #E0833C",
+"c. c #E39221",
+"v. c #E89B33",
+"b. c #F38823",
+"n. c #F2993F",
+"m. c #EBA118",
+"M. c #FEA300",
+"N. c #FEAA00",
+"B. c #FDAE0A",
+"V. c #FEA40E",
+"C. c #F2A519",
+"Z. c #FEB30A",
+"A. c #FDB211",
+"S. c #FEB815",
+"D. c #FFBD19",
+"F. c #E3A439",
+"G. c #F5AF22",
+"H. c #FBAD32",
+"J. c #FAB22D",
+"K. c #FDBB22",
+"L. c #FEB53B",
+"P. c #FEBC35",
+"I. c #FBBC3C",
+"U. c #F7B234",
+"Y. c #DE804A",
+"T. c #DD9552",
+"R. c #C08E6A",
+"E. c #D89761",
+"W. c #D1A748",
+"Q. c #E28042",
+"!. c #E48844",
+"~. c #E7A855",
+"^. c #EBB749",
+"/. c #F6AF40",
+"(. c #FDBD4A",
+"). c #F5B74A",
+"_. c #EAA546",
+"`. c #E5AE67",
+"'. c #E5B273",
+"]. c #EEB773",
+"[. c #D1AE6D",
+"{. c #FEC52E",
+"}. c #F7C338",
+"|. c #FEC53B",
+" X c #FDC93C",
+".X c #DBC37B",
+"XX c #FFC44F",
+"oX c #FECF41",
+"OX c #F9C64A",
+"+X c #FFCA54",
+"@X c #FDCC5B",
+"#X c #FFC554",
+"$X c #F9D15C",
+"%X c #E9C868",
+"&X c #E3CB78",
+"*X c #FEC965",
+"=X c #F4D069",
+"-X c #FED466",
+";X c #FED968",
+":X c #FCDA74",
+">X c #FDDC7C",
+",X c #FED277",
+"<X c #FFE17B",
+"1X c #878787",
+"2X c #948F98",
+"3X c #939393",
+"4X c #9C9C9C",
+"5X c #9A95A0",
+"6X c #9AA2B9",
+"7X c gray64",
+"8X c #AAAAAA",
+"9X c #ADA0BA",
+"0X c #B4B4B4",
+"qX c #BABABA",
+"wX c #D8A680",
+"eX c #CCBFD7",
+"rX c #DFC5BD",
+"tX c #F3D980",
+"yX c #EDDEAE",
+"uX c #FFE484",
+"iX c #FEE789",
+"pX c #FCE590",
+"aX c #FEE994",
+"sX c #FEEBA1",
+"dX c #F4E8B7",
+"fX c #FFF0A3",
+"gX c #FEF6BA",
+"hX c #C4C4C4",
+"jX c #CCCCCC",
+"kX c #D3CCD8",
+"lX c #D4D4D4",
+"zX c #D7D7D9",
+"xX c #DBDBDB",
+"cX c #DEDBE3",
+"vX c #DFD6E2",
+"bX c #E1CBC5",
+"nX c #E4D9D3",
+"mX c #E0DCE3",
+"MX c #F9EBC7",
+"NX c #F3EED5",
+"BX c #F7F2D7",
+"VX c #FDFDD4",
+"CX c #F9F0D8",
+"ZX c #E3E3E3",
+"AX c #E8E2E9",
+"SX c #EAEAEA",
+"DX c #E6E2E8",
+"FX c #EEEBF2",
+"GX c #ECF0F6",
+"HX c #F9F0E4",
+"JX c #FFFFEA",
+"KX c #F3F3F3",
+"LX c #F6FEFE",
+"PX c #FCFAF3",
+"IX c #FEFEFE",
+"UX c #F2F7FA",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXIXYXYXYXPXPXHXHXHXCXMXMXdX= = YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXIXFXAXKX= wXT.'.'.`.`.~.~.~.R.= = = YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXAXjXmXzXZXbX2.PXIXJXVXgXfX<XF.8.= = = YXYXYXYX",
+"YXYXYXYXYXYXYXYXIXxXlXIXPXmXcXrXdXBXVXgXsXtX>X$Xv.8.= = = YXYXYX",
+"YXYXYXYXYXYXYXeXkXSXxXIXIXIXPXZXlXnXNXdXpXtX;X+X Xc.~ = = = YXYX",
+"YXYXYXYXYXYXYXFXZXLXzXIXIXIXIXIXIXUXmXvXyX=X at XOX{.S.u.~ = = = YX",
+"YXYXYXYXYXYXIXmXIXPXzXIXIXIXIXIXIXIXIXjX9X%X).I.K.B.N.#.^ = = = ",
+"YXYXYXYXYXYXSXSXIXLXzXIXIXIXIXIXIXKXxXhX7..X^.G.B.M.j.g.#.~ = = ",
+"YXYXYXYXYXIXDXUXIXPXzXIXIXIXIXPXZXxXZX4X5.W..XtX:X-X at X#X(.E.= = ",
+"YXYXYXYXIXGXSXZXPXUXzXPXIXKXSXxXSXKXlXW 5.t.&X$X}.D.A.V.h.!.= = ",
+"YXYXYXYXIXmXKXZXIXLXnXUXZXZXSXKXKXSX3Xq 4.y.%X}.S.N.j.g.p.2.= = ",
+"YXYXYXLXmXSXDXFXIXUXcXSXGXKXKXSXKXqXa 8 v r.=XK.N.M.g.p.-.2.= = ",
+"YXYXYXUXzXSXmXIXPXUXnXPXKXSXSXSXZXl C N 9 Z ^.B.j.k.p.=.%.2.= = ",
+"YXYXLXcXZXLXUXPXPXUXzXSXSXSXAXSXqXu I 4.E Z _ @. at .@.o.#.!.1.= = ",
+"YXYXGXSXPXPXPXUXFXSXjXmXZXZXSXZXh C I 3.y.T._ O.i.g.j.#.6.= = = ",
+"YXLXzXlXZXZXzXjXjXhXqXZXZXZXAX0Xu V L 0.m.(.~._.L.L.L.H.v.[.= = ",
+"YX6X7X7X4X4X4X8X8X0XhXxXZXAXxXl V V U 9.C.J.iXiX;X+X|.P.H.~.= = ",
+"YX6 s qXlXjXlXjXqXlXzXxXZXZX0Xy V K U S C.I.>X XS.N.M.g.-.2.= = ",
+"YX= 1 3XzXxXxXzXqXxXZXxXZXxXk m J U R x ( I.<X{.Z.N.j.a.-.2.= = ",
+"YXYX+ e hXxXzXlXqXxXxXxXxX8Xr m P Y R A c { ).C.k.i. at .=.$.2.= = ",
+"YXYX= 2 3XxXzXlX0XlXxXxXjXk 7 b Y T ` r.} / ..+.&.&.o.x.! Q = = ",
+"YXYX= # e qXzXlX8XlXlXlX8X3 : M F ) _ w.).:.X.%.-.p.*.z.u = = = ",
+"YXYXYX= > 7.jXjX8XjXlXhXh $ O ; B D ` q.J.*Xb.;.d.f.f.h.l.w = = ",
+"YXYXYX= @ r 8XhX8XhXjX4X3 O o . - B ( q.U.*XsXpX>X;X at X+X(.].= = ",
+"YXYXYXYX= > d hX7XqXqXh O O o .   7 H @.(.,XaXoXD.B.M.g.p.Q.= = ",
+"YXYXYXYX= # 2 2X7XqX2X, O o .   X   : | u.>XpX{.A.N.j.a.p.Q.= = ",
+"YXYXYXYXYX$ & z 3X8Xt % o O o     o * i | _.uXD.N.M.g.p.=.2.= = ",
+"YXYXYXYXYXYX# 4 1Xd 4 + + + + # YX= = = ; <.c c c c c c c 2.= = ",
+"YXYXYXYXYXYX= + r h $ # * = = = YXYX= = = = = = = = = = = = = = ",
+"YXYXYXYXYXYXYX= f g * = = = = YXYXYXYX= = = = = = = = = = = = = ",
+"YXYXYXYXYXYXYX= = = = = = = = YXYXYXYXYX= = = = = = = = = = = = "
+};

Added: people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,41 @@
+/usr/bin/kabc2mutt
+/usr/bin/kaddressbook
+/usr/lib/kde3/kcm_kabconfig.la
+/usr/lib/kde3/kcm_kabconfig.so
+/usr/lib/kde3/kcm_kabcustomfields.la
+/usr/lib/kde3/kcm_kabcustomfields.so
+/usr/lib/kde3/kcm_kabldapconfig.la
+/usr/lib/kde3/kcm_kabldapconfig.so
+/usr/lib/kde3/ldifvcardthumbnail.la
+/usr/lib/kde3/ldifvcardthumbnail.so
+/usr/lib/kde3/libkaddrbk_*.la
+/usr/lib/kde3/libkaddrbk_*.so
+/usr/lib/kde3/libkaddressbookpart.la
+/usr/lib/kde3/libkaddressbookpart.so
+/usr/lib/libkabinterfaces.so.1
+/usr/lib/libkabinterfaces.so.1.0.0
+/usr/lib/libkaddressbook.so.0
+/usr/lib/libkaddressbook.so.0.0.0
+/usr/share/applications/kde/kaddressbook.desktop
+/usr/share/apps/kaddressbook
+/usr/share/doc/kde/HTML/en/kaddressbook
+/usr/share/icons/hicolor/128x128/apps/kaddressbook.png
+/usr/share/icons/hicolor/16x16/apps/kaddressbook.png
+/usr/share/icons/hicolor/32x32/apps/kaddressbook.png
+/usr/share/icons/hicolor/48x48/apps/kaddressbook.png
+/usr/share/icons/hicolor/64x64/apps/kaddressbook.png
+/usr/share/services/kabconfig.desktop
+/usr/share/services/kabcustomfields.desktop
+/usr/share/services/kabldapconfig.desktop
+/usr/share/services/kaddressbook
+/usr/share/services/kresources/kabc/imap.desktop
+/usr/share/services/ldifvcardthumbnail.desktop
+/usr/share/services/kontact/kaddressbookplugin.desktop
+/usr/share/servicetypes/dcopaddressbook.desktop
+/usr/share/servicetypes/kaddressbook_contacteditorwidget.desktop
+/usr/share/servicetypes/kaddressbookimprotocol.desktop
+/usr/share/servicetypes/kaddressbook_extension.desktop
+/usr/share/servicetypes/kaddressbook_view.desktop
+/usr/share/servicetypes/kaddressbook_xxport.desktop
+../icons/kaddressbook.xpm /usr/share/pixmaps
+../icons/kaddressbook-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kaddressbook /usr/share/doc/kaddressbook/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kaddressbook.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kaddressbook):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KAddressbook"\
+	icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
+	icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+	command="/usr/bin/kaddressbook"

Added: people/jriddell/KDE/3.5/kdepim/debian/kalarm.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kalarm.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kalarm.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+/usr/bin/kalarm
+/usr/bin/kalarmd
+/usr/share/applications/kde/kalarm.desktop
+/usr/share/applnk/.hidden/kalarmd.desktop
+/usr/share/applnk/Applications/kalarm.desktop
+/usr/share/apps/kalarm
+/usr/share/autostart/kalarm.tray.desktop
+/usr/share/autostart/kalarmd.autostart.desktop
+/usr/share/doc/kde/HTML/en/kalarm
+/usr/share/icons/crystalsvg/16x16/actions/kalarm.png
+/usr/share/icons/crystalsvg/22x22/actions/kalarm.png
+/usr/share/icons/hicolor/16x16/apps/kalarm.png
+/usr/share/icons/hicolor/32x32/apps/kalarm.png
+/usr/share/icons/hicolor/48x48/apps/kalarm.png
+../icons/kalarm.xpm /usr/share/pixmaps
+../icons/kalarm-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/kalarm.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kalarm.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kalarm.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kalarm /usr/share/doc/kalarm/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kalarm.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kalarm.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kalarm.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kalarm):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KAlarm"\
+	icon32x32="/usr/share/pixmaps/kalarm.xpm"\
+	icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+	command="/usr/bin/kalarm"

Added: people/jriddell/KDE/3.5/kdepim/debian/kandy.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kandy.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kandy.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+/usr/bin/kandy
+/usr/bin/kandy_client
+/usr/share/applications/kde/kandy.desktop
+/usr/share/applnk/Utilities/kandy.desktop
+/usr/share/apps/kandy
+/usr/share/config.kcfg/kandy.kcfg
+/usr/share/doc/kde/HTML/en/kandy

Added: people/jriddell/KDE/3.5/kdepim/debian/kandy.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kandy.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kandy.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kandy /usr/share/doc/kandy/html

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

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

Added: people/jriddell/KDE/3.5/kdepim/debian/karm.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/karm.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/karm.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,19 @@
+/usr/bin/karm
+/usr/share/applications/kde/karm.desktop
+/usr/share/applnk/Utilities/karm.desktop
+/usr/share/apps/karm
+/usr/share/doc/kde/HTML/en/karm
+/usr/share/icons/hicolor/128x128/apps/karm.png
+/usr/share/icons/hicolor/16x16/apps/karm.png
+/usr/share/icons/hicolor/22x22/apps/karm.png
+/usr/share/icons/hicolor/32x32/apps/karm.png
+/usr/share/icons/hicolor/48x48/apps/karm.png
+/usr/share/icons/hicolor/64x64/apps/karm.png
+/usr/share/apps/karmpart/karmui.rc
+/usr/share/services/karm_part.desktop
+/usr/share/services/kontact/karmplugin.desktop
+/usr/lib/kde3/libkarmpart.so
+/usr/lib/kde3/libkarmpart.la
+
+../icons/karm.xpm /usr/share/pixmaps
+../icons/karm-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/karm.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/karm.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/karm.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/karm /usr/share/doc/karm/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/karm.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/karm.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/karm.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(karm):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KArm"\
+	icon32x32="/usr/share/pixmaps/karm.xpm"\
+	icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+	command="/usr/bin/karm"

Added: people/jriddell/KDE/3.5/kdepim/debian/kdepim-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kdepim-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,91 @@
+/usr/include/kde/KNotesAppIface.h
+/usr/include/kde/KNotesIface.h
+/usr/include/kde/kabc
+/usr/include/kde/calendar
+/usr/include/kde/kaddressbook
+/usr/include/kde/kitchensync
+/usr/include/kde/kmail
+/usr/include/kde/kmailIface.h
+/usr/include/kde/kmailicalIface.h
+/usr/include/kde/kmailpartIface.h
+/usr/include/kde/kontact
+/usr/include/kde/korganizer
+/usr/include/kde/kpilot
+/usr/include/kde/libemailfunctions/idmapper.h
+/usr/lib/libkabckolab.la
+/usr/lib/libkabckolab.so
+/usr/lib/libkabc_groupdav.la
+/usr/lib/libkabc_groupdav.so
+/usr/lib/libkabc_groupwise.la
+/usr/lib/libkabc_groupwise.so
+/usr/lib/libkabc_newexchange.la
+/usr/lib/libkabc_newexchange.so
+/usr/lib/libkabc_slox.la
+/usr/lib/libkabc_slox.so
+/usr/lib/libkabc_xmlrpc.la
+/usr/lib/libkabc_xmlrpc.so
+/usr/lib/libkabinterfaces.la
+/usr/lib/libkabinterfaces.so
+/usr/lib/libkaddressbook.la
+/usr/lib/libkaddressbook.so
+/usr/lib/libkcalkolab.la
+/usr/lib/libkcalkolab.so
+/usr/lib/libkcal_blogging.la
+/usr/lib/libkcal_blogging.so
+/usr/lib/libkcal_groupdav.la
+/usr/lib/libkcal_groupdav.so
+/usr/lib/libkcal_groupwise.la
+/usr/lib/libkcal_groupwise.so
+/usr/lib/libkcal_newexchange.la
+/usr/lib/libkcal_newexchange.so
+/usr/lib/libkcal_resourcefeatureplan.la
+/usr/lib/libkcal_resourcefeatureplan.so
+/usr/lib/libkcal_slox.la
+/usr/lib/libkcal_slox.so
+/usr/lib/libkcal_xmlrpc.la
+/usr/lib/libkcal_xmlrpc.so
+/usr/lib/libkgroupwarebase.la
+/usr/lib/libkgroupwarebase.so
+/usr/lib/libkgroupwaredav.la
+/usr/lib/libkgroupwaredav.so
+/usr/lib/libkitchensyncui.la
+/usr/lib/libkitchensyncui.so
+/usr/lib/libkmime.la
+/usr/lib/libkmime.so
+/usr/lib/libknoteskolab.la
+/usr/lib/libknoteskolab.so
+/usr/lib/libknotes_xmlrpc.la
+/usr/lib/libknotes_xmlrpc.so
+/usr/lib/libkocorehelper.la
+/usr/lib/libkocorehelper.so
+/usr/lib/libkonnector.la
+/usr/lib/libkonnector.so
+/usr/lib/libkontact.la
+/usr/lib/libkontact.so
+/usr/lib/libkorganizer.la
+/usr/lib/libkorganizer.so
+/usr/lib/libkorganizer_calendar.la
+/usr/lib/libkorganizer_calendar.so
+/usr/lib/libkorganizer_eventviewer.la
+/usr/lib/libkorganizer_eventviewer.so
+/usr/lib/libkorg_stdprinting.la
+/usr/lib/libkorg_stdprinting.so
+/usr/lib/libkpilot.la
+/usr/lib/libkpilot.so
+/usr/lib/libkpimidentities.la
+/usr/lib/libkpimidentities.so
+/usr/lib/libkpinterfaces.la
+/usr/lib/libkpinterfaces.so
+/usr/lib/libkslox.la
+/usr/lib/libkslox.so
+/usr/lib/libksync.la
+/usr/lib/libksync.so
+/usr/lib/libksync2.la
+/usr/lib/libksync2.so
+/usr/lib/libmultisynk.la
+/usr/lib/libmultisynk.so
+/usr/include/kde/akregator/storage.h
+/usr/include/kde/akregator/feedstorage.h
+/usr/include/kde/akregator/storagefactory.h
+/usr/include/kde/akregator/storagefactoryregistry.h
+/usr/include/kde/akregator/plugin.h

Added: 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.kaddressbook	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kaddressbook
+Title: The KAddressBook Handbook
+Author: Tobias Koenig, Steffen Hansen, Don Sanders
+Abstract: KAddressBook is the KDE address book.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kaddressbook/index.html
+Files: /usr/share/doc/kde/HTML/en/kaddressbook/*.html

Added: 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.kalarm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kalarm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdepim-doc-html-kalarm
+Title: The KAlarm Handbook
+Author: David Jarvie
+Abstract: KAlarm is a personal alarm message, command and email
+ scheduler for KDE.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kalarm/index.html
+Files: /usr/share/doc/kde/HTML/en/kalarm/*.html

Added: 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.kandy	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kandy	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdepim-doc-html-kandy
+Title: The Kandy Handbook
+Author: Cornelius Schumacher
+Abstract: Kandy is an application for synchronizing the data on a mobile
+ phone with the data on the desktop.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kandy/index.html
+Files: /usr/share/doc/kde/HTML/en/kandy/*.html

Added: 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.karm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.karm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-karm
+Title: The KArm Handbook
+Author: Jonathan Singer, Mark Bucciarelli, Sirtaj Singh Kang
+Abstract: KArm tracks time spent on various tasks.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/karm/index.html
+Files: /usr/share/doc/kde/HTML/en/karm/*.html

Added: 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.kleopatra	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kleopatra	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kleopatra
+Title: The Kleopatra Handbook
+Author: Marc Mutz
+Abstract: Kleopatra is a tool for managing X.509 certificates.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kleopatra/index.html
+Files: /usr/share/doc/kde/HTML/en/kleopatra/*.html

Added: 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.kmail	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kmail	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kmail
+Title: The KMail Handbook
+Author: Daniel Naber, David Rugge
+Abstract: KMail is KDE's powerful and user friendly email client.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmail/index.html
+Files: /usr/share/doc/kde/HTML/en/kmail/*.html

Added: 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.knode	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.knode	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-knode
+Title: The KNode manual
+Author: Stephan Johach, Thomas SchÃ»tz
+Abstract: KNode is an easy-to-use newsreader.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/knode/index.html
+Files: /usr/share/doc/kde/HTML/en/knode/*.html

Added: 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.knotes	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.knotes	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-knotes
+Title: The KNotes Handbook
+Author: Fabian Dal Santo, Grep M. Holmes
+Abstract: KNotes is a sticky notes application for the desktop.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/knotes/index.html
+Files: /usr/share/doc/kde/HTML/en/knotes/*.html

Added: 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.konsolekalendar	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-konsolekalendar
+Title: The KonsoleKalendar Handbook
+Author: Tuukka Pasanen, Allen Winter
+Abstract: KonsoleKalendar is a command line interface to KDE calendars.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/konsolekalendar/index.html
+Files: /usr/share/doc/kde/HTML/en/konsolekalendar/*.html

Added: 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.kontact	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kontact	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kontact
+Title: The Kontact Handbook
+Author: Cornelius Schumacher
+Abstract: Kontact is a command line interface to KDE calendars.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kontact/index.html
+Files: /usr/share/doc/kde/HTML/en/kontact/*.html

Added: 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.korganizer	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.korganizer	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-korganizer
+Title: The KOrganizer Handbook
+Author: Milos Prudek, Paul E. Ahlquist Jr., JÃ¼rgen Nagel
+Abstract: KOrganizer is an easy to use personal information manager.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/korganizer/index.html
+Files: /usr/share/doc/kde/HTML/en/korganizer/*.html

Added: 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.korn	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.korn	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-korn
+Title: The KOrn Handbook
+Author: Nick Betcher
+Abstract: KOrn is a mail monitor.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/korn/index.html
+Files: /usr/share/doc/kde/HTML/en/korn/*.html

Added: 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.kpilot	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kpilot	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdepim-doc-html-kpilot
+Title: The KPilot Handbook
+Author: Carlos Leonhard Woelz, Adriaan de Groot, Dan Pilone
+Abstract: KPilot is the KDE version of the Desktop HotSync software for
+ Palm Pilot handhelds.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpilot/index.html
+Files: /usr/share/doc/kde/HTML/en/kpilot/*.html

Added: 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.ktnef	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.ktnef	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-ktnef
+Title: The TNEF File Viewer Handbook
+Author: Michael Goffioul
+Abstract: The TNEF File Viewer is an application for TNEF mail attachments.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ktnef/index.html
+Files: /usr/share/doc/kde/HTML/en/ktnef/*.html

Added: 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.kwatchgnupg	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-kwatchgnupg
+Title: The KWatchGnuPG Handbook
+Author: Marc Mutz
+Abstract: KWatchGnuPG is a simple GnuPG log viewer.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kwatchgnupg/index.html
+Files: /usr/share/doc/kde/HTML/en/kwatchgnupg/*.html

Added: people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.multisynk
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.multisynk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc-html.doc-base.multisynk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-multisynk
+Title: The MultiSynk Handbook
+Author: Tobias Koenig
+Abstract: KDE synchronization application.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/multisynk/index.html
+Files: /usr/share/doc/kde/HTML/en/multisynk/*.html

Added: people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc.doc-base
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc.doc-base	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc.doc-base	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdepim-doc
+Title: KDE PIM Library API Documentation
+Author: The KDE Developers
+Abstract: This is the developers' API documentation for kdepim.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kdepim-apidocs/index.html
+Files: /usr/share/doc/kde/HTML/en/kdepim-apidocs/*.html

Added: people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-doc.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+/usr/share/doc/kde/HTML/en/kdepim-apidocs/*
+/usr/share/doc/kde/HTML/en/kdepim-rc1-apidocs/*

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kdepim-kio-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kdepim-kio-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-kio-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+/usr/lib/kde3/kio_groupwise.la
+/usr/lib/kde3/kio_groupwise.so
+/usr/lib/kde3/kio_imap4.la
+/usr/lib/kde3/kio_imap4.so
+/usr/lib/kde3/kio_mbox.la
+/usr/lib/kde3/kio_mbox.so
+/usr/lib/kde3/kio_sieve.la
+/usr/lib/kde3/kio_sieve.so
+/usr/share/services/groupwise.protocol
+/usr/share/services/groupwises.protocol
+/usr/share/services/imap4.protocol
+/usr/share/services/imaps.protocol
+/usr/share/services/mbox.protocol
+/usr/share/services/overview.desktop
+/usr/share/services/sieve.protocol

Added: people/jriddell/KDE/3.5/kdepim/debian/kdepim-kresources.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kdepim-kresources.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-kresources.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,81 @@
+/usr/lib/kde3/kabc_*.la
+/usr/lib/kde3/kabc_*.so
+/usr/lib/kde3/kcal_blogging.la
+/usr/lib/kde3/kcal_blogging.so
+/usr/lib/kde3/kcal_groupdav.la
+/usr/lib/kde3/kcal_groupdav.so
+/usr/lib/kde3/kcal_groupwise.la
+/usr/lib/kde3/kcal_groupwise.so
+/usr/lib/kde3/kcal_kolab.la
+/usr/lib/kde3/kcal_kolab.so
+/usr/lib/kde3/kcal_newexchange.la
+/usr/lib/kde3/kcal_newexchange.so
+/usr/lib/kde3/kcal_resourcefeatureplan.la
+/usr/lib/kde3/kcal_resourcefeatureplan.so
+/usr/lib/kde3/kcal_slox.la
+/usr/lib/kde3/kcal_slox.so
+/usr/lib/kde3/kcal_xmlrpc.la
+/usr/lib/kde3/kcal_xmlrpc.so
+/usr/lib/kde3/knotes_kolab.la
+/usr/lib/kde3/knotes_kolab.so
+/usr/lib/kde3/knotes_xmlrpc.la
+/usr/lib/kde3/knotes_xmlrpc.so
+/usr/lib/libkabckolab.so.0
+/usr/lib/libkabckolab.so.0.0.0
+/usr/lib/libkabc_groupdav.so.1
+/usr/lib/libkabc_groupdav.so.1.0.0
+/usr/lib/libkabc_groupwise.so.1
+/usr/lib/libkabc_groupwise.so.1.0.0
+/usr/lib/libkabc_newexchange.so.1
+/usr/lib/libkabc_newexchange.so.1.0.0
+/usr/lib/libkabc_slox.so.0
+/usr/lib/libkabc_slox.so.0.0.0
+/usr/lib/libkabc_xmlrpc.so.1
+/usr/lib/libkabc_xmlrpc.so.1.0.0
+/usr/lib/libkcalkolab.so.0
+/usr/lib/libkcalkolab.so.0.0.0
+/usr/lib/libkcal_blogging.so.1
+/usr/lib/libkcal_blogging.so.1.0.0
+/usr/lib/libkcal_groupdav.so.1
+/usr/lib/libkcal_groupdav.so.1.0.0
+/usr/lib/libkcal_groupwise.so.1
+/usr/lib/libkcal_groupwise.so.1.0.0
+/usr/lib/libkcal_newexchange.so.1
+/usr/lib/libkcal_newexchange.so.1.0.0
+/usr/lib/libkcal_resourcefeatureplan.so.1
+/usr/lib/libkcal_resourcefeatureplan.so.1.0.0
+/usr/lib/libkcal_slox.so.0
+/usr/lib/libkcal_slox.so.0.0.0
+/usr/lib/libkcal_xmlrpc.so.1
+/usr/lib/libkcal_xmlrpc.so.1.0.0
+/usr/lib/libkgroupwarebase.so.0
+/usr/lib/libkgroupwarebase.so.0.0.0
+/usr/lib/libkgroupwaredav.so.0
+/usr/lib/libkgroupwaredav.so.0.0.0
+/usr/lib/libknoteskolab.so.0
+/usr/lib/libknoteskolab.so.0.0.0
+/usr/lib/libknotes_xmlrpc.so.1
+/usr/lib/libknotes_xmlrpc.so.1.0.0
+/usr/lib/libkslox.so.0
+/usr/lib/libkslox.so.0.0.0
+/usr/share/services/kresources/kabc/kabc_groupdav.desktop
+/usr/share/services/kresources/kabc/kabc_groupwise.desktop
+/usr/share/services/kresources/kabc/kabc_newexchange.desktop
+/usr/share/services/kresources/kabc/kabc_opengroupware.desktop
+/usr/share/services/kresources/kabc/kabc_slox.desktop
+/usr/share/services/kresources/kabc/kabc_xmlrpc.desktop
+/usr/share/services/kresources/kabc/kolab.desktop
+/usr/share/services/kresources/kcal/blogging.desktop
+/usr/share/services/kresources/kcal/exchange.desktop
+/usr/share/services/kresources/kcal/kcal_groupdav.desktop
+/usr/share/services/kresources/kcal/kcal_groupwise.desktop
+/usr/share/services/kresources/kcal/kcal_newexchange.desktop
+/usr/share/services/kresources/kcal/kcal_opengroupware.desktop
+/usr/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop
+/usr/share/services/kresources/kcal/kcal_slox.desktop
+/usr/share/services/kresources/kcal/kcal_xmlrpc.desktop
+/usr/share/services/kresources/kcal/kolab.desktop
+/usr/share/services/kresources/knotes/knotes_xmlrpc.desktop
+/usr/share/services/kresources/knotes/kolabresource.desktop
+/usr/share/services/kresources/kcal/kcal_ox.desktop
+/usr/share/services/kresources/kabc/kabc_ox.desktop

Added: people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+/usr/bin/egroupwarewizard
+/usr/bin/exchangewizard
+/usr/bin/groupwarewizard
+/usr/bin/groupwisewizard
+/usr/bin/kolabwizard
+/usr/bin/sloxwizard
+/usr/share/applications/kde/groupwarewizard.desktop
+/usr/lib/kde3/libegroupwarewizard.la
+/usr/lib/kde3/libegroupwarewizard.so
+/usr/lib/kde3/libexchangewizard.la
+/usr/lib/kde3/libexchangewizard.so
+/usr/lib/kde3/libgroupwisewizard.la
+/usr/lib/kde3/libgroupwisewizard.so
+/usr/lib/kde3/libkolabwizard.la
+/usr/lib/kde3/libkolabwizard.so
+/usr/lib/kde3/libsloxwizard.la
+/usr/lib/kde3/libsloxwizard.so
+/usr/share/config.kcfg/egroupware.kcfg
+/usr/share/config.kcfg/groupwise.kcfg
+/usr/share/config.kcfg/kolab.kcfg
+/usr/share/config.kcfg/slox.kcfg

Added: people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+debian/man/out/egroupwarewizard.1
+debian/man/out/exchangewizard.1
+debian/man/out/groupwarewizard.1
+debian/man/out/groupwisewizard.1
+debian/man/out/kolabwizard.1
+debian/man/out/sloxwizard.1

Added: people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kdepim-wizards.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,41 @@
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="EGroupware Setup Wizard"\
+	command="/usr/bin/egroupwarewizard"
+
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="MS Exchange Setup Wizard"\
+	command="/usr/bin/exchangewizard"
+
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KDE Groupware Wizard"\
+	command="/usr/bin/groupwarewizard"
+
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="Novell GroupWise Setup Wizard"\
+	command="/usr/bin/groupwisewizard"
+
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KOLab Setup Wizard"\
+	command="/usr/bin/kolabwizard"
+
+?package(kdepim-wizards):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="Openexchange Setup Wizard"\
+	command="/usr/bin/sloxwizard"

Added: people/jriddell/KDE/3.5/kdepim/debian/kitchensync.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kitchensync.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kitchensync.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,59 @@
+/usr/bin/kitchensync
+/usr/bin/multisynk
+/usr/lib/kde3/libkitchensyncpart.la
+/usr/lib/kde3/libkitchensyncpart.so
+/usr/lib/kde3/libksync_backup.la
+/usr/lib/kde3/libksync_backup.so
+/usr/lib/kde3/libksync_debugger.la
+/usr/lib/kde3/libksync_debugger.so
+/usr/lib/kde3/libksync_restore.la
+/usr/lib/kde3/libksync_restore.so
+/usr/lib/kde3/libksync_pluckerpart.la
+/usr/lib/kde3/libksync_pluckerpart.so
+/usr/lib/kde3/libksync_syncerpart.la
+/usr/lib/kde3/libksync_syncerpart.so
+/usr/lib/kde3/libksync_viewer.la
+/usr/lib/kde3/libksync_viewer.so
+/usr/lib/kde3/libmultisynkpart.la
+/usr/lib/kde3/libmultisynkpart.so
+/usr/lib/kde3/liboverviewpart.la
+/usr/lib/kde3/liboverviewpart.so
+/usr/lib/libkabckonnector.la
+/usr/lib/libkabckonnector.so
+/usr/lib/libkcalkonnector.la
+/usr/lib/libkcalkonnector.so
+/usr/lib/libkitchensyncui.so.0
+/usr/lib/libkitchensyncui.so.0.0.0
+/usr/lib/libkonnector.so.0
+/usr/lib/libkonnector.so.0.0.0
+/usr/lib/libksync2.so.0
+/usr/lib/libksync2.so.0.0.0
+/usr/lib/liblocalkonnector.la
+/usr/lib/liblocalkonnector.so
+/usr/lib/libmultisynk.so.0
+/usr/lib/libmultisynk.so.0.0.0
+/usr/lib/libqtopiakonnector.la
+/usr/lib/libqtopiakonnector.so
+/usr/lib/libremotekonnector.la
+/usr/lib/libremotekonnector.so
+/usr/share/applications/kde/multisynk.desktop
+/usr/share/apps/kitchensync
+/usr/share/apps/konqueror/servicemenus/kitchensync-pluck.desktop
+/usr/share/apps/konqueror/servicemenus/kitchensync-pluck-rdf.desktop
+/usr/share/apps/multisynk
+/usr/share/doc/kde/HTML/en/multisynk
+/usr/share/icons/hicolor/16x16/apps/multisynk.png
+/usr/share/icons/hicolor/22x22/apps/multisynk.png
+/usr/share/icons/hicolor/32x32/apps/multisynk.png
+/usr/share/icons/hicolor/48x48/apps/multisynk.png
+/usr/share/services/kitchensync
+/usr/share/services/kontact/multisynk.desktop
+/usr/share/services/kresources/konnector
+/usr/share/services/kresources/konnector_manager.desktop
+/usr/share/servicetypes/filter.desktop
+/usr/share/servicetypes/kitchensync.desktop
+/usr/share/servicetypes/konnector.desktop
+/usr/lib/kde3/libksfilter_addressbook.so
+/usr/lib/kde3/libksfilter_addressbook.la
+/usr/lib/kde3/libksfilter_calendar.so
+/usr/lib/kde3/libksfilter_calendar.la

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kitchensync.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kitchensync.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kitchensync.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+?package(kitchensync):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KitchenSync"\
+	command="/usr/bin/kitchensync"
+
+?package(kitchensync):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="MultiSynk"\
+	command="/usr/bin/multisynk"

Added: people/jriddell/KDE/3.5/kdepim/debian/kleopatra.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kleopatra.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kleopatra.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,48 @@
+The following instructions for installing kleopatra were gotten from
+a message to the debian-qt-kde mailing list by Adeodato Simo.
+
+--
+
+these are, briefly, the steps I have followed to get some S/MIME
+support in KMail 3.3.
+
+  Wipe out all not needed packages:
+  # aptitude purge newpg gpgsm cryptplug cryptplug-dev libgpgme6 libgpgme-dev libksba0
+
+  Use packages provided by Matthias Urlichs <smurf at debian.org>:
+  # echo "deb http://smurf.noris.de/code/debian/ experimental smurf" \
+      >>/etc/apt/sources.list 
+
+  Install required packages
+  # apt-get update && apt-get install gnupg2 gnupg-agent dirmngr
+
+    NOTE 1: gnupg2 will *NOT* substitute your gpg command, it will
+    just provide /usr/bin/gpg2, which you needn't use, and some other
+    commands that the programs will use internally.
+
+    NOTE 2: the gnupg-agent package from smurf does NOT provide
+    /etc/X11/Xsession.d/90*gpg-agent.
+
+    NOTE 3: gnupg2 1.9.10+cvs-1 contains /usr/share/locale/locale.alias,
+    which is also in the locales package. you'll need dpkg
+    --force-overwrite.
+
+  ===> RECOMPILE gpgme0.4 <===
+  This is the sole cause for the error "this GPGME version was
+  compiled without S/MIME support. Now it will because of gnupg2
+  installed:
+  # apt-get source gpgme0.4 && cd gpgme0.4-0.9.0
+  # debuild && dpkg -i ../libgpgme11_0.9.0-1_i386.deb
+
+You should now see funky things in KMail -> Settings -> Configure
+KMail -> Security -> Crypto Backends -> Configure.
+
+I found this page useful:
+
+  http://jdurand.home.cern.ch/jdurand/cern_ca_and_mail/
+
+Kleopatra now works and KMail seems able to verify S/MIME messages.
+
+DISCLAIMER: I claim no deep knowledge of all of the above explained.
+
+ -- daniel <schepler at debian.org>, Sat Sep 25 16:58:08 2004

Added: people/jriddell/KDE/3.5/kdepim/debian/kleopatra.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kleopatra.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kleopatra.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+/usr/bin/kleopatra
+/usr/bin/kwatchgnupg
+/usr/lib/kde3/kcm_kleopatra.la
+/usr/lib/kde3/kcm_kleopatra.so
+/usr/share/applications/kde/kleopatra_import.desktop
+/usr/share/apps/kleopatra
+/usr/share/apps/kwatchgnupg
+/usr/share/doc/kde/HTML/en/kleopatra
+/usr/share/doc/kde/HTML/en/kwatchgnupg
+/usr/share/services/kleopatra_config_*.desktop

Added: people/jriddell/KDE/3.5/kdepim/debian/kleopatra.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kleopatra.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kleopatra.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kleopatra /usr/share/doc/kleopatra/html/kleopatra

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kleopatra.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kleopatra.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kleopatra.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+?package(kleopatra):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="Kleopatra"\
+	command="/usr/bin/kleopatra"
+
+?package(kleopatra):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KWatchGnuPG"\
+	command="/usr/bin/kwatchgnupg"

Added: people/jriddell/KDE/3.5/kdepim/debian/kmail.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kmail.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kmail.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,62 @@
+/etc/kde3/kmail.antispamrc
+/etc/kde3/kmail.antivirusrc
+/usr/bin/kmail
+/usr/bin/kmail_*.sh
+/usr/lib/kde3/kcm_kmail.la
+/usr/lib/kde3/kcm_kmail.so
+/usr/lib/kde3/libkmail_bodypartformatter_application_octetstream.la
+/usr/lib/kde3/libkmail_bodypartformatter_application_octetstream.so
+/usr/lib/kde3/libkmail_bodypartformatter_text_calendar.la
+/usr/lib/kde3/libkmail_bodypartformatter_text_calendar.so
+/usr/lib/kde3/libkmail_bodypartformatter_text_vcard.la
+/usr/lib/kde3/libkmail_bodypartformatter_text_vcard.so
+/usr/lib/kde3/libkmail_bodypartformatter_text_xdiff.la
+/usr/lib/kde3/libkmail_bodypartformatter_text_xdiff.so
+/usr/lib/kde3/libkmailpart.la
+/usr/lib/kde3/libkmailpart.so
+/usr/lib/libkmailprivate.la
+/usr/lib/libkmailprivate.so
+/usr/share/applications/kde/KMail.desktop
+/usr/share/applications/kde/kmail_view.desktop
+/usr/share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
+/usr/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
+/usr/share/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
+/usr/share/apps/kconf_update/kmail-3.2-misc.sh
+/usr/share/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
+/usr/share/apps/kconf_update/kmail-3.3-aegypten.pl
+/usr/share/apps/kconf_update/kmail-3.3-misc.pl
+/usr/share/apps/kconf_update/kmail-3.3-move-identities.pl
+/usr/share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
+/usr/share/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
+/usr/share/apps/kconf_update/kmail-3.3b1-misc.pl
+/usr/share/apps/kconf_update/kmail-3.4-misc.pl
+/usr/share/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
+/usr/share/apps/kconf_update/kmail-pgpidentity.pl
+/usr/share/apps/kconf_update/kmail-upd-identities.pl
+/usr/share/apps/kconf_update/kmail.upd
+/usr/share/apps/kconf_update/upgrade-signature.pl
+/usr/share/apps/kconf_update/upgrade-transport.pl
+/usr/share/apps/kmail
+/usr/share/config.kcfg/custommimeheader.kcfg
+/usr/share/config.kcfg/kmail.kcfg
+/usr/share/config.kcfg/replyphrases.kcfg
+/usr/share/doc/kde/HTML/en/kmail
+/usr/share/icons/crystalsvg/32x32/apps/kmaillight.png
+/usr/share/icons/crystalsvg/22x22/apps/kmaillight.png
+/usr/share/icons/hicolor/128x128/apps/kmail.png
+/usr/share/icons/hicolor/16x16/apps/kmail.png
+/usr/share/icons/hicolor/22x22/apps/kmail.png
+/usr/share/icons/hicolor/32x32/apps/kmail.png
+/usr/share/icons/hicolor/48x48/apps/kmail.png
+/usr/share/icons/hicolor/64x64/apps/kmail.png
+/usr/share/icons/hicolor/scalable/apps/kmail.svgz
+/usr/share/services/kmail_config_*.desktop
+/usr/share/services/kontact/kmailplugin.desktop
+/usr/share/servicetypes/dcopimap.desktop
+/usr/share/servicetypes/dcopmail.desktop
+../icons/kmail.xpm /usr/share/pixmaps
+../icons/kmail-16.xpm /usr/share/pixmaps
+../man/out/kmail_antivir.sh.1 /usr/share/man/man1
+../man/out/kmail_clamav.sh.1 /usr/share/man/man1
+../man/out/kmail_fprot.sh.1 /usr/share/man/man1
+../man/out/kmail_sav.sh.1 /usr/share/man/man1

Added: people/jriddell/KDE/3.5/kdepim/debian/kmail.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kmail.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kmail.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kmail /usr/share/doc/kmail/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kmail.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kmail.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kmail.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kmail):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE,Mail"\
+	title="KMail"\
+	icon32x32="/usr/share/pixmaps/kmail.xpm"\
+	icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+	command="/usr/bin/kmail"

Added: people/jriddell/KDE/3.5/kdepim/debian/kmailcvt.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kmailcvt.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kmailcvt.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+/usr/bin/kmailcvt
+/usr/share/applnk/Utilities/kmailcvt.desktop
+/usr/share/apps/kmailcvt
+/usr/share/icons/crystalsvg/16x16/apps/kmailcvt.png
+/usr/share/icons/crystalsvg/32x32/apps/kmailcvt.png
+/usr/share/icons/crystalsvg/48x48/apps/kmailcvt.png
+../icons/kmailcvt.xpm /usr/share/pixmaps
+../icons/kmailcvt-16.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kmailcvt.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kmailcvt.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kmailcvt.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+?package(kmailcvt):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE,Mail"\
+	title="KMail/KAB Import Tool"\
+	command="/usr/bin/kmailcvt"

Added: people/jriddell/KDE/3.5/kdepim/debian/knode.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/knode.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/knode.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+/usr/bin/knode
+/usr/lib/kde3/kcm_knode.la
+/usr/lib/kde3/kcm_knode.so
+/usr/lib/kde3/libknodepart.la
+/usr/lib/kde3/libknodepart.so
+/usr/lib/libknodecommon.la
+/usr/lib/libknodecommon.so
+/usr/share/applications/kde/KNode.desktop
+/usr/share/apps/knode
+/usr/share/doc/kde/HTML/en/knode
+/usr/share/icons/hicolor/128x128/apps/knode.png
+/usr/share/icons/hicolor/128x128/apps/knode2.png
+/usr/share/icons/hicolor/16x16/apps/knode.png
+/usr/share/icons/hicolor/16x16/apps/knode2.png
+/usr/share/icons/hicolor/32x32/apps/knode.png
+/usr/share/icons/hicolor/32x32/apps/knode2.png
+/usr/share/icons/hicolor/48x48/apps/knode.png
+/usr/share/icons/hicolor/48x48/apps/knode2.png
+/usr/share/icons/hicolor/64x64/apps/knode.png
+/usr/share/icons/hicolor/64x64/apps/knode2.png
+/usr/share/services/knewsservice.protocol
+/usr/share/services/knode_config_*.desktop
+/usr/share/services/kontact/knodeplugin.desktop
+../icons/knode.xpm /usr/share/pixmaps
+../icons/knode-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/knode.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/knode.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/knode.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/knode /usr/share/doc/knode/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/knode.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/knode.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/knode.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(knode):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE,News"\
+	title="KNode"\
+	icon32x32="/usr/share/pixmaps/knode.xpm"\
+	icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+	command="/usr/bin/knode"

Added: people/jriddell/KDE/3.5/kdepim/debian/knotes.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/knotes.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/knotes.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,20 @@
+/usr/bin/knotes
+/usr/lib/kde3/knotes_local.la
+/usr/lib/kde3/knotes_local.so
+/usr/share/applications/kde/knotes.desktop
+/usr/share/apps/knotes
+/usr/share/config.kcfg/knoteconfig.kcfg
+/usr/share/config.kcfg/knotesglobalconfig.kcfg
+/usr/share/doc/kde/HTML/en/knotes
+/usr/share/icons/hicolor/128x128/apps/knotes.png
+/usr/share/icons/hicolor/16x16/apps/knotes.png
+/usr/share/icons/hicolor/22x22/apps/knotes.png
+/usr/share/icons/hicolor/32x32/apps/knotes.png
+/usr/share/icons/hicolor/48x48/apps/knotes.png
+/usr/share/icons/hicolor/64x64/apps/knotes.png
+/usr/share/services/kresources/knotes/imap.desktop
+/usr/share/services/kresources/knotes/local.desktop
+/usr/share/services/kresources/knotes_manager.desktop
+/usr/share/services/kontact/knotesplugin.desktop
+../icons/knotes.xpm /usr/share/pixmaps
+../icons/knotes-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/knotes.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/knotes.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/knotes.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/knotes /usr/share/doc/knotes/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/knotes.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/knotes.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/knotes.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(knotes):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KNotes"\
+	icon32x32="/usr/share/pixmaps/knotes.xpm"\
+	icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+	command="/usr/bin/knotes"

Added: people/jriddell/KDE/3.5/kdepim/debian/knotes.preinst
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/knotes.preinst	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/knotes.preinst	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,44 @@
+#! /bin/sh
+# preinst script for knotes
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        if [ "$1" = "upgrade" ]
+        then
+	    # Debian testing (Sarge) files
+	    rm /etc/kde3/knotesrc > /dev/null 2>&1 || true
+        fi
+    ;;
+
+    abort-upgrade)
+
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: people/jriddell/KDE/3.5/kdepim/debian/kode.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kode.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kode.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+/usr/bin/kode
+/usr/bin/kxml_compiler
+/usr/lib/libkode.la
+/usr/lib/libkode.so
+/usr/lib/libkode.so.1
+/usr/lib/libkode.so.1.0.0

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

Added: people/jriddell/KDE/3.5/kdepim/debian/konsolekalendar.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/konsolekalendar.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/konsolekalendar.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+/usr/bin/konsolekalendar
+/usr/share/applications/kde/konsolekalendar.desktop
+/usr/share/doc/kde/HTML/en/konsolekalendar/common
+/usr/share/doc/kde/HTML/en/konsolekalendar/index.cache.bz2
+/usr/share/doc/kde/HTML/en/konsolekalendar/index.docbook
+/usr/share/icons/crystalsvg/16x16/apps/konsolekalendar.png
+/usr/share/icons/crystalsvg/22x22/apps/konsolekalendar.png
+/usr/share/icons/crystalsvg/32x32/apps/konsolekalendar.png

Added: people/jriddell/KDE/3.5/kdepim/debian/konsolekalendar.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/konsolekalendar.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/konsolekalendar.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/konsolekalendar /usr/share/doc/konsolekalendar/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kontact.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kontact.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kontact.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,49 @@
+/usr/bin/kontact
+/usr/lib/kde3/kcm_kmailsummary.la
+/usr/lib/kde3/kcm_kmailsummary.so
+/usr/lib/kde3/kcm_kontact.la
+/usr/lib/kde3/kcm_kontact.so
+/usr/lib/kde3/kcm_kontactknt.la
+/usr/lib/kde3/kcm_kontactknt.so
+/usr/lib/kde3/kcm_kontactsummary.la
+/usr/lib/kde3/kcm_kontactsummary.so
+/usr/lib/kde3/kcm_korgsummary.la
+/usr/lib/kde3/kcm_korgsummary.so
+/usr/lib/kde3/kcm_sdsummary.la
+/usr/lib/kde3/kcm_sdsummary.so
+/usr/lib/kde3/libkontact_*.la
+/usr/lib/kde3/libkontact_*.so
+/usr/lib/libkontact.so.1
+/usr/lib/libkontact.so.1.0.0
+/usr/lib/libkpinterfaces.so.1
+/usr/lib/libkpinterfaces.so.1.0.0
+/usr/share/applications/kde/Kontact.desktop
+/usr/share/apps/kontact
+/usr/share/apps/kontactsummary/kontactsummary_part.rc
+/usr/share/config.kcfg/kontact.kcfg
+/usr/share/doc/kde/HTML/en/kontact
+/usr/share/icons/crystalsvg/16x16/actions/kontact_*.png
+/usr/share/icons/crystalsvg/22x22/actions/kontact_*.png
+/usr/share/icons/crystalsvg/32x32/actions/kontact_*.png
+/usr/share/icons/crystalsvg/48x48/actions/kontact_*.png
+/usr/share/icons/crystalsvg/64x64/actions/kontact_*.png
+/usr/share/icons/hicolor/128x128/apps/kontact.png
+/usr/share/icons/hicolor/16x16/apps/kontact.png
+/usr/share/icons/hicolor/22x22/apps/kontact.png
+/usr/share/icons/hicolor/32x32/apps/kontact.png
+/usr/share/icons/hicolor/48x48/apps/kontact.png
+/usr/share/icons/hicolor/64x64/apps/kontact.png
+/usr/share/services/kcmkmailsummary.desktop
+/usr/share/services/kcmkontactknt.desktop
+/usr/share/services/kcmkontactsummary.desktop
+/usr/share/services/kcmkorgsummary.desktop
+/usr/share/services/kcmsdsummary.desktop
+/usr/share/services/kontact/newstickerplugin.desktop
+/usr/share/services/kontact/specialdatesplugin.desktop
+/usr/share/services/kontact/summaryplugin.desktop
+/usr/share/services/kontact/todoplugin.desktop
+/usr/share/services/kontact/weatherplugin.desktop
+/usr/share/services/kontactconfig.desktop
+/usr/share/servicetypes/kontactplugin.desktop
+../icons/kontact.xpm /usr/share/pixmaps
+../icons/kontact-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/kontact.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kontact.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kontact.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kontact /usr/share/doc/kontact/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kontact.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kontact.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kontact.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kontact):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="Kontact"\
+	icon32x32="/usr/share/pixmaps/kontact.xpm"\
+	icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+	command="/usr/bin/kontact"

Added: people/jriddell/KDE/3.5/kdepim/debian/korganizer.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/korganizer.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/korganizer.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,43 @@
+/usr/bin/ical2vcal
+/usr/bin/korgac
+/usr/bin/korganizer
+/usr/lib/kde3/kcm_korganizer.la
+/usr/lib/kde3/kcm_korganizer.so
+/usr/lib/kde3/libkorg_*.la
+/usr/lib/kde3/libkorg_*.so
+/usr/lib/kde3/libkorganizerpart.la
+/usr/lib/kde3/libkorganizerpart.so
+/usr/lib/libkocorehelper.so.1
+/usr/lib/libkocorehelper.so.1.0.0
+/usr/lib/libkorg_stdprinting.so.1
+/usr/lib/libkorg_stdprinting.so.1.0.0
+/usr/lib/libkorganizer.so.1
+/usr/lib/libkorganizer.so.1.0.0
+/usr/lib/libkorganizer_calendar.so.1
+/usr/lib/libkorganizer_calendar.so.1.0.0
+/usr/lib/libkorganizer_eventviewer.so.1
+/usr/lib/libkorganizer_eventviewer.so.1.0.0
+/usr/share/applications/kde/korganizer.desktop
+/usr/share/apps/kconf_update/korganizer.upd
+/usr/share/apps/korgac
+/usr/share/apps/korganizer
+/usr/share/autostart/korgac.desktop
+/usr/share/config.kcfg/korganizer.kcfg
+/usr/share/doc/kde/HTML/en/korganizer
+/usr/share/icons/hicolor/128x128/apps/korganizer.png
+/usr/share/icons/hicolor/16x16/apps/korganizer.png
+/usr/share/icons/hicolor/32x32/apps/korganizer.png
+/usr/share/icons/hicolor/48x48/apps/korganizer.png
+/usr/share/icons/hicolor/64x64/apps/korganizer.png
+/usr/share/services/korganizer_*.desktop
+/usr/share/services/korganizer
+/usr/share/services/webcal.protocol
+/usr/share/services/kontact/korganizerplugin.desktop
+/usr/share/services/kontact/journalplugin.desktop
+/usr/share/servicetypes/calendardecoration.desktop
+/usr/share/servicetypes/calendarplugin.desktop
+/usr/share/servicetypes/dcopcalendar.desktop
+/usr/share/servicetypes/korganizerpart.desktop
+/usr/share/servicetypes/korgprintplugin.desktop
+../icons/korganizer.xpm /usr/share/pixmaps
+../icons/korganizer-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/korganizer.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/korganizer.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/korganizer.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/korganizer /usr/share/doc/korganizer/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/korganizer.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/korganizer.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/korganizer.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(korganizer):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KOrganizer"\
+	icon32x32="/usr/share/pixmaps/korganizer.xpm"\
+	icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+	command="/usr/bin/korganizer"

Added: people/jriddell/KDE/3.5/kdepim/debian/korn.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/korn.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/korn.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+/usr/bin/korn
+/usr/lib/kconf_update_bin/korn-3-4-config_change
+/usr/share/applications/kde/KOrn.desktop
+/usr/share/apps/kconf_update/korn-3-4-config_change.upd
+/usr/share/doc/kde/HTML/en/korn
+/usr/share/icons/hicolor/16x16/apps/korn.png
+/usr/share/icons/hicolor/32x32/apps/korn.png
+/usr/share/icons/hicolor/48x48/apps/korn.png
+/usr/share/apps/kconf_update/korn-3-5-update.upd
+/usr/share/apps/kconf_update/korn-3-5-ssl-update.pl
+/usr/share/apps/kconf_update/korn-3-5-metadata-update.pl
+
+../icons/korn.xpm /usr/share/pixmaps
+../icons/korn-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/korn.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/korn.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/korn.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/korn /usr/share/doc/korn/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/korn.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/korn.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/korn.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(korn):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KOrn"\
+	icon32x32="/usr/share/pixmaps/korn.xpm"\
+	icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+	command="/usr/bin/korn"

Added: people/jriddell/KDE/3.5/kdepim/debian/kpilot.config
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kpilot.config	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kpilot.config	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+db_input medium 'shared/pilot/port' || true
+db_go || true
+

Added: people/jriddell/KDE/3.5/kdepim/debian/kpilot.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kpilot.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kpilot.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,59 @@
+/usr/bin/kpalmdoc
+/usr/bin/kpilot
+/usr/bin/kpilotDaemon
+/usr/lib/kde3/conduit_*.la
+/usr/lib/kde3/conduit_*.so
+/usr/lib/kde3/kcm_kpilot.la
+/usr/lib/kde3/kcm_kpilot.so
+/usr/lib/libkpilot.so.0
+/usr/lib/libkpilot.so.0.0.0
+/usr/share/applications/kde/kpalmdoc.desktop
+/usr/share/applications/kde/kpilot.desktop
+/usr/share/applications/kde/kpilotdaemon.desktop
+/usr/share/apps/kconf_update/kpalmdoc.upd
+/usr/share/apps/kconf_update/kpilot.upd
+/usr/share/apps/kpilot
+/usr/share/config.kcfg/abbrowserconduit.kcfg
+/usr/share/config.kcfg/docconduit.kcfg
+/usr/share/config.kcfg/knotesconduit.kcfg
+/usr/share/config.kcfg/kpalmdoc.kcfg
+/usr/share/config.kcfg/kpilot.kcfg
+/usr/share/config.kcfg/kpilotlib.kcfg
+/usr/share/config.kcfg/malconduit.kcfg
+/usr/share/config.kcfg/memofileconduit.kcfg
+/usr/share/config.kcfg/popmail.kcfg
+/usr/share/config.kcfg/sysinfoconduit.kcfg
+/usr/share/config.kcfg/timeconduit.kcfg
+/usr/share/config.kcfg/vcalconduitbase.kcfg
+/usr/share/doc/kde/HTML/en/kpilot
+/usr/share/icons/crystalsvg/16x16/apps/kpalmdoc.png
+/usr/share/icons/crystalsvg/16x16/apps/kpilotDaemon.png
+/usr/share/icons/crystalsvg/22x22/apps/kpalmdoc.png
+/usr/share/icons/crystalsvg/22x22/apps/kpilotDaemon.png
+/usr/share/icons/crystalsvg/32x32/apps/kpalmdoc.png
+/usr/share/icons/crystalsvg/32x32/apps/kpilotDaemon.png
+/usr/share/icons/crystalsvg/48x48/apps/kpalmdoc.png
+/usr/share/icons/crystalsvg/48x48/apps/kpilotDaemon.png
+/usr/share/icons/hicolor/16x16/apps/kpilot.png
+/usr/share/icons/hicolor/22x22/apps/kpilot.png
+/usr/share/icons/hicolor/32x32/apps/kpilot.png
+/usr/share/icons/hicolor/48x48/apps/kpilot.png
+/usr/share/icons/locolor/16x16/apps/kpilot.png
+/usr/share/services/abbrowser_conduit.desktop
+/usr/share/services/doc_conduit.desktop
+/usr/share/services/knotes-conduit.desktop
+/usr/share/services/kpilot_config.desktop
+/usr/share/services/mal_conduit.desktop
+/usr/share/services/memofile-conduit.desktop
+/usr/share/services/notepad-conduit.desktop
+/usr/share/services/popmail-conduit.desktop
+/usr/share/services/sysinfo_conduit.desktop
+/usr/share/services/time_conduit.desktop
+/usr/share/services/todo-conduit.desktop
+/usr/share/services/vcal-conduit.desktop
+/usr/share/services/kontact/kpilotplugin.desktop
+/usr/share/servicetypes/kpilotconduit.desktop
+../icons/kpilot.xpm /usr/share/pixmaps
+../icons/kpilot-16.xpm /usr/share/pixmaps
+../icons/kpalmdoc.xpm /usr/share/pixmaps
+../icons/kpalmdoc-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/kpilot.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kpilot.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kpilot.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/kpilot /usr/share/doc/kpilot/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/kpilot.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kpilot.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kpilot.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+?package(kpilot):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KPilot"\
+	icon32x32="/usr/share/pixmaps/kpilot.xpm"\
+	icon16x16="/usr/share/pixmaps/kpilot-16.xpm"\
+	command="/usr/bin/kpilot"
+
+?package(kpilot):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KPalmDOC"\
+	icon32x32="/usr/share/pixmaps/kpalmdoc.xpm"\
+	icon16x16="/usr/share/pixmaps/kpalmdoc-16.xpm"\
+	command="/usr/bin/kpalmdoc"

Added: people/jriddell/KDE/3.5/kdepim/debian/kpilot.postinst
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kpilot.postinst	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kpilot.postinst	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# postinst script for pilot-link and other libpisock8 related packages
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a
+#     conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with
+#     `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+devfs_cfg=/etc/devfs/conf.d/libpisock8
+
+case "$1" in
+    configure|reconfigure)
+		# Source debconf library.
+		. /usr/share/debconf/confmodule
+
+		# which port?
+		db_get 'shared/pilot/port'
+
+		port="$RET"
+
+		# if port is not defined we don't do anything
+		if [ "$port" ]
+		then
+			# if port is not set to None
+			if [ "$port" != "None" ]
+			then
+				rm -f /dev/pilot
+				ln -s "$port" /dev/pilot
+				chmod -f 0666 /dev/"$port" || true
+
+				# remove old devfs stuff (from before 0.11.3-5)
+				if [ -f /etc/devfs/symlinks.d/pilot-link ]; then
+					rm /etc/devfs/symlinks.d/pilot-link
+				fi
+				if [ -f /etc/devfs/conf.d/pilot-link ]; then
+					rm /etc/devfs/conf.d/pilot-link
+				fi
+				
+				if [ ! -d /etc/devfs/conf.d ]
+				then
+					mkdir -p /etc/devfs/conf.d
+				fi
+
+				# convert ttyS? -> tts/? (devfs name)
+				port_devfs=$(echo $port | sed -e 's/ttyS/tts\//')
+
+				# convert ttyUSB? -> usb/tts/? (devfs name)
+				port_devfs=$(echo $port | sed -e 's/ttyUSB/usb\/tts\//')
+
+				echo "REGISTER  ^$port_devfs$ CFUNCTION GLOBAL symlink \$devname pilot" > $devfs_cfg
+				echo "REGISTER	^$port_devfs$	PERMISSIONS	root.root	0666" >> $devfs_cfg
+				echo "UNREGISTER ^$port_devfs$ CFUNCTION GLOBAL unlink pilot" >> $devfs_cfg
+			else
+				# the admin chooses to manage the link himself
+				rm -f /dev/pilot /etc/devfs/conf.d/libpisock8
+			fi
+		fi
+
+		# ends debconf
+		db_stop
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+

Added: people/jriddell/KDE/3.5/kdepim/debian/kpilot.templates
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/kpilot.templates	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/kpilot.templates	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+Template: shared/pilot/port
+Type: select
+_choices: None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1
+_description: Which communication port to use with the Palm?
+ A symbolic file /dev/pilot may be created to the port use to talk to the
+ Palm.
+ .
+ ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port,
+ ttyUSB? are the USB ports.
+ .
+ To ease the use of the Palm connected to the port its access rights will
+ be lowered to allow access to any user.  If it is a security problem for
+ you, select "None" and manage the link and its access rights yourself.

Added: people/jriddell/KDE/3.5/kdepim/debian/ksync.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/ksync.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/ksync.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+/usr/bin/ksync
+/usr/lib/libksync.so.1
+/usr/lib/libksync.so.1.0.0
+/usr/share/apps/ksync/ksyncui.rc
+../icons/ksync.xpm /usr/share/pixmaps
+../icons/ksync-16.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdepim/debian/ksync.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/ksync.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/ksync.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(ksync):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KSync"\
+	icon32x32="/usr/share/pixmaps/ksync.xpm"\
+	icon16x16="/usr/share/pixmaps/ksync-16.xpm"\
+	command="/usr/bin/ksync"

Added: people/jriddell/KDE/3.5/kdepim/debian/ktnef.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/ktnef.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/ktnef.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+/usr/bin/ktnef
+/usr/share/applications/kde/ktnef.desktop
+/usr/share/apps/ktnef
+/usr/share/doc/kde/HTML/en/ktnef
+/usr/share/icons/hicolor/48x48/apps/ktnef.png
+/usr/share/icons/locolor/16x16/apps/ktnef.png
+/usr/share/icons/locolor/32x32/apps/ktnef.png
+/usr/share/mimelnk/application/ms-tnef.desktop
+../icons/ktnef.xpm /usr/share/pixmaps
+../icons/ktnef-16.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdepim/debian/ktnef.links
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/ktnef.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/ktnef.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/kde/HTML/en/ktnef /usr/share/doc/ktnef/html

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

Added: people/jriddell/KDE/3.5/kdepim/debian/ktnef.menu
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/ktnef.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/ktnef.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(ktnef):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="KTnef"\
+	icon32x32="/usr/share/pixmaps/ktnef.xpm"\
+	icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+	command="/usr/bin/ktnef"

Added: people/jriddell/KDE/3.5/kdepim/debian/libindex0-dev.docs
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libindex0-dev.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libindex0-dev.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+build-tree/kdepim-*/indexlib/README
+build-tree/kdepim-*/indexlib/docs/report.pdf

Added: people/jriddell/KDE/3.5/kdepim/debian/libindex0-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libindex0-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libindex0-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+/usr/bin/indexlib-config
+/usr/include/kde/index
+/usr/lib/libindex.la
+/usr/lib/libindex.so

Added: people/jriddell/KDE/3.5/kdepim/debian/libindex0.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libindex0.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libindex0.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+/usr/lib/libindex.so.0
+/usr/lib/libindex.so.0.0.0

Added: people/jriddell/KDE/3.5/kdepim/debian/libkcal2-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkcal2-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkcal2-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+/usr/include/kde/libkcal
+/usr/lib/libkcal.la
+/usr/lib/libkcal.so
+/usr/lib/libkcal_resourceremote.la
+/usr/lib/libkcal_resourceremote.so
+/usr/lib/libkholidays.la
+/usr/lib/libkholidays.so

Added: people/jriddell/KDE/3.5/kdepim/debian/libkcal2b.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkcal2b.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkcal2b.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,395 @@
+/usr/lib/kde3/kcal_kabc.la
+/usr/lib/kde3/kcal_kabc.so
+/usr/lib/kde3/kcal_localdir.la
+/usr/lib/kde3/kcal_localdir.so
+/usr/lib/kde3/kcal_local.la
+/usr/lib/kde3/kcal_local.so
+/usr/lib/kde3/kcal_remote.la
+/usr/lib/kde3/kcal_remote.so
+/usr/lib/libkcal.so.2
+/usr/lib/libkcal.so.2.0.0
+/usr/lib/libkcal_resourceremote.so.1
+/usr/lib/libkcal_resourceremote.so.1.0.0
+/usr/lib/libkholidays.so.1
+/usr/lib/libkholidays.so.1.0.0
+/usr/share/apps/libkholidays
+/usr/share/services/kresources/kcal/imap.desktop
+/usr/share/services/kresources/kcal/kabc.desktop
+/usr/share/services/kresources/kcal/local.desktop
+/usr/share/services/kresources/kcal/localdir.desktop
+/usr/share/services/kresources/kcal/remote.desktop
+/usr/share/services/kresources/kcal_manager.desktop
+usr/share/apps/libical/zoneinfo/Africa/Abidjan.ics
+usr/share/apps/libical/zoneinfo/Africa/Accra.ics
+usr/share/apps/libical/zoneinfo/Africa/Addis_Ababa.ics
+usr/share/apps/libical/zoneinfo/Africa/Algiers.ics
+usr/share/apps/libical/zoneinfo/Africa/Asmera.ics
+usr/share/apps/libical/zoneinfo/Africa/Bamako.ics
+usr/share/apps/libical/zoneinfo/Africa/Bangui.ics
+usr/share/apps/libical/zoneinfo/Africa/Banjul.ics
+usr/share/apps/libical/zoneinfo/Africa/Bissau.ics
+usr/share/apps/libical/zoneinfo/Africa/Blantyre.ics
+usr/share/apps/libical/zoneinfo/Africa/Brazzaville.ics
+usr/share/apps/libical/zoneinfo/Africa/Bujumbura.ics
+usr/share/apps/libical/zoneinfo/Africa/Cairo.ics
+usr/share/apps/libical/zoneinfo/Africa/Casablanca.ics
+usr/share/apps/libical/zoneinfo/Africa/Ceuta.ics
+usr/share/apps/libical/zoneinfo/Africa/Conakry.ics
+usr/share/apps/libical/zoneinfo/Africa/Dakar.ics
+usr/share/apps/libical/zoneinfo/Africa/Dar_es_Salaam.ics
+usr/share/apps/libical/zoneinfo/Africa/Djibouti.ics
+usr/share/apps/libical/zoneinfo/Africa/Douala.ics
+usr/share/apps/libical/zoneinfo/Africa/El_Aaiun.ics
+usr/share/apps/libical/zoneinfo/Africa/Freetown.ics
+usr/share/apps/libical/zoneinfo/Africa/Gaborone.ics
+usr/share/apps/libical/zoneinfo/Africa/Harare.ics
+usr/share/apps/libical/zoneinfo/Africa/Johannesburg.ics
+usr/share/apps/libical/zoneinfo/Africa/Kampala.ics
+usr/share/apps/libical/zoneinfo/Africa/Khartoum.ics
+usr/share/apps/libical/zoneinfo/Africa/Kigali.ics
+usr/share/apps/libical/zoneinfo/Africa/Kinshasa.ics
+usr/share/apps/libical/zoneinfo/Africa/Lagos.ics
+usr/share/apps/libical/zoneinfo/Africa/Libreville.ics
+usr/share/apps/libical/zoneinfo/Africa/Lome.ics
+usr/share/apps/libical/zoneinfo/Africa/Luanda.ics
+usr/share/apps/libical/zoneinfo/Africa/Lubumbashi.ics
+usr/share/apps/libical/zoneinfo/Africa/Lusaka.ics
+usr/share/apps/libical/zoneinfo/Africa/Malabo.ics
+usr/share/apps/libical/zoneinfo/Africa/Maputo.ics
+usr/share/apps/libical/zoneinfo/Africa/Maseru.ics
+usr/share/apps/libical/zoneinfo/Africa/Mbabane.ics
+usr/share/apps/libical/zoneinfo/Africa/Mogadishu.ics
+usr/share/apps/libical/zoneinfo/Africa/Monrovia.ics
+usr/share/apps/libical/zoneinfo/Africa/Nairobi.ics
+usr/share/apps/libical/zoneinfo/Africa/Ndjamena.ics
+usr/share/apps/libical/zoneinfo/Africa/Niamey.ics
+usr/share/apps/libical/zoneinfo/Africa/Nouakchott.ics
+usr/share/apps/libical/zoneinfo/Africa/Ouagadougou.ics
+usr/share/apps/libical/zoneinfo/Africa/Porto-Novo.ics
+usr/share/apps/libical/zoneinfo/Africa/Sao_Tome.ics
+usr/share/apps/libical/zoneinfo/Africa/Timbuktu.ics
+usr/share/apps/libical/zoneinfo/Africa/Tripoli.ics
+usr/share/apps/libical/zoneinfo/Africa/Tunis.ics
+usr/share/apps/libical/zoneinfo/Africa/Windhoek.ics
+usr/share/apps/libical/zoneinfo/America/Adak.ics
+usr/share/apps/libical/zoneinfo/America/Anchorage.ics
+usr/share/apps/libical/zoneinfo/America/Anguilla.ics
+usr/share/apps/libical/zoneinfo/America/Antigua.ics
+usr/share/apps/libical/zoneinfo/America/Araguaina.ics
+usr/share/apps/libical/zoneinfo/America/Aruba.ics
+usr/share/apps/libical/zoneinfo/America/Asuncion.ics
+usr/share/apps/libical/zoneinfo/America/Barbados.ics
+usr/share/apps/libical/zoneinfo/America/Belem.ics
+usr/share/apps/libical/zoneinfo/America/Belize.ics
+usr/share/apps/libical/zoneinfo/America/Boa_Vista.ics
+usr/share/apps/libical/zoneinfo/America/Bogota.ics
+usr/share/apps/libical/zoneinfo/America/Boise.ics
+usr/share/apps/libical/zoneinfo/America/Buenos_Aires.ics
+usr/share/apps/libical/zoneinfo/America/Cambridge_Bay.ics
+usr/share/apps/libical/zoneinfo/America/Cancun.ics
+usr/share/apps/libical/zoneinfo/America/Caracas.ics
+usr/share/apps/libical/zoneinfo/America/Catamarca.ics
+usr/share/apps/libical/zoneinfo/America/Cayenne.ics
+usr/share/apps/libical/zoneinfo/America/Cayman.ics
+usr/share/apps/libical/zoneinfo/America/Chicago.ics
+usr/share/apps/libical/zoneinfo/America/Chihuahua.ics
+usr/share/apps/libical/zoneinfo/America/Cordoba.ics
+usr/share/apps/libical/zoneinfo/America/Costa_Rica.ics
+usr/share/apps/libical/zoneinfo/America/Cuiaba.ics
+usr/share/apps/libical/zoneinfo/America/Curacao.ics
+usr/share/apps/libical/zoneinfo/America/Dawson.ics
+usr/share/apps/libical/zoneinfo/America/Dawson_Creek.ics
+usr/share/apps/libical/zoneinfo/America/Denver.ics
+usr/share/apps/libical/zoneinfo/America/Detroit.ics
+usr/share/apps/libical/zoneinfo/America/Dominica.ics
+usr/share/apps/libical/zoneinfo/America/Edmonton.ics
+usr/share/apps/libical/zoneinfo/America/Eirunepe.ics
+usr/share/apps/libical/zoneinfo/America/El_Salvador.ics
+usr/share/apps/libical/zoneinfo/America/Fortaleza.ics
+usr/share/apps/libical/zoneinfo/America/Glace_Bay.ics
+usr/share/apps/libical/zoneinfo/America/Godthab.ics
+usr/share/apps/libical/zoneinfo/America/Goose_Bay.ics
+usr/share/apps/libical/zoneinfo/America/Grand_Turk.ics
+usr/share/apps/libical/zoneinfo/America/Grenada.ics
+usr/share/apps/libical/zoneinfo/America/Guadeloupe.ics
+usr/share/apps/libical/zoneinfo/America/Guatemala.ics
+usr/share/apps/libical/zoneinfo/America/Guayaquil.ics
+usr/share/apps/libical/zoneinfo/America/Guyana.ics
+usr/share/apps/libical/zoneinfo/America/Halifax.ics
+usr/share/apps/libical/zoneinfo/America/Havana.ics
+usr/share/apps/libical/zoneinfo/America/Hermosillo.ics
+usr/share/apps/libical/zoneinfo/America/Indianapolis.ics
+usr/share/apps/libical/zoneinfo/America/Inuvik.ics
+usr/share/apps/libical/zoneinfo/America/Iqaluit.ics
+usr/share/apps/libical/zoneinfo/America/Jamaica.ics
+usr/share/apps/libical/zoneinfo/America/Jujuy.ics
+usr/share/apps/libical/zoneinfo/America/Juneau.ics
+usr/share/apps/libical/zoneinfo/America/La_Paz.ics
+usr/share/apps/libical/zoneinfo/America/Lima.ics
+usr/share/apps/libical/zoneinfo/America/Los_Angeles.ics
+usr/share/apps/libical/zoneinfo/America/Louisville.ics
+usr/share/apps/libical/zoneinfo/America/Maceio.ics
+usr/share/apps/libical/zoneinfo/America/Managua.ics
+usr/share/apps/libical/zoneinfo/America/Manaus.ics
+usr/share/apps/libical/zoneinfo/America/Martinique.ics
+usr/share/apps/libical/zoneinfo/America/Mazatlan.ics
+usr/share/apps/libical/zoneinfo/America/Mendoza.ics
+usr/share/apps/libical/zoneinfo/America/Menominee.ics
+usr/share/apps/libical/zoneinfo/America/Merida.ics
+usr/share/apps/libical/zoneinfo/America/Mexico_City.ics
+usr/share/apps/libical/zoneinfo/America/Miquelon.ics
+usr/share/apps/libical/zoneinfo/America/Monterrey.ics
+usr/share/apps/libical/zoneinfo/America/Montevideo.ics
+usr/share/apps/libical/zoneinfo/America/Montreal.ics
+usr/share/apps/libical/zoneinfo/America/Montserrat.ics
+usr/share/apps/libical/zoneinfo/America/Nassau.ics
+usr/share/apps/libical/zoneinfo/America/New_York.ics
+usr/share/apps/libical/zoneinfo/America/Nipigon.ics
+usr/share/apps/libical/zoneinfo/America/Nome.ics
+usr/share/apps/libical/zoneinfo/America/Noronha.ics
+usr/share/apps/libical/zoneinfo/America/Panama.ics
+usr/share/apps/libical/zoneinfo/America/Pangnirtung.ics
+usr/share/apps/libical/zoneinfo/America/Paramaribo.ics
+usr/share/apps/libical/zoneinfo/America/Phoenix.ics
+usr/share/apps/libical/zoneinfo/America/Port-au-Prince.ics
+usr/share/apps/libical/zoneinfo/America/Port_of_Spain.ics
+usr/share/apps/libical/zoneinfo/America/Porto_Velho.ics
+usr/share/apps/libical/zoneinfo/America/Puerto_Rico.ics
+usr/share/apps/libical/zoneinfo/America/Rainy_River.ics
+usr/share/apps/libical/zoneinfo/America/Rankin_Inlet.ics
+usr/share/apps/libical/zoneinfo/America/Recife.ics
+usr/share/apps/libical/zoneinfo/America/Regina.ics
+usr/share/apps/libical/zoneinfo/America/Rio_Branco.ics
+usr/share/apps/libical/zoneinfo/America/Rosario.ics
+usr/share/apps/libical/zoneinfo/America/Santiago.ics
+usr/share/apps/libical/zoneinfo/America/Santo_Domingo.ics
+usr/share/apps/libical/zoneinfo/America/Sao_Paulo.ics
+usr/share/apps/libical/zoneinfo/America/Scoresbysund.ics
+usr/share/apps/libical/zoneinfo/America/Shiprock.ics
+usr/share/apps/libical/zoneinfo/America/St_Johns.ics
+usr/share/apps/libical/zoneinfo/America/St_Kitts.ics
+usr/share/apps/libical/zoneinfo/America/St_Lucia.ics
+usr/share/apps/libical/zoneinfo/America/St_Thomas.ics
+usr/share/apps/libical/zoneinfo/America/St_Vincent.ics
+usr/share/apps/libical/zoneinfo/America/Swift_Current.ics
+usr/share/apps/libical/zoneinfo/America/Tegucigalpa.ics
+usr/share/apps/libical/zoneinfo/America/Thule.ics
+usr/share/apps/libical/zoneinfo/America/Thunder_Bay.ics
+usr/share/apps/libical/zoneinfo/America/Tijuana.ics
+usr/share/apps/libical/zoneinfo/America/Tortola.ics
+usr/share/apps/libical/zoneinfo/America/Vancouver.ics
+usr/share/apps/libical/zoneinfo/America/Whitehorse.ics
+usr/share/apps/libical/zoneinfo/America/Winnipeg.ics
+usr/share/apps/libical/zoneinfo/America/Yakutat.ics
+usr/share/apps/libical/zoneinfo/America/Yellowknife.ics
+usr/share/apps/libical/zoneinfo/America/Indiana/Indianapolis.ics
+usr/share/apps/libical/zoneinfo/America/Indiana/Knox.ics
+usr/share/apps/libical/zoneinfo/America/Indiana/Marengo.ics
+usr/share/apps/libical/zoneinfo/America/Indiana/Vevay.ics
+usr/share/apps/libical/zoneinfo/America/Kentucky/Louisville.ics
+usr/share/apps/libical/zoneinfo/America/Kentucky/Monticello.ics
+usr/share/apps/libical/zoneinfo/Antarctica/Casey.ics
+usr/share/apps/libical/zoneinfo/Antarctica/Davis.ics
+usr/share/apps/libical/zoneinfo/Antarctica/DumontDUrville.ics
+usr/share/apps/libical/zoneinfo/Antarctica/Mawson.ics
+usr/share/apps/libical/zoneinfo/Antarctica/McMurdo.ics
+usr/share/apps/libical/zoneinfo/Antarctica/Palmer.ics
+usr/share/apps/libical/zoneinfo/Antarctica/South_Pole.ics
+usr/share/apps/libical/zoneinfo/Antarctica/Syowa.ics
+usr/share/apps/libical/zoneinfo/Antarctica/Vostok.ics
+usr/share/apps/libical/zoneinfo/Arctic/Longyearbyen.ics
+usr/share/apps/libical/zoneinfo/Asia/Aden.ics
+usr/share/apps/libical/zoneinfo/Asia/Almaty.ics
+usr/share/apps/libical/zoneinfo/Asia/Amman.ics
+usr/share/apps/libical/zoneinfo/Asia/Anadyr.ics
+usr/share/apps/libical/zoneinfo/Asia/Aqtau.ics
+usr/share/apps/libical/zoneinfo/Asia/Aqtobe.ics
+usr/share/apps/libical/zoneinfo/Asia/Ashgabat.ics
+usr/share/apps/libical/zoneinfo/Asia/Baghdad.ics
+usr/share/apps/libical/zoneinfo/Asia/Bahrain.ics
+usr/share/apps/libical/zoneinfo/Asia/Baku.ics
+usr/share/apps/libical/zoneinfo/Asia/Bangkok.ics
+usr/share/apps/libical/zoneinfo/Asia/Beirut.ics
+usr/share/apps/libical/zoneinfo/Asia/Bishkek.ics
+usr/share/apps/libical/zoneinfo/Asia/Brunei.ics
+usr/share/apps/libical/zoneinfo/Asia/Calcutta.ics
+usr/share/apps/libical/zoneinfo/Asia/Chungking.ics
+usr/share/apps/libical/zoneinfo/Asia/Colombo.ics
+usr/share/apps/libical/zoneinfo/Asia/Damascus.ics
+usr/share/apps/libical/zoneinfo/Asia/Dhaka.ics
+usr/share/apps/libical/zoneinfo/Asia/Dili.ics
+usr/share/apps/libical/zoneinfo/Asia/Dubai.ics
+usr/share/apps/libical/zoneinfo/Asia/Dushanbe.ics
+usr/share/apps/libical/zoneinfo/Asia/Gaza.ics
+usr/share/apps/libical/zoneinfo/Asia/Harbin.ics
+usr/share/apps/libical/zoneinfo/Asia/Hong_Kong.ics
+usr/share/apps/libical/zoneinfo/Asia/Hovd.ics
+usr/share/apps/libical/zoneinfo/Asia/Irkutsk.ics
+usr/share/apps/libical/zoneinfo/Asia/Istanbul.ics
+usr/share/apps/libical/zoneinfo/Asia/Jakarta.ics
+usr/share/apps/libical/zoneinfo/Asia/Jayapura.ics
+usr/share/apps/libical/zoneinfo/Asia/Jerusalem.ics
+usr/share/apps/libical/zoneinfo/Asia/Kabul.ics
+usr/share/apps/libical/zoneinfo/Asia/Kamchatka.ics
+usr/share/apps/libical/zoneinfo/Asia/Karachi.ics
+usr/share/apps/libical/zoneinfo/Asia/Kashgar.ics
+usr/share/apps/libical/zoneinfo/Asia/Katmandu.ics
+usr/share/apps/libical/zoneinfo/Asia/Krasnoyarsk.ics
+usr/share/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics
+usr/share/apps/libical/zoneinfo/Asia/Kuching.ics
+usr/share/apps/libical/zoneinfo/Asia/Kuwait.ics
+usr/share/apps/libical/zoneinfo/Asia/Macao.ics
+usr/share/apps/libical/zoneinfo/Asia/Magadan.ics
+usr/share/apps/libical/zoneinfo/Asia/Manila.ics
+usr/share/apps/libical/zoneinfo/Asia/Muscat.ics
+usr/share/apps/libical/zoneinfo/Asia/Nicosia.ics
+usr/share/apps/libical/zoneinfo/Asia/Novosibirsk.ics
+usr/share/apps/libical/zoneinfo/Asia/Omsk.ics
+usr/share/apps/libical/zoneinfo/Asia/Phnom_Penh.ics
+usr/share/apps/libical/zoneinfo/Asia/Pontianak.ics
+usr/share/apps/libical/zoneinfo/Asia/Pyongyang.ics
+usr/share/apps/libical/zoneinfo/Asia/Qatar.ics
+usr/share/apps/libical/zoneinfo/Asia/Rangoon.ics
+usr/share/apps/libical/zoneinfo/Asia/Riyadh.ics
+usr/share/apps/libical/zoneinfo/Asia/Saigon.ics
+usr/share/apps/libical/zoneinfo/Asia/Samarkand.ics
+usr/share/apps/libical/zoneinfo/Asia/Seoul.ics
+usr/share/apps/libical/zoneinfo/Asia/Shanghai.ics
+usr/share/apps/libical/zoneinfo/Asia/Singapore.ics
+usr/share/apps/libical/zoneinfo/Asia/Taipei.ics
+usr/share/apps/libical/zoneinfo/Asia/Tashkent.ics
+usr/share/apps/libical/zoneinfo/Asia/Tbilisi.ics
+usr/share/apps/libical/zoneinfo/Asia/Tehran.ics
+usr/share/apps/libical/zoneinfo/Asia/Thimphu.ics
+usr/share/apps/libical/zoneinfo/Asia/Tokyo.ics
+usr/share/apps/libical/zoneinfo/Asia/Ujung_Pandang.ics
+usr/share/apps/libical/zoneinfo/Asia/Ulaanbaatar.ics
+usr/share/apps/libical/zoneinfo/Asia/Urumqi.ics
+usr/share/apps/libical/zoneinfo/Asia/Vientiane.ics
+usr/share/apps/libical/zoneinfo/Asia/Vladivostok.ics
+usr/share/apps/libical/zoneinfo/Asia/Yakutsk.ics
+usr/share/apps/libical/zoneinfo/Asia/Yekaterinburg.ics
+usr/share/apps/libical/zoneinfo/Asia/Yerevan.ics
+usr/share/apps/libical/zoneinfo/Atlantic/Azores.ics
+usr/share/apps/libical/zoneinfo/Atlantic/Bermuda.ics
+usr/share/apps/libical/zoneinfo/Atlantic/Canary.ics
+usr/share/apps/libical/zoneinfo/Atlantic/Cape_Verde.ics
+usr/share/apps/libical/zoneinfo/Atlantic/Faeroe.ics
+usr/share/apps/libical/zoneinfo/Atlantic/Jan_Mayen.ics
+usr/share/apps/libical/zoneinfo/Atlantic/Madeira.ics
+usr/share/apps/libical/zoneinfo/Atlantic/Reykjavik.ics
+usr/share/apps/libical/zoneinfo/Atlantic/South_Georgia.ics
+usr/share/apps/libical/zoneinfo/Atlantic/St_Helena.ics
+usr/share/apps/libical/zoneinfo/Atlantic/Stanley.ics
+usr/share/apps/libical/zoneinfo/Australia/Adelaide.ics
+usr/share/apps/libical/zoneinfo/Australia/Brisbane.ics
+usr/share/apps/libical/zoneinfo/Australia/Broken_Hill.ics
+usr/share/apps/libical/zoneinfo/Australia/Darwin.ics
+usr/share/apps/libical/zoneinfo/Australia/Hobart.ics
+usr/share/apps/libical/zoneinfo/Australia/Lindeman.ics
+usr/share/apps/libical/zoneinfo/Australia/Lord_Howe.ics
+usr/share/apps/libical/zoneinfo/Australia/Melbourne.ics
+usr/share/apps/libical/zoneinfo/Australia/Perth.ics
+usr/share/apps/libical/zoneinfo/Australia/Sydney.ics
+usr/share/apps/libical/zoneinfo/Europe/Amsterdam.ics
+usr/share/apps/libical/zoneinfo/Europe/Andorra.ics
+usr/share/apps/libical/zoneinfo/Europe/Athens.ics
+usr/share/apps/libical/zoneinfo/Europe/Belfast.ics
+usr/share/apps/libical/zoneinfo/Europe/Belgrade.ics
+usr/share/apps/libical/zoneinfo/Europe/Berlin.ics
+usr/share/apps/libical/zoneinfo/Europe/Bratislava.ics
+usr/share/apps/libical/zoneinfo/Europe/Brussels.ics
+usr/share/apps/libical/zoneinfo/Europe/Bucharest.ics
+usr/share/apps/libical/zoneinfo/Europe/Budapest.ics
+usr/share/apps/libical/zoneinfo/Europe/Chisinau.ics
+usr/share/apps/libical/zoneinfo/Europe/Copenhagen.ics
+usr/share/apps/libical/zoneinfo/Europe/Dublin.ics
+usr/share/apps/libical/zoneinfo/Europe/Gibraltar.ics
+usr/share/apps/libical/zoneinfo/Europe/Helsinki.ics
+usr/share/apps/libical/zoneinfo/Europe/Istanbul.ics
+usr/share/apps/libical/zoneinfo/Europe/Kaliningrad.ics
+usr/share/apps/libical/zoneinfo/Europe/Kiev.ics
+usr/share/apps/libical/zoneinfo/Europe/Lisbon.ics
+usr/share/apps/libical/zoneinfo/Europe/Ljubljana.ics
+usr/share/apps/libical/zoneinfo/Europe/London.ics
+usr/share/apps/libical/zoneinfo/Europe/Luxembourg.ics
+usr/share/apps/libical/zoneinfo/Europe/Madrid.ics
+usr/share/apps/libical/zoneinfo/Europe/Malta.ics
+usr/share/apps/libical/zoneinfo/Europe/Minsk.ics
+usr/share/apps/libical/zoneinfo/Europe/Monaco.ics
+usr/share/apps/libical/zoneinfo/Europe/Moscow.ics
+usr/share/apps/libical/zoneinfo/Europe/Nicosia.ics
+usr/share/apps/libical/zoneinfo/Europe/Oslo.ics
+usr/share/apps/libical/zoneinfo/Europe/Paris.ics
+usr/share/apps/libical/zoneinfo/Europe/Prague.ics
+usr/share/apps/libical/zoneinfo/Europe/Riga.ics
+usr/share/apps/libical/zoneinfo/Europe/Rome.ics
+usr/share/apps/libical/zoneinfo/Europe/Samara.ics
+usr/share/apps/libical/zoneinfo/Europe/San_Marino.ics
+usr/share/apps/libical/zoneinfo/Europe/Sarajevo.ics
+usr/share/apps/libical/zoneinfo/Europe/Simferopol.ics
+usr/share/apps/libical/zoneinfo/Europe/Skopje.ics
+usr/share/apps/libical/zoneinfo/Europe/Sofia.ics
+usr/share/apps/libical/zoneinfo/Europe/Stockholm.ics
+usr/share/apps/libical/zoneinfo/Europe/Tallinn.ics
+usr/share/apps/libical/zoneinfo/Europe/Tirane.ics
+usr/share/apps/libical/zoneinfo/Europe/Uzhgorod.ics
+usr/share/apps/libical/zoneinfo/Europe/Vaduz.ics
+usr/share/apps/libical/zoneinfo/Europe/Vatican.ics
+usr/share/apps/libical/zoneinfo/Europe/Vienna.ics
+usr/share/apps/libical/zoneinfo/Europe/Vilnius.ics
+usr/share/apps/libical/zoneinfo/Europe/Warsaw.ics
+usr/share/apps/libical/zoneinfo/Europe/Zagreb.ics
+usr/share/apps/libical/zoneinfo/Europe/Zaporozhye.ics
+usr/share/apps/libical/zoneinfo/Europe/Zurich.ics
+usr/share/apps/libical/zoneinfo/Indian/Antananarivo.ics
+usr/share/apps/libical/zoneinfo/Indian/Chagos.ics
+usr/share/apps/libical/zoneinfo/Indian/Christmas.ics
+usr/share/apps/libical/zoneinfo/Indian/Cocos.ics
+usr/share/apps/libical/zoneinfo/Indian/Comoro.ics
+usr/share/apps/libical/zoneinfo/Indian/Kerguelen.ics
+usr/share/apps/libical/zoneinfo/Indian/Mahe.ics
+usr/share/apps/libical/zoneinfo/Indian/Maldives.ics
+usr/share/apps/libical/zoneinfo/Indian/Mauritius.ics
+usr/share/apps/libical/zoneinfo/Indian/Mayotte.ics
+usr/share/apps/libical/zoneinfo/Indian/Reunion.ics
+usr/share/apps/libical/zoneinfo/Pacific/Apia.ics
+usr/share/apps/libical/zoneinfo/Pacific/Auckland.ics
+usr/share/apps/libical/zoneinfo/Pacific/Chatham.ics
+usr/share/apps/libical/zoneinfo/Pacific/Easter.ics
+usr/share/apps/libical/zoneinfo/Pacific/Efate.ics
+usr/share/apps/libical/zoneinfo/Pacific/Enderbury.ics
+usr/share/apps/libical/zoneinfo/Pacific/Fakaofo.ics
+usr/share/apps/libical/zoneinfo/Pacific/Fiji.ics
+usr/share/apps/libical/zoneinfo/Pacific/Funafuti.ics
+usr/share/apps/libical/zoneinfo/Pacific/Galapagos.ics
+usr/share/apps/libical/zoneinfo/Pacific/Gambier.ics
+usr/share/apps/libical/zoneinfo/Pacific/Guadalcanal.ics
+usr/share/apps/libical/zoneinfo/Pacific/Guam.ics
+usr/share/apps/libical/zoneinfo/Pacific/Honolulu.ics
+usr/share/apps/libical/zoneinfo/Pacific/Johnston.ics
+usr/share/apps/libical/zoneinfo/Pacific/Kiritimati.ics
+usr/share/apps/libical/zoneinfo/Pacific/Kosrae.ics
+usr/share/apps/libical/zoneinfo/Pacific/Kwajalein.ics
+usr/share/apps/libical/zoneinfo/Pacific/Majuro.ics
+usr/share/apps/libical/zoneinfo/Pacific/Marquesas.ics
+usr/share/apps/libical/zoneinfo/Pacific/Midway.ics
+usr/share/apps/libical/zoneinfo/Pacific/Nauru.ics
+usr/share/apps/libical/zoneinfo/Pacific/Niue.ics
+usr/share/apps/libical/zoneinfo/Pacific/Norfolk.ics
+usr/share/apps/libical/zoneinfo/Pacific/Noumea.ics
+usr/share/apps/libical/zoneinfo/Pacific/Pago_Pago.ics
+usr/share/apps/libical/zoneinfo/Pacific/Palau.ics
+usr/share/apps/libical/zoneinfo/Pacific/Pitcairn.ics
+usr/share/apps/libical/zoneinfo/Pacific/Ponape.ics
+usr/share/apps/libical/zoneinfo/Pacific/Port_Moresby.ics
+usr/share/apps/libical/zoneinfo/Pacific/Rarotonga.ics
+usr/share/apps/libical/zoneinfo/Pacific/Saipan.ics
+usr/share/apps/libical/zoneinfo/Pacific/Tahiti.ics
+usr/share/apps/libical/zoneinfo/Pacific/Tarawa.ics
+usr/share/apps/libical/zoneinfo/Pacific/Tongatapu.ics
+usr/share/apps/libical/zoneinfo/Pacific/Truk.ics
+usr/share/apps/libical/zoneinfo/Pacific/Wake.ics
+usr/share/apps/libical/zoneinfo/Pacific/Wallis.ics
+usr/share/apps/libical/zoneinfo/Pacific/Yap.ics
+usr/share/apps/libical/zoneinfo/zones.tab

Added: people/jriddell/KDE/3.5/kdepim/debian/libkdepim1-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkdepim1-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkdepim1-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+/usr/include/kde/kdepimmacros.h
+/usr/lib/libkdepim.la
+/usr/lib/libkdepim.so

Added: people/jriddell/KDE/3.5/kdepim/debian/libkdepim1a.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkdepim1a.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkdepim1a.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+/usr/lib/kde3/plugins/designer/kdepimwidgets.la
+/usr/lib/kde3/plugins/designer/kdepimwidgets.so
+/usr/lib/kde3/plugins/designer/kpartsdesignerplugin.la
+/usr/lib/kde3/plugins/designer/kpartsdesignerplugin.so
+/usr/lib/libkdepim.so.1
+/usr/lib/libkdepim.so.1.0.0
+/usr/share/apps/kdepimwidgets
+/usr/share/apps/libkdepim
+/usr/share/config.kcfg/pimemoticons.kcfg
+/usr/share/icons/crystalsvg/22x22/actions/button_more.png
+/usr/share/icons/crystalsvg/22x22/actions/button_fewer.png

Added: people/jriddell/KDE/3.5/kdepim/debian/libkgantt0-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkgantt0-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkgantt0-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+/usr/include/kde/kgantt
+/usr/lib/libkgantt.la
+/usr/lib/libkgantt.so

Added: people/jriddell/KDE/3.5/kdepim/debian/libkgantt0.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkgantt0.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkgantt0.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+/usr/lib/libkgantt.so.0
+/usr/lib/libkgantt.so.0.0.2
+/usr/share/apps/kgantt

Added: people/jriddell/KDE/3.5/kdepim/debian/libkleopatra1-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkleopatra1-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkleopatra1-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+/usr/include/kde/gpgme++
+/usr/include/kde/kleo
+/usr/include/kde/qgpgme
+/usr/lib/libgpgme++.la
+/usr/lib/libgpgme++.so
+/usr/lib/libkleopatra.la
+/usr/lib/libkleopatra.so
+/usr/lib/libkpgp.la
+/usr/lib/libkpgp.so
+/usr/lib/libqgpgme.la
+/usr/lib/libqgpgme.so

Added: people/jriddell/KDE/3.5/kdepim/debian/libkleopatra1.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkleopatra1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkleopatra1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+/etc/kde3/libkleopatrarc
+/usr/lib/libgpgme++.so.0
+/usr/lib/libgpgme++.so.0.2.0
+/usr/lib/libkpgp.so.2
+/usr/lib/libkpgp.so.2.2.0
+/usr/lib/libqgpgme.so.0
+/usr/lib/libqgpgme.so.0.0.0
+/usr/share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
+/usr/share/apps/kconf_update/kpgp.upd
+/usr/share/apps/libkleopatra
+/usr/share/icons/crystalsvg/16x16/apps/gpg.png
+/usr/share/icons/crystalsvg/16x16/apps/gpgsm.png
+/usr/share/icons/crystalsvg/22x22/apps/gpg.png
+/usr/share/icons/crystalsvg/22x22/apps/gpgsm.png
+/usr/share/icons/crystalsvg/32x32/apps/gpg.png
+/usr/share/icons/crystalsvg/32x32/apps/gpgsm.png
+/usr/lib/libkleopatra.so.1.0.0
+/usr/lib/libkleopatra.so.1

Added: people/jriddell/KDE/3.5/kdepim/debian/libkmime2.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkmime2.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkmime2.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+/usr/lib/libkmime.so.2
+/usr/lib/libkmime.so.2.2.0

Added: people/jriddell/KDE/3.5/kdepim/debian/libkpimexchange1-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkpimexchange1-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkpimexchange1-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+/usr/include/kde/kdepim/exchangeaccount.h
+/usr/include/kde/kdepim/exchangeclient.h
+/usr/lib/libkpimexchange.la
+/usr/lib/libkpimexchange.so

Added: people/jriddell/KDE/3.5/kdepim/debian/libkpimexchange1.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkpimexchange1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkpimexchange1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+/usr/lib/kde3/resourcecalendarexchange.la
+/usr/lib/kde3/resourcecalendarexchange.so
+/usr/lib/libkpimexchange.so.1
+/usr/lib/libkpimexchange.so.1.0.0

Added: people/jriddell/KDE/3.5/kdepim/debian/libkpimidentities1.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libkpimidentities1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libkpimidentities1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+/usr/lib/libkpimidentities.so.1
+/usr/lib/libkpimidentities.so.1.0.0

Added: people/jriddell/KDE/3.5/kdepim/debian/libksieve0-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libksieve0-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libksieve0-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+/usr/include/kde/ksieve
+/usr/lib/libksieve.la
+/usr/lib/libksieve.so

Added: people/jriddell/KDE/3.5/kdepim/debian/libksieve0.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libksieve0.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libksieve0.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+/usr/lib/libksieve.so.0
+/usr/lib/libksieve.so.0.0.0

Added: people/jriddell/KDE/3.5/kdepim/debian/libktnef1-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libktnef1-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libktnef1-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+/usr/include/kde/ktnef
+/usr/lib/libktnef.la
+/usr/lib/libktnef.so

Added: people/jriddell/KDE/3.5/kdepim/debian/libktnef1.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libktnef1.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libktnef1.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+/usr/lib/libktnef.so.1
+/usr/lib/libktnef.so.1.0.0

Added: people/jriddell/KDE/3.5/kdepim/debian/libmimelib1-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libmimelib1-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libmimelib1-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+/usr/include/kde/mimelib
+/usr/lib/libmimelib.la
+/usr/lib/libmimelib.so

Added: people/jriddell/KDE/3.5/kdepim/debian/libmimelib1c2a.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/libmimelib1c2a.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/libmimelib1c2a.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+/usr/lib/libmimelib.so.1
+/usr/lib/libmimelib.so.1.0.1

Added: people/jriddell/KDE/3.5/kdepim/debian/man/akregator.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/akregator.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/akregator.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,26 @@
+.TH AKREGATOR 1
+.SH NAME
+akregator \- Personal organizer for KDE
+.SH SYNOPSIS
+.B akregator
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B Akregator
+is a calendar application for KDE.  You can schedule appointments, events,
+and to-do tasks.  Akregator will remind you about pending tasks, and help
+you keep your schedule.  It supports event categories, highlighting
+according to category, numerous options for generating repeated events,
+emerging group scheduling support, PalmPilot synchronization, and much more.
+.SH PROGRAM OPTIONS
+.TP
+.B -a, --addfeed \fI<url>\fB
+Add a feed with the given URL.
+.TP
+.B -g, --group \fI<groupname>\fB
+When adding feeds, place them in this group.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/akregator
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/akregator').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/egroupwarewizard.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/egroupwarewizard.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/egroupwarewizard.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH EGROUPWAREWIZARD 1
+.SH NAME
+egroupwarewizard \- KDE eGroupware Wizard
+.SH SYNOPSIS
+.B egroupwarewizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B egroupwarewizard
+is a front end to configure eGroupware servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Verbose output.
+.so kdeopt.part
+

Added: people/jriddell/KDE/3.5/kdepim/debian/man/exchangewizard.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/exchangewizard.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/exchangewizard.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH EXCHANGEWIZARD 1
+.SH NAME
+exchangewizard \- MS Exchange Setup Wizard
+.SH SYNOPSIS
+.B exchangewizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B exchangewizard
+is a front end to configure Microsoft Exchange servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Enable verbose output.
+.so kdeopt.part
+

Added: people/jriddell/KDE/3.5/kdepim/debian/man/groupwarewizard.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/groupwarewizard.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/groupwarewizard.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+.TH GROUPWAREWIZARD 1
+.SH NAME
+groupwarewizard \- KDE Groupware Wizard
+.SH SYNOPSIS
+.B groupwarewizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B groupwarewizard
+is a front end to configure eGroupware, Kolab, and SUSE Linux Openexchange
+servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --serverType \fI<type>\fB
+The server type to configure.
+.so kdeopt.part
+.SH SEE ALSO
+.B egroupwarewizard
+(1),
+.B groupwisewizard
+(1),
+.B kolabwizard
+(1),
+.B sloxwizard
+(1).
+

Added: people/jriddell/KDE/3.5/kdepim/debian/man/groupwisewizard.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/groupwisewizard.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/groupwisewizard.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH GROUPWISEWIZARD 1
+.SH NAME
+groupwisewizard \- Novell GroupWise Setup Wizard
+.SH SYNOPSIS
+.B groupwisewizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B groupwisewizard
+is a front end to configure Novell GroupWise servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Enable verbose output.
+.so kdeopt.part
+

Added: people/jriddell/KDE/3.5/kdepim/debian/man/ical2vcal.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/ical2vcal.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/ical2vcal.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,20 @@
+.TH ICAL2VCAL 1
+.SH NAME
+ical2vcal \- Convert calendars from iCal to Versit vCal format
+.SH SUMMARY
+.B ical2vcal
+.I [infile] outfile
+.SH DESCRIPTION
+.B ical2vcal
+converts calendars from iCal to Versit vCal format, which is the standard
+format used internally by KOrganizer.
+.SH OPTIONS
+.TP
+.B infile
+Specifies the name of the iCal calendar file to read in.
+The default is ~/.calendar.
+.TP
+.B outfile
+Specifies the name of the vCal calendar file to write.
+.SH SEE ALSO
+.BR korganizer (1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kabc2mutt.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kabc2mutt.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kabc2mutt.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,26 @@
+.TH KABC2MUTT 1
+.SH NAME
+kabc2mutt \- kabc to mutt converter
+.SH SYNOPSIS
+.B kabc2mutt
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+kabc2mutt converts the KDE address book's entries to Mutt format.
+.SH PROGRAM OPTIONS
+.TP
+.B --query \fI<substring>\fB
+Only show contacts where name or address matches \fI<substring>\fP.
+.TP
+.B --format \fI<format>\fB
+Default format is `alias'. `query' returns
+email\fB<tab>\fPname\fB<tab>\fP, as needed by mutt's query_command.
+.TP
+.B --ignore-case
+Make queries case insensitive.
+.TP
+.B --all-addresses
+Return all mail addresses, not just the preferred one.
+.so kdeopt.part
+.SH SEE ALSO
+.B kaddressbook
+(1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kaddressbook.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kaddressbook.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kaddressbook.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,41 @@
+.TH KADDRESSBOOK 1
+.SH NAME
+kaddressbook \- The KDE Address Book
+.SH SYNOPSIS
+.B kaddressbook
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+\fBKAddressBook\fP is the main address book application for KDE; it enables
+you to manage your contacts efficiently and comfortably.  Since it is based
+on the kabc library it supports resources, which can be used to load and save
+your contacts to many different locations -- not just the local file system,
+but also to LDAP servers and SQL databases.
+
+The user interface is similar to MS Outlook and it supports different views
+to represent the contact data differently; it also provides an incremental
+search over all fields and a jump button bar to quickly access single entries.
+Since the underlying kabc library uses the vCard format (specified in RFC 2426)
+as its default storage medium, KAddressBook mainly reflects the supported
+entry fields in its graphical user interface.
+.SH PROGRAM OPTIONS
+.TP
+.B -a, --addr \fI<email>\fB
+Shows contact editor with given email address.
+.TP
+.B --uid \fI<uid>\fB
+Shows contact editor with given uid.
+.TP
+.B --editor-only
+Launches in editor only mode.
+.TP
+.B --new-contact
+Launches editor for the new contact.
+.TP
+.B --document \fI<file>\fB
+Work on given file.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kaddressbook
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kaddressbook').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kalarm.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kalarm.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kalarm.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,108 @@
+.TH KALARM 1
+.SH NAME
+kalarm \- Personal alarm message, command and email scheduler for KDE
+.SH SYNOPSIS
+.B kalarm
+.I [Qt-options] [KDE-options] [options] [message]
+.SH DESCRIPTION
+\fBKAlarm\fP is a personal alarm message, command and email scheduler. It
+lets you set up personal alarm messages which pop up on the screen at the
+chosen time, or you can schedule commands to be executed or emails to be
+sent.
+.SH PROGRAM OPTIONS
+.TP
+.B -a, --ack-confirm
+Prompt for confirmation when alarm is acknowledged.
+.TP
+.B -A, --attach \fI<url>\fB
+Attach file to email (repeat as needed).
+.TP
+.B --bcc
+Blind copy email to self.
+.TP
+.B -b, --beep
+Beep when message is displayed.
+.TP
+.B -c, --color \fI<color>\fB
+Message background color (name or hex 0xRRGGBB).
+.TP
+.B -C, --colorfg \fI<color>\fB
+Message foreground color (name or hex 0xRRGGBB).
+.TP
+.B --calendarURL \fI<url>\fB
+URL of calendar file.
+.TP
+.B --cancelEvent \fI<eventID>\fB
+Cancel alarm with the specified event ID.
+.TP
+.B -e, --exec \fI<commandline>\fB
+Execute a shell command line.
+.TP
+.B -f, --file \fI<url>\fB
+File to display.
+.TP
+.B --handleEvent \fI<eventID>\fB
+Trigger or cancel alarm with the specified event ID.
+.TP
+.B -i, --interval \fI<period>\fB
+Interval between alarm repetitions.
+.TP
+.B -l, --late-cancel
+Cancel alarm if it cannot be triggered on time.
+.TP
+.B -L, --login
+Repeat alarm at every login.
+.TP
+.B -m, --mail \fI<address>\fB
+Send an email to the given address (repeat as needed).
+.TP
+.B -p, --play \fI<url>\fB
+Audio file to play once.
+.TP
+.B -P, --play-repeat \fI<url>\fB
+Audio file to play repeatedly.
+.TP
+.B --recurrence \fI<spec>\fB
+Specify alarm recurrence using iCalendar syntax.
+.TP
+.B -R, --reminder \fI<period>\fB
+Display reminder in advance of alarm.
+.TP
+.B --reminder-once \fI<period>\fB
+Display reminder once, before first alarm recurrence.
+.TP
+.B -r, --repeat \fI<count>\fB
+Number of times to repeat alarm (including initial occasion).
+.TP
+.B --reset
+Reset the alarm scheduling daemon.
+.TP
+.B --stop
+Stop the alarm scheduling daemon.
+.TP
+.B -S, --subject
+Email subject line.
+.TP
+.B -t, --time \fI<time>\fB
+Trigger alarm at time [[[yyyy-]mm-]dd-]hh:mm, or date yyyy-mm-dd.
+.TP
+.B --tray
+Display system tray icon.
+.TP
+.B --triggerEvent \fI<eventID>\fB
+Trigger alarm with the specified event ID.
+.TP
+.B -u, --until \fI<time>\fB
+Repeat until time [[[yyyy-]mm-]dd-]hh:mm, or date yyyy-mm-dd.
+.TP
+.B -v, --volume \fI<percent>\fB
+Volume to play audio file.
+.TP
+.B message
+Message text to display.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kalarm
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kalarm').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kalarmd.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kalarmd.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kalarmd.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+.TH KALARMD 1
+.SH NAME
+kalarmd \- KDE alarm daemon
+.SH SYNOPSIS
+.B kalarmd
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B kalarmd
+runs in the background and handles displaying the events scheduled by
+\fBkalarm\fP.  You should normally not have to run this daemon manually.
+.SH PROGRAM OPTIONS
+.TP
+.B --login
+Application is being auto-started at KDE session start.
+.so kdeopt.part
+.SH SEE ALSO
+.B kalarm
+(1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kandy.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kandy.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kandy.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,35 @@
+.TH KANDY 1
+.SH NAME
+kandy \- Synchronize mobile phone address books
+.SH SYNOPSIS
+.B kandy
+.I [Qt-options] [KDE-options] [options] [profile]
+.SH DESCRIPTION
+At the moment
+.B kandy
+is more or less a terminal program with some special features to store
+commands and their parameters, but it also has a simple GUI to access the
+phone book of a mobile phone and it is able to save this phone book to the
+KDE address book.
+
+.B kandy
+is aimed at mobile phones with integrate (GSM) modems.
+.SH PROGRAM OPTIONS
+.TP
+.B --terminal
+Show terminal window.
+.TP
+.B --mobilegui
+Show mobile GUI.
+.TP
+.B --nogui
+Do not show GUI.
+.TP
+.B profile
+Filename of command profile file.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kandy
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kandy').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kandy_client.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kandy_client.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kandy_client.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,19 @@
+.TH KANDY_CLIENT 1
+.SH NAME
+kandy_client \- DCOP client for Kandy
+.SH SYNOPSIS
+.B kandy_client
+.I [Qt-options] [KDE-options] [URL]
+.SH DESCRIPTION
+.B kandy_client
+sends a URL to a running
+.B kandy
+instance.
+.SH PROGRAM OPTIONS
+.TP
+.B URL
+URL to send to \fBkandy\fP.  Default is `\fIhttp://www.kde.org'\fP.
+.so kdeopt.part
+.SH SEE ALSO
+.B kandy
+(1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/karm.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/karm.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/karm.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,23 @@
+.TH KARM 1
+.SH NAME
+karm \- KDE time tracker tool
+.SH SYNOPSIS
+.B karm
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KArm
+tracks time spent on various tasks.  It is useful for tracking billable
+hours and can report the hours logged by task and day.  This time history
+can be exported to a comma-delimited text file for import into other billing
+and/or project management tools.
+
+.B KArm
+detects when your keyboard and mouse are idle and can associate different
+tasks with different desktops, two tools that can help keep the timer
+running on the correct task.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/karm
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/karm').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kdeopt.part
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kdeopt.part	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kdeopt.part	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,110 @@
+.\" This portion of the manual page is from kdeopt.man, from the
+.\" kdepim Debian package.
+.SH GENERIC OPTIONS
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-kde
+Show KDE specific options.
+.TP
+.B \-\-help-all
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+.TP
+.B \-\-license
+Show license information.
+.TP
+.B \-\-
+End of options.
+.SH QT OPTIONS
+.TP
+.B \-\-display \fI<displayname>\fB
+Use the X-server display `displayname'.
+.TP
+.B \-\-session \fI<sessionId>\fB
+Restore the application for the given `sessionId'.
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8\-bit
+display.
+.TP
+.B \-\-ncols \fI<count>\fB
+Limits the number of colors allocated in the color cube on an 8\-bit
+display, if the application is using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit \-nograb, use \-dograb
+to override.
+.TP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.B \-\-fn, \-\-font \fI<fontname>\fB
+Defines the application font.
+.TP
+.B \-\-bg, \-\-background \fI<color>\fB
+Sets the default background color and an application palette (light
+and dark shades are calculated).
+.TP
+.B \-\-fg, \-\-foreground \fI<color>\fB
+Sets the default foreground color.
+.TP
+.B \-\-btn, \-\-button \fI<color>\fB
+Sets the default button color.
+.TP
+.B \-\-name \fI<name>\fB
+Sets the application name.
+.TP
+.B \-\-title \fI<title>\fB
+Sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on an 8-bit display.
+.TP
+.B \-\-inputstyle \fI<inputstyle>\fB
+Sets XIM (X Input Method) input style. Possible values are
+\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
+.TP
+.B \-\-im \fI<XIM server>\fB
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+.SH KDE OPTIONS
+.TP
+.B \-\-caption \fI<caption>\fB
+Use `caption' as name in the titlebar.
+.TP
+.B \-\-icon \fI<icon>\fB
+Use `icon' as the application icon.
+.TP
+.B \-\-miniicon \fI<icon>\fB
+Use `icon' as the icon in the titlebar.
+.TP
+.B \-\-dcopserver \fI<server>\fB
+Use the DCOP Server specified by `server'.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.B \-\-style \fI<style>\fB
+Sets the application GUI style.
+.TP
+.B \-\-geometry \fI<geometry>\fB
+Sets the client geometry of the main widget.

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kitchensync.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kitchensync.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kitchensync.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+.TH KITCHENSYNC 1
+.SH NAME
+kitchensync \- Synchronize Data with KDE
+.SH SYNOPSIS
+.B kitchensync
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kitchensync
+is a synchronization framework, still under heavy development.
+.so kdeopt.part
+

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kleopatra.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kleopatra.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kleopatra.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+.TH KLEOPATRA 1
+.SH NAME
+kleopatra \- KDE X.509 key manager
+.SH SYNOPSIS
+.B kleopatra
+.I [Qt-options] [KDE-options] [options] [address|URL]
+.SH DESCRIPTION
+.B Kleopatra
+is the KDE tool for managing X.509 certificates in the GpgSM keybox and for
+retrieving certificates from LDAP servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --external
+Search for external certificates initially.
+.TP
+.B --query
+Initial query string.
+.TP
+.B --import-certificate
+Name of certificate file to import.
+.TP
+.B URL
+Attach the file that `URL' points to.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kleopatra
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kleopatra').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kmail.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kmail.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kmail.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,54 @@
+.TH KMAIL 1
+.SH NAME
+kmail \- KDE email client
+.SH SYNOPSIS
+.B kmail
+.I [Qt-options] [KDE-options] [options] [address|URL]
+.SH DESCRIPTION
+.B KMail
+is a fully-featured email client that fits nicely into the KDE desktop.
+It has features such as support for IMAP, POP3, multiple accounts,
+mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
+.SH PROGRAM OPTIONS
+.TP
+.B -s, --subject \fI<subject>\fB
+Set subject of message.
+.TP
+.B -c, --cc \fI<address>\fB
+Send CC: to `address'.
+.TP
+.B -b, --bcc \fI<address>\fB
+Send BCC: to `address'.
+.TP
+.B -h, --header \fI<header>\fB
+Add `header' to message.
+.TP
+.B --msg \fI<file>\fB
+Read message body from `file'.
+.TP
+.B --body \fI<text>\fB
+Set body of message.
+.TP
+.B --attach \fI<url>\fB
+Add an attachment to the mail. This can be repeated.
+.TP
+.B --check
+Only check for new mail.
+.TP
+.B --composer
+Only open composer window.
+.TP
+.B --view \fI<url>\fB
+View the given message file.
+.TP
+.B address
+Send message to `address'.
+.TP
+.B URL
+Attach the file that `URL' points to.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kmail
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kmail').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kmail_antivir.sh.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kmail_antivir.sh.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kmail_antivir.sh.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+.TH KMAIL_ANTIVIR.SH 1
+.SH NAME
+kmail_antivir.sh \- H+BEDV AntiVir backend for KMail
+.SH DESCRIPTION
+This shell script is used internally by \fBkmail\fP. Users should not run it
+directly.
+.SH SEE ALSO
+.BR kmail (1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kmail_clamav.sh.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kmail_clamav.sh.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kmail_clamav.sh.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+.TH KMAIL_CLAMAV.SH 1
+.SH NAME
+kmail_clamav.sh \- Clam Anti-Virus backend for KMail
+.SH DESCRIPTION
+This shell script is used internally by \fBkmail\fP. Users should not run it
+directly.
+.SH SEE ALSO
+.BR kmail (1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kmail_fprot.sh.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kmail_fprot.sh.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kmail_fprot.sh.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+.TH KMAIL_FPROT.SH 1
+.SH NAME
+kmail_fprot.sh \- F-Prot Anti-Virus backend for KMail
+.SH DESCRIPTION
+This shell script is used internally by \fBkmail\fP. Users should not run it
+directly.
+.SH SEE ALSO
+.BR kmail (1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kmail_sav.sh.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kmail_sav.sh.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kmail_sav.sh.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+.TH KMAIL_SAV.SH 1
+.SH NAME
+kmail_sav.sh \- Sophos Anti-Virus backend for KMail
+.SH DESCRIPTION
+This shell script is used internally by \fBkmail\fP. Users should not run it
+directly.
+.SH SEE ALSO
+.BR kmail (1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kmailcvt.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kmailcvt.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kmailcvt.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH KMAILCVT 1
+.SH NAME
+kmailcvt \- KMail import filters
+.SH SYNOPSIS
+.B kmailcvt
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B kmailcvt
+provides a frontend to import mail folders into \fBkmail\fP.  Supported
+formats include Outlook Express, mbox files, plain text, Pegasus-Mail,
+and Evolution.
+.so kdeopt.part
+.SH SEE ALSO
+.B kmail
+(1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/knode.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/knode.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/knode.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+.TH KNODE 1
+.SH NAME
+knode \- KDE news reader
+.SH SYNOPSIS
+.B knode
+.I [Qt-options] [KDE-options] [url]
+.SH DESCRIPTION
+.B KNode
+is an easy-to-use, convenient newsreader; it is intended to allow even
+newbies to use a newsreader under KDE, but it also offers advanced features
+appealing to experienced users.
+.SH PROGRAM OPTIONS
+.TP
+.B url
+A `news://server/group' URL.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/knode
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/knode').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/knotes.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/knotes.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/knotes.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,23 @@
+.TH KNOTES 1
+.SH NAME
+knotes \- Sticky notes application for KDE
+.SH SYNOPSIS
+.B knotes
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KNotes
+is a program that lets you write the computer equivalent of sticky notes.
+The notes are saved automatically when you exit the program, and they
+display when you open the program.  You may print and mail your notes if
+you configure
+.B KNotes
+to use helper applications.
+
+Display features of notes such as color and font may be customized for each
+note.  You may also customize the defaults.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/knotes
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/knotes').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kode.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kode.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kode.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,62 @@
+.TH KODE 1
+.SH NAME
+kode \- KDE code generator
+.SH SYNOPSIS
+.B kode
+.I [Qt-options] [KDE-options] [options] [filename]
+.SH DESCRIPTION
+.B Kode
+generates various types of C++ template files.
+.SH PROGRAM OPTIONS
+.TP
+.B -c, --create-class
+Create a class.
+.TP
+.B -d, --create-dialog
+Create a dialog.
+.TP
+.B --create-kioslave
+Create a kioslave.
+.TP
+.B -y, --codify
+Create generator code for the given source.
+.TP
+.B --add-property
+Add a property to the class.
+.TP
+.B --inplace
+Change the output file in place.
+.TP
+.B --author-email \fI<name>\fB
+Add an author with the given email address.
+.TP
+.B --project \fI<name>\fB
+Give the project name.
+.TP
+.B --gpl
+Use the GPL as the license.
+.TP
+.B --lgpl
+Use the LGPL as the license.
+.TP
+.B --classname \fI<name>\fB
+Specifies the name of the class.
+.TP
+.B --namespace \fI<name>\fB
+Specifies the namespace in which to place the class.
+.TP
+.B --warning
+Enable warnings about code generation.
+.TP
+.B --qt-exception
+Add a QT exception to the GPL.
+.TP
+.B --singleton
+Create a singleton class.
+.TP
+.B --protocol
+Specifies the kioslave protocol name.
+.TP
+.B filename
+Specifies the source code file name for output.
+.so kdeopt.part

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kolabwizard.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kolabwizard.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kolabwizard.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH KOLABWIZARD 1
+.SH NAME
+kolabwizard \- KDE Kolab Wizard
+.SH SYNOPSIS
+.B kolabwizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B kolabwizard
+is a front end to configure Kolab servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Verbose output.
+.so kdeopt.part
+

Added: people/jriddell/KDE/3.5/kdepim/debian/man/konsolekalendar.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/konsolekalendar.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/konsolekalendar.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,112 @@
+.TH KONSOLEKALENDAR 1
+.SH NAME
+konsolekalendar \- Command line interface to KDE calendars
+.SH SYNOPSIS
+.B konsolekalendar
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B KonsoleKalendar
+is a command line interface to KDE calendars.  It lets you view, insert,
+remove, or modify calendar events by way of the command line or from a
+scripting language.  Additionally,
+.B KonsoleKalendar
+can create a new KDE calendar, export a KDE calendar to a variety of other
+formats, and import another KDE calendar.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Print helpful runtime messages.
+.TP
+.B --dry-run
+Print what would have been done, but do not execute
+.TP
+.B --file \fI<calendar-file>\fB
+Specify which calendar you want to use.
+.LP
+
+Major operation modes:
+.TP
+.B --view
+Print calendar events in specified export format.
+.TP
+.B --add
+Insert an event into the calendar.
+.TP
+.B --change
+Modify an existing calendar event.
+.TP
+.B --delete
+Remove an existing calendar event.
+.TP
+.B --create
+Create new calendar file if one does not exist.
+.TP
+.B --import \fI<import-file>\fB
+Import this calendar to main calendar.
+.LP
+
+Operation modifiers:
+.TP
+.B --all
+View all calendar entries
+.TP
+.B --next
+View next activity in calendar.
+.TP
+.B --show-next \fI<days>\fB
+From start date show next # days' activities.
+.TP
+.B --uid \fI<uid>\fB
+Event Unique-string identifier.
+.TP
+.B --date \fI<start-date>\fB
+Start from this day [YYYY-MM-DD].
+.TP
+.B --time \fI<start-time>\fB
+Start from this time [HH:MM:SS].
+.TP
+.B --end-date \fI<end-date>\fB
+End at this day [YYYY-MM-DD].
+.TP
+.B --end-time \fI<end-time>\fB
+End at this time [HH:MM:SS].
+.TP
+.B --epoch-start \fI<epoch-time>\fB
+Start from this time [secs since epoch].
+.TP
+.B --epoch-end \fI<epoch-time>\fB
+End at this time [secs since epoch].
+.TP
+.B --summary \fI<summary>\fB
+Add summary to event (for add/change modes).
+.TP
+.B --description \fI<description>\fB
+Add description to event (for add/change modes).
+.TP
+.B --location \fI<location>\fB
+Add location to event (for add/change modes).
+.LP
+
+Export options:
+.TP
+.B --export-type \fI<export-type>\fB
+Export file type (Default: text).
+.TP
+.B --export-file \fI<export-file>\fB
+Export to file (Default: stdout).
+.TP
+.B --export-list
+Print list of export types supported and exit.
+.so kdeopt.part
+.SH EXAMPLES
+konsolekalendar --view
+
+konsolekalendar --add --date 2003-06-04 --time 10:00 --end-time 12:00
+--summary "Doctor Visit" --description "Get My Head Examined"
+
+konsolekalendar --delete --uid KOrganizer-1740326.803
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/konsolekalendar
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/konsolekalendar').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kontact.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kontact.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kontact.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+.TH KONTACT 1
+.SH NAME
+kontact \- Integrated KDE personal information management application
+.SH SYNOPSIS
+.B kontact
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B Kontact
+is the integrated solution for personal information management.  It combines
+the well-known KDE applications for email, scheduling, address book, notes
+and newsgroups (KMail, KOrganizer, KAddressBook, KNotes and KNode) into a
+single interface.  Being based on a true component framework Kontact provides
+exactly the same functionality as the stand-alone applications, and adds
+more features, by making use of the integrated way Kontact runs the
+applications as components.  Users still retain the choice of which
+applications are run within Kontact and which are run stand-alone.
+.SH PROGRAM OPTIONS
+.TP
+.B --module \fI<module>\fB
+Start with a specific Kontact module.
+.TP
+.B --nosplash
+Disable the splash screen.
+.TP
+.B --list
+List all possible modules and exit.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kontact
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kontact').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/korgac.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/korgac.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/korgac.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH KORGAC 1
+.SH NAME
+korgac \- KOrganizer alarm daemon
+.SH SYNOPSIS
+.B korgac
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B korgac
+runs in the background and handles displaying alarms from the KOrganizer
+calendar.  It is normally started at login and displays an icon in the
+Kicker system tray, but if you have disabled this
+feature you may need to start korgac manually.
+.so kdeopt.part
+.SH SEE ALSO
+.BR korganizer (1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/korganizer.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/korganizer.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/korganizer.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,26 @@
+.TH KORGANIZER 1
+.SH NAME
+korganizer \- Personal organizer for KDE
+.SH SYNOPSIS
+.B korganizer
+.I [Qt-options] [KDE-options] [options] [calendar]
+.SH DESCRIPTION
+.B KOrganizer
+is a calendar application for KDE.  You can schedule appointments, events,
+and to-do tasks.  KOrganizer will remind you about pending tasks, and help
+you keep your schedule.  It supports event categories, highlighting
+according to category, numerous options for generating repeated events,
+emerging group scheduling support, PalmPilot synchronization, and much more.
+.SH PROGRAM OPTIONS
+.TP
+.B -i, --import \fI<url>\fB
+Import calendar at `url' into default calendar.
+.TP
+.B calendar
+A calendar file to load.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/korganizer
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/korganizer').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/korn.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/korn.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/korn.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+.TH KORN 1
+.SH NAME
+korn \- Sticky notes application for KDE
+.SH SYNOPSIS
+.B korn
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KOrn
+is a KDE mail checker that has the capability to dock itself to Kicker.
+KOrn can check mbox, qmail, POP3, and Imap4 mailboxes, as well as nntp
+servers.  KOrn checks your mail on an interval that is user specified for
+each separate account.  Once mail is received you can have KOrn run a
+third party program of your wish or change the color/icon of KOrn while
+docked in Kicker.  In addition to this you can have KOrn run a program
+once you click on the docked icon in Kicker.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/korn
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/korn').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kpalmdoc.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kpalmdoc.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kpalmdoc.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+.TH KPALMDOC 1
+.SH NAME
+kpalmdoc \- KDE converter for PalmDOC texts
+.SH SYNOPSIS
+.B kpalmdoc
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KPalmDOC
+provides a user interface to converting between text files and PalmDOC files.
+Note that KPilot can also handle these conversions internally using the
+PalmDOC conduit.
+.so kdeopt.part
+.SH SEE ALSO
+.BR kpilot (1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kpilot.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kpilot.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kpilot.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,28 @@
+.TH KPILOT 1
+.SH NAME
+kpilot \- Palm Pilot synchronization software for KDE
+.SH SYNOPSIS
+.B kpilot
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B KPilot
+is an application that synchronizes a PalmPilot or similar device with
+the KDE desktop, much like the Palm Desktop HotSync software does for
+Windows.  KPilot can backup, restore, and HotSync your PalmPilot.  It can
+synchronize the built-in applications with their KDE counterparts.  It also
+features additional conduits for third-party software.
+.SH PROGRAM OPTIONS
+.TP
+.B -s, --setup
+Setup the Pilot device, conduits and other parameters.
+.TP
+.B -c, --conduit-setup
+Deprecated, use
+.B --setup
+instead.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kpilot
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kpilot').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kpilotDaemon.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kpilotDaemon.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kpilotDaemon.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+.TH KPILOTDAEMON 1
+.SH NAME
+kpilotDaemon \- KPilot server
+.SH SYNOPSIS
+.B kpilotDaemon
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B kpilotDaemon
+is a program that runs in the background and handles the actual communication
+with the PalmPilot device.  It is run automatically when needed, so you
+normally should not have to run it manually.
+.SH PROGRAM OPTIONS
+.TP
+.B --fail-silently
+Fail instead of complaining about bad configuration files.
+.so kdeopt.part
+.SH SEE ALSO
+.BR kpilot (1).

Added: people/jriddell/KDE/3.5/kdepim/debian/man/ksync.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/ksync.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/ksync.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH KSYNC 1
+.SH NAME
+ksync \- KDE synchronization framework
+.SH SYNOPSIS
+.B ksync
+.I [Qt-options] [KDE-options] [file]
+.SH DESCRIPTION
+.B KSync
+allows you to synchronize calendar, bookmark, and address book data with
+external sources.
+.SH PROGRAM OPTIONS
+.TP
+.B file
+File to open.
+.so kdeopt.part

Added: people/jriddell/KDE/3.5/kdepim/debian/man/ktnef.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/ktnef.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/ktnef.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+.TH KTNEF 1
+.SH NAME
+ktnef \- TNEF file viewer
+.SH SYNOPSIS
+.B ktnef
+.I [Qt-options] [KDE-options] [file]
+.SH DESCRIPTION
+.B Ktnef
+is an application for to view TNEF mail attachments.  These attachments are
+usually found in mails coming from Microsoft mail servers and embed the mail
+properties as well as the actual attachments.
+.SH PROGRAM OPTIONS
+.TP
+.B file
+Attachment file to view.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/ktnef
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/ktnef').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kwatchgnupg.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kwatchgnupg.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kwatchgnupg.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+.TH KWATCHGNUPG 1
+.SH NAME
+kwatchgnupg \- GnuPG log viewer
+.SH SYNOPSIS
+.B kwatchgnupg
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B KWatchGnuPG
+is a simple GnuPG log viewer for GnuPG.  It works as a GUI wrapper around
+the command line tool \fBwatchgnupg\fP, which listens on a socket for log lines
+from the GnuPG backend applications.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/kwatchgnupg
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/kwatchgnupg').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/kxml_compiler.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/kxml_compiler.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/kxml_compiler.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,24 @@
+.TH KXML_COMPILER 1
+.SH NAME
+kxml_compiler \- KDE XML compiler
+.SH SYNOPSIS
+.B kxml_compiler
+.I [Qt-options] [KDE-options] [options] dtd
+.SH DESCRIPTION
+.B kxml_compiler
+generates parsers and container classes for XML data described by
+RelaxNG schemes.
+.SH PROGRAM OPTIONS
+.TP
+.B -d, --directory \fI<dir>\fB
+Directory to generate files in.  The default is the current directory.
+.TP
+.B --external-parser
+Generate the parser in a separate source file.
+.TP
+.B --custom-parser
+Generate a parser customized for the schema.
+.TP
+.B dtd
+Specifies the name of the DTD file.
+.so kdeopt.part

Added: people/jriddell/KDE/3.5/kdepim/debian/man/multisynk.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/multisynk.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/multisynk.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+.TH MULTISYNK 1
+.SH NAME
+multisynk \- KDE synchronization application
+.SH SYNOPSIS
+.B multisynk
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B MultiSynk
+is a frontend for KDE's synchronization framework kitchensync.  This
+framework lets you synchronize a lot of mobile devices like handhelds
+and mobile phones with your KDE desktop, but also offers the possibility
+to synchronize two or more KDE desktops directly.
+.so kdeopt.part
+.SH SEE ALSO
+More detailed user documentation is available from
+.BR help:/multisynk
+(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
+help:/multisynk').

Added: people/jriddell/KDE/3.5/kdepim/debian/man/networkstatustestservice.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/networkstatustestservice.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/networkstatustestservice.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH NETWORKSTATUSTESTSERVICE 1
+.SH NAME
+networkstatustestservice \- Test application for the NetworkStatus monitor
+.SH SYNOPSIS
+.B networkstatustestservice
+.I [Qt-options] [KDE-options]
+.SH DESCRIPTION
+.B networkstatustestservice
+sets up a test application for the KDE network status monitor.  After it
+starts, you can communicate with it using
+.B dcop
+(1).
+.SH PROGRAM OPTIONS
+.TP
+.so kdeopt.part

Added: people/jriddell/KDE/3.5/kdepim/debian/man/sloxwizard.man
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/man/sloxwizard.man	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/man/sloxwizard.man	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+.TH SLOXWIZARD 1
+.SH NAME
+sloxwizard \- KDE Openexchange Wizard
+.SH SYNOPSIS
+.B sloxwizard
+.I [Qt-options] [KDE-options] [options]
+.SH DESCRIPTION
+.B sloxwizard
+is a front end to configure SUSE Linux Openexchange servers.
+.SH PROGRAM OPTIONS
+.TP
+.B --verbose
+Verbose output.
+.so kdeopt.part
+

Added: people/jriddell/KDE/3.5/kdepim/debian/networkstatus.install
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/networkstatus.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/networkstatus.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+/usr/bin/networkstatustestservice
+/usr/lib/kde3/kded_networkstatus.la
+/usr/lib/kde3/kded_networkstatus.so
+/usr/share/services/kded/networkstatus.desktop

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

Added: people/jriddell/KDE/3.5/kdepim/debian/patches/11_lib_link.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/11_lib_link.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/patches/11_lib_link.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+Index: kalarm/kalarmd/Makefile.am
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/kalarmd/Makefile.am,v
+retrieving revision 1.52
+diff -u -r1.52 Makefile.am
+--- kalarm/kalarmd/Makefile.am	20 Feb 2005 20:24:55 -0000	1.52
++++ kalarm/kalarmd/Makefile.am	6 Mar 2005 06:55:31 -0000
+@@ -3,7 +3,7 @@
+ noinst_LTLIBRARIES = libkalarmd.la
+ 
+ libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-libkalarmd_la_LIBADD  = $(LIB_KDECORE)
++libkalarmd_la_LIBADD  = $(LIB_KDECORE) $(top_builddir)/libkcal/libkcal.la
+ libkalarmd_la_SOURCES =  alarmdaemoniface.stub alarmguiiface.stub
+ 
+ bin_PROGRAMS = kalarmd

Added: people/jriddell/KDE/3.5/kdepim/debian/patches/12_kmail_nofinal.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/12_kmail_nofinal.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/patches/12_kmail_nofinal.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+Index: kmail/Makefile.am
+===================================================================
+RCS file: /home/kde/kdepim/kmail/Makefile.am,v
+retrieving revision 1.286.2.4
+diff -u -r1.286.2.4 Makefile.am
+--- kmail/Makefile.am	19 Oct 2004 19:54:52 -0000	1.286.2.4
++++ kmail/Makefile.am	11 Dec 2004 23:04:20 -0000
+@@ -1,4 +1,4 @@
+-#KDE_OPTIONS = nofinal
++KDE_OPTIONS = nofinal
+ KDE_CXXFLAGS = $(USE_RTTI)
+ 
+ SUBDIRS = interfaces . about pics profiles avscripts

Added: people/jriddell/KDE/3.5/kdepim/debian/patches/13_mimelib_self_contained.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/13_mimelib_self_contained.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/patches/13_mimelib_self_contained.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+diff -urN kdepim-3.4.3.old/mimelib/Makefile.am kdepim-3.4.3/mimelib/Makefile.am
+--- kdepim-3.4.3.old/mimelib/Makefile.am	2005-12-01 20:44:15.000000000 +0100
++++ kdepim-3.4.3/mimelib/Makefile.am	2005-12-01 20:01:45.000000000 +0100
+@@ -57,7 +57,7 @@
+     uuencode.cpp \
+     binhex.cpp
+ 
+-libmimelib_la_LDFLAGS = -L$(kde_libraries) -lkdefakes -version-info 1:1 -no-undefined
++libmimelib_la_LDFLAGS = -L$(kde_libraries) -lkdefakes_pic -version-info 1:1 -no-undefined
+ 
+ check_PROGRAMS = test_boyermor
+ 
+diff -urN kdepim-3.4.3.old/mimelib/mimelib/config.h kdepim-3.4.3/mimelib/mimelib/config.h
+--- kdepim-3.4.3.old/mimelib/mimelib/config.h	2005-10-05 15:37:00.000000000 +0200
++++ kdepim-3.4.3/mimelib/mimelib/config.h	2005-12-01 20:46:32.000000000 +0100
+@@ -125,8 +125,7 @@
+ #      define DW_EXPORT __declspec(dllimport)
+ #   endif
+ #else
+-#   include <kdepimmacros.h>
+-#   define DW_EXPORT KDE_EXPORT
++#   define DW_EXPORT /* empty */
+ #endif
+ 
+ //-----------------------------------------------------------------------------

Added: people/jriddell/KDE/3.5/kdepim/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/patches/common/07_disable-visibility.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/common/07_disable-visibility.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/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/kdepim/debian/patches/kubuntu_01_kmenu_tidy.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_01_kmenu_tidy.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_01_kmenu_tidy.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,38 @@
+--- kdepim/kmail/KMail.desktop	2005-03-17 00:05:41.682993320 +0000
++++ kdepim/kmail/KMail.desktop	2005-03-17 00:05:54.745007592 +0000
+@@ -81,3 +81,4 @@
+ X-DCOP-ServiceName=kmail
+ ServiceTypes=DCOP/ResourceBackend/IMAP,DCOP/Mailer
+ Categories=Qt;KDE;Network;
++NoDisplay=true
+
+--- kdepim/kaddressbook/kaddressbook.desktop	2005-03-17 00:08:51.743099792 +0000
++++ kdepim/kaddressbook/kaddressbook.desktop	2005-03-17 00:08:59.158972408 +0000
+@@ -46,3 +46,4 @@
+ ServiceTypes=KParts/ReadOnlyPart,Browser/View,DCOP/AddressBook
+ X-KDE-Library=libkaddressbookpart
+ Categories=Qt;KDE;Office;
++NoDisplay=true
+
+--- kdepim/korganizer/korganizer.desktop	2005-03-17 00:09:33.151804712 +0000
++++ kdepim/korganizer/korganizer.desktop	2005-03-17 00:09:45.933861544 +0000
+@@ -126,3 +126,4 @@
+ X-DCOP-ServiceType=Unique
+ X-DCOP-ServiceName=korganizer
+ Categories=Qt;KDE;Office;
++NoDisplay=true
+
+--- kdepim/kitchensync/multisynk/multisynk.desktop	2005-11-13 18:12:14.000000000 +0000
++++ kdepim/kitchensync/multisynk/multisynk.desktop	2005-11-13 18:16:19.000000000 +0000
+@@ -49,3 +49,4 @@
+ ServiceTypes=KParts/ReadOnlyPart
+ X-KDE-Library=libmultisynkpart
+ Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;
++NoDisplay=true
+--- kdepim/knode/KNode.desktop	2005-03-17 00:07:40.430940888 +0000
++++ kdepim/knode/KNode.desktop	2005-03-17 00:07:49.029633688 +0000
+@@ -74,3 +74,4 @@
+ X-KDE-StartupNotify=true
+ X-DCOP-ServiceType=Unique
+ Categories=Qt;KDE;Network;
++NoDisplay=true

Added: people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_04_kpalmdoc_kmenu_tidy.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_04_kpalmdoc_kmenu_tidy.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_04_kpalmdoc_kmenu_tidy.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+--- kdepim/kpilot/conduits/docconduit/kpalmdoc.desktop	2005-11-08 22:33:38.000000000 +0000
++++ kdepim/kpilot/conduits/docconduit/kpalmdoc.desktop	2005-11-13 18:24:43.000000000 +0000
+@@ -55,3 +55,4 @@
+ X-KDE-StartupNotify=true
+ X-DCOP-ServiceType=Unique
+ Categories=Qt;KDE;Utility;X-KDE-Utilities-File;
++NoDisplay=true

Added: people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_05_ktnef_kmenu_tidy.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_05_ktnef_kmenu_tidy.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_05_ktnef_kmenu_tidy.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+--- kdepim/ktnef/gui/ktnef.desktop~	2005-11-08 22:33:42.000000000 +0000
++++ kdepim/ktnef/gui/ktnef.desktop	2005-11-13 18:25:28.000000000 +0000
+@@ -82,3 +82,4 @@
+ Terminal=false
+ MimeType=application/ms-tnef;
+ Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;
++NoDisplay=true

Added: people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_06_add_akregator_feed.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_06_add_akregator_feed.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_06_add_akregator_feed.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,19 @@
+--- kdepim-3.4.3/akregator/src/akregator_part.cpp	2005-10-10 18:00:19.000000000 +0000
++++ kdepim-3.4.3/akregator/src/akregator_part.cpp	2005-10-10 18:01:11.000000000 +0000
+@@ -415,6 +415,16 @@
+     look.setAttribute("xmlUrl","http://www.kde.org/kde-look-content.rdf");
+     mainFolder.appendChild(look);
+ 
++    QDomElement kubuntu = doc.createElement( "outline" );
++    kubuntu.setAttribute("text",i18n("Kubuntu"));
++    kubuntu.setAttribute("xmlUrl","http://kubuntu.org/kubuntu.rss");
++    mainFolder.appendChild(kubuntu);
++
++    QDomElement fridge = doc.createElement( "outline" );
++    fridge.setAttribute("text",i18n("Ubuntu Fridge"));
++    fridge.setAttribute("xmlUrl","http://fridge.ubuntu.com/node/feed");
++    mainFolder.appendChild(fridge);
++
+     return doc;
+ }
+ 

Added: people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_07_autostart_kdeonly.diff
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_07_autostart_kdeonly.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/patches/kubuntu_07_autostart_kdeonly.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+--- kdepim/korganizer/korgac/korgac.desktop	(revision 507500)
++++ kdepim/korganizer/korgac/korgac.desktop	(working copy)
+@@ -66,3 +66,4 @@
+ X-KDE-autostart-after=panel
+ X-KDE-autostart-condition=korgacrc:General:Autostart:true
+ NoDisplay=true
++OnlyShowIn=KDE;

Added: people/jriddell/KDE/3.5/kdepim/debian/po/POTFILES.in
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/po/POTFILES.in	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/po/POTFILES.in	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] kpilot.templates

Added: people/jriddell/KDE/3.5/kdepim/debian/po/da.po
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/po/da.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/po/da.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,61 @@
+# translation of da.po to Danish
+# translation of pilot-link debconf to Danish
+# Claus Hindsgaul <claus_h at image.dk>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: da\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: 2004-02-16 20:54+0100\n"
+"Last-Translator: Claus Hindsgaul <claus_h at image.dk>\n"
+"Language-Team: Danish <dansk at klid.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr "Ingen, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr "Hvilken kommunikationsport skal bruges til din Palm?"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr ""
+"Der bliver oprettet en symbolsk lÃ¦nke fra /dev/pilot til den port, der skal "
+"bruges til at snakke med din Palm."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr ""
+"ttyS? er fire serielle porte, ircomm0 er IrDA-porten (infrarÃ¸d), ttyUSB? er "
+"USB-portene."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr ""
+"For at lette brugen af den Palm, der er forbundet til porten, vil dennes "
+"adgangsrettigheder blive Ã¸get, sÃ¥ enhver bruger fÃ¥r adgang til den. Hvis det "
+"er et sikkerhedsproblem for dig, sÃ¥ vÃ¦lg \"Ingen\" og hÃ¥ndtÃ©r selv lÃ¦nken og "
+"adgangsrettighederne."

Added: people/jriddell/KDE/3.5/kdepim/debian/po/de.po
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/po/de.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/po/de.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,70 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Erik Schanze <mail at erikschanze.de>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: jpilot_0.99.7-7_de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: 2004-08-09 18:31+0200\n"
+"Last-Translator: Erik Schanze <mail at erikschanze.de>\n"
+"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr "kein, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr "Welchen Anschluss fÃ¼r den Palm benutzen?"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr ""
+"Ein symbolischer Link /dev/pilot sollte angelegt werden, der auf den "
+"Anschluss zeigt, der fÃ¼r den Datenaustausch mit dem Palm benutzt wird."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr ""
+"ttyS? sind die seriellen AnschlÃ¼sse (COM ?), ircomm0 ist der IrDA-(Infrarot)-"
+"Anschluss, ttyUSB? sind die USB-AnschlÃ¼sse."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr ""
+"FÃ¼r einen einfachen Umgang mit den Palm, werden die Zugriffsrechte des "
+"jeweiligen Anschlusses herunter gesetzt, damit jeder Benutzer zugreifen "
+"kann. Wenn das fÃ¼r Sie ein Sicherheitsrisiko ist, wÃ¤hlen Sie \"kein\" aus "
+"und legen den Link mit den gewÃ¼nschten Zugriffsrechten selbst an."

Added: people/jriddell/KDE/3.5/kdepim/debian/po/fr.po
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/po/fr.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/po/fr.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pilot-link 0.11.7-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: 2003-08-14 22:08+CEST\n"
+"Last-Translator: Ludovic Rousseau <rousseau at debian.org>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr "Aucun, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr "Quel port de communication utiliser avec le Palm ?"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr ""
+"Un lien symbolique /dev/pilot peut être créé vers le port utilisé pour "
+"communiquer avec le Palm."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr ""
+"ttyS? sont les quatre ports série, ircomm0 est le port IrDA (infra rouge), "
+"ttyUSB? sont les ports USB."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr ""
+"Pour faciliter l'utilisation du Palm connecté à ce port, sa sécurité va être "
+"affaiblie en permettant un accès pour tous les utilisateurs. Si cela "
+"représente un problème de sécurité pour vous, choisissez « Aucun » et gérer "
+"le lien et ses droits d'accès vous-même."

Added: people/jriddell/KDE/3.5/kdepim/debian/po/ja.po
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/po/ja.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/po/ja.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,68 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: 2004-01-08 20:07+0900\n"
+"Last-Translator: Hideki Yamane <henrich at samba.gr.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr "¤É¤ì¤Ç¤â¤Ê¤¤, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr "¤É¤ÎÀÜÂ³¥Ý¡¼¥È¤ò Palm ¤ÇÍøÍÑ¤·¤Þ¤¹¤«?"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr ""
+"Palm ¤ÈÄÌ¿®¤¹¤ë°Ù¤Î¥Ý¡¼¥È¤È¤·¤Æ ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ /dev/pilot ¤¬ºî¤é¤ì¤Þ¤¹¡£"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr ""
+"ttyS? ¤Ï4¤Ä¤Î¥·¥ê¥¢¥ë¥Ý¡¼¥È¡¢ircomm0 ¤Ï IrDA (ÀÖ³°ÀþÀÜÂ³) ¥Ý¡¼¥È¡¢ttyUSB? ¤Ï "
+"USB ¥Ý¡¼¥È¤Ç¤¹¡£"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr ""
+"Palm ¤òÀÜÂ³¤¹¤ë¥Ý¡¼¥È¤ÎÍøÍÑ¤ò´ÊÃ±¤Ë¤¹¤ë¤¿¤á¡¢¤É¤Î¥æ¡¼¥¶¤Ç¤â»È¤¨¤ë¤è¤¦¤Ë¥¢¥¯¥»"
+"¥¹¸¢¤òÄã¤¯ÀßÄê¤·¤Þ¤¹¡£¤³¤ì¤¬¥»¥¥å¥ê¥Æ¥£Åª¤ËÌäÂê¤È¤Ê¤ë¾ì¹ç¤Ï¡¢\"¤É¤ì¤Ç¤â¤Ê¤¤"
+"\" ¤òÁªÂò¤·¤Æ¥ê¥ó¥¯¤È¥¢¥¯¥»¥¹¸¢¤ò¼«Ê¬¤ÇÀßÄê¤·¤Æ¤¯¤À¤µ¤¤¡£"

Added: people/jriddell/KDE/3.5/kdepim/debian/po/nl.po
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/po/nl.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/po/nl.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,70 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: pilot-link 0.11.8-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: 2003-09-07 21:09+0100\n"
+"Last-Translator: Tim Vandermeersch <qber66 at skolelinux.no>\n"
+"Language-Team: dutch <debian-l10n-dutch at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr "Geen, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr "Welke communicatie poort gebruiken met de Palm?"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr ""
+"Een symbolisch bestand /dev/pilot kan worden aangemaakt naar de poort die "
+"gebruikt wordt om tegen de palm te praten."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr ""
+"ttyS? zijn vier seriële poorten, ircomm0 is de IrDA (infra rood) poort, "
+"ttyUSB? zijn de USB poorten."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr ""
+"Om het gebruik van de Palm verbonden met de poort te vergemakkelijken, "
+"zullen de toegangs rechten verlaagd worden om elke gebruiker toe te staan. "
+"Als dit een beveiligings probleem is voor u, selecteer dan \"geen\" en "
+"beheer de link en zijn toegangs rechten zelf."

Added: people/jriddell/KDE/3.5/kdepim/debian/po/pt_BR.po
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/po/pt_BR.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/po/pt_BR.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,70 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: kdepim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: 2004-02-29 12:39-0300\n"
+"Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr "Nenhuma, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr "Qual porta de comunicação usar com o Palm ?"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr ""
+"Uma ligação simbólica /dev/pilot pode ser criada para a porta usar e se "
+"comunicar com o Palm."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr ""
+"As portas ttyS? são as quatro portas seriais, ircomm0 é a porta IrDA (infra-"
+"vermelho) e as portas ttyUSB? são as portas USB."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr ""
+"Para facilitar o uso do Palm conectado a porta, seus diretios de acesso "
+"serão rebaixados para permitir o acesso a qualquer usuário. Caso isso seja "
+"um problema de segurança para você, selecione \"Nenhuma\" e gerencie a "
+"ligação simbólica e os direitos de acesso manualmente."

Added: people/jriddell/KDE/3.5/kdepim/debian/po/templates.pot
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/po/templates.pot	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/po/templates.pot	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,62 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr ""
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr ""
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr ""
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr ""
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr ""

Added: people/jriddell/KDE/3.5/kdepim/debian/po/vi.po
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/po/vi.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/po/vi.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,61 @@
+# Vietnamese Translation for kdepim.
+# Copyright Â© 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie at riverland.net.au>, 2005.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: kdepim 4/3.3.2-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: 2005-06-06 11:45+0930\n"
+"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr "KhÃ´ng cÃ³, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr "NÃªn dÃ¹ng cá»•ng liÃªn láº¡c nÃ o vá»›i thiáº¿t bá»‹ Palm?"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr ""
+"CÃ³ thá»ƒ táº¡o má»™t liÃªn káº¿t tÆ°á»£ng trÆ°ng Ä‘áº¿n cá»•ng sáº½ dÃ¹ng Ä‘á»ƒ liÃªn láº¡c vá»›i thiáº¿t "
+"bá»‹ Palm."
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr ""
+"â€¢ ttySx lÃ  cá»•ng ná»‘i tiáº¿pâ€¢ ircommx lÃ  cá»•ng IrDA (há»“ng ngoáº¡i)â€¢ ttyUSBx lÃ  cá»•ng "
+"USB"
+
+#. Type: select
+#. description
+#: ../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr ""
+"Äá»ƒ lÃ m cho dá»… dÃ ng sá» dá»¥ng thiáº¿t bá»‹ Palm Ä‘Æ°á»£c káº¿t ná»‘i Ä‘áº¿n cá»•ng nÃ y, Ä‘Ã£ má»Ÿ "
+"rá»™ng quyá»n háº¡n Ä‘á»ƒ cho phÃ©p má»i ngÆ°á»i truy cáºp nÃ³. Náº¿u lÃ m nhÆ° tháº¿ rá»§i rÃµ báº£o "
+"máºt trÃªn mÃ¡y tÃnh báº¡n, cÃ³ thá»ƒ chá»n Â«khÃ´ng cÃ³Â» táº¡i Ä‘Ã¢y, vÃ  tá»± quáº£n lÃ½ liÃªn "
+"káº¿t nÃ y vÃ  quyá»n háº¡n truy cáºp nÃ³."

Added: people/jriddell/KDE/3.5/kdepim/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,86 @@
+#! /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_KDE_ENABLE_FINAL := yes
+DEB_KDE_APIDOX := yes
+
+DEB_CONFIGURE_SCRIPT_ENV += KMIX=/usr/bin/kmix KTTSD=/usr/bin/kttsd
+
+DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
+
+post-patches:: debian/stamp-libtool-update
+
+debian/stamp-libtool-update:
+	cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in
+	cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh
+	for f in /usr/share/automake-1.9/*; do \
+		if test -f $$f && ! test -L $$f && \
+			test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
+			cp -f $$f $(DEB_SRCDIR)/admin/; \
+		fi; \
+	done
+	touch debian/stamp-libtool-update
+
+clean::
+	rm -f debian/stamp-libtool-update
+	rm -f debian/patches/common/02_autotools_update.diff \
+		debian/patches/common/03_libtool_update.diff
+
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
+
+shlibs_ver=4:3.5.0
+DEB_DH_MAKESHLIBS_ARGS_libindex0 := -V'libindex0 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkcal2b := -V'libkcal2b (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkdepim1a := -V'libkdepim1a (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkgantt0 := -V'libkgantt0 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkleopatra1 := -V'libkleopatra1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkmime2 := -V'libkmime2 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkpimexchange1 := -V'libkpimexchange1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkpimidentities1 := -V'libkpimidentities1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libksieve0 := -V'libksieve0 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libktnef1 := -V'libktnef1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libmimelib1c2a := -V'libmimelib1c2a (>= $(shlibs_ver))'
+
+PACKAGES_WITH_LIBS := akregator kaddressbook kalarm kdepim-kresources \
+	kdepim-wizards kitchensync kleopatra kmail knode knotes kode kontact \
+	korganizer kpilot ksync ktnef libindex0 libkcal2b libkdenetwork2 \
+	libkdepim1a libkgantt0 libkleopatra1 libkmime2 libkpimexchange1 \
+	libkpimidentities1 libksieve0 libktnef1 libmimelib1c2a
+
+# kontact starts fine without korganizer or kpilot dependencies
+# specialdates is only in recommends to get the kaddressbook dependency there
+DEB_DH_SHLIBDEPS_ARGS += $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg))
+kontact_recommends_plugins := korganizer specialdates
+kontact_suggests_plugins := journal kpilot todo
+
+DEB_DH_SHLIBDEPS_ARGS_kontact := \
+	$(foreach p,$(kontact_recommends_plugins) $(kontact_suggests_plugins),-Xusr/lib/kde3/libkontact_$(p)plugin.so) \
+	-- -dRecommends \
+	$(foreach p,$(kontact_recommends_plugins),debian/kontact/usr/lib/kde3/libkontact_$(p)plugin.so) \
+	-dSuggests \
+	$(foreach p,$(kontact_suggests_plugins),debian/kontact/usr/lib/kde3/libkontact_$(p)plugin.so) \
+	-dDepends	# Since -u args go first in dpkg-shlibdeps call
+
+# Move kaddressbook dependency (from libkabc_xmlrpc.so) to Recommends
+DEB_DH_SHLIBDEPS_ARGS_kdepim-kresources := \
+	-Xusr/lib/libkabc_xmlrpc.so.1 \
+	-- -dRecommends \
+	debian/kdepim-kresources/usr/lib/libkabc_xmlrpc.so.1.* \
+	-dDepends
+
+# Move kaddressbook dependency of libkcal2b to Recommends
+DEB_DH_SHLIBDEPS_ARGS_libkcal2b := \
+	-Xusr/lib/kde3/kcal_kabc.so \
+	-- -dRecommends \
+	debian/libkcal2b/usr/lib/kde3/kcal_kabc.so \
+	-dDepends
+
+test-shlibdeps:
+	@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact)


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

Added: people/jriddell/KDE/3.5/kdepim/debian/shlibs.local
===================================================================
--- people/jriddell/KDE/3.5/kdepim/debian/shlibs.local	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdepim/debian/shlibs.local	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+libakregatorprivate 0
+libkmailprivate 0
+libknodecommon 0

Added: people/jriddell/KDE/3.5/kdesdk/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/cdbs/kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,88 @@
+# -*- 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-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
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif

Added: people/jriddell/KDE/3.5/kdesdk/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/cervisia.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/cervisia.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/cervisia.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Cervisia for Debian
+-------------------
+
+This application 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 kdesdk-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/cervisia.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/cervisia.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/cervisia.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+debian/tmp/usr/bin/cervisia
+debian/tmp/usr/lib/libkdeinit_cervisia.la
+debian/tmp/usr/lib/libkdeinit_cervisia.so
+debian/tmp/usr/lib/kde3/cervisia.la
+debian/tmp/usr/lib/kde3/cervisia.so
+debian/tmp/usr/lib/kde3/libcervisiapart.la
+debian/tmp/usr/lib/kde3/libcervisiapart.so
+debian/tmp/usr/share/applications/kde/cervisia.desktop
+debian/tmp/usr/share/apps/cervisia/cervisiashellui.rc
+debian/tmp/usr/share/apps/cervisia/eventsrc
+debian/tmp/usr/share/apps/cervisiapart/cervisiaui.rc
+debian/tmp/usr/share/apps/kconf_update/cervisia.upd
+debian/tmp/usr/share/apps/kconf_update/cervisia-change_repos_list.pl
+debian/tmp/usr/share/apps/kconf_update/cervisia-normalize_cvsroot.pl
+debian/tmp/usr/share/apps/kconf_update/move_repositories.pl
+debian/tmp/usr/share/apps/kconf_update/change_colors.pl
+debian/tmp/usr/share/config.kcfg/cervisiapart.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/cervisia/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/cervisia/common
+debian/tmp/usr/share/doc/kde/HTML/en/cervisia/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/cervisia/*.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/cervisia.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/cervisia.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/cervisia.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/cervisia.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/vcs_*.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/vcs_*.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/vcs_*.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/vcs_*.png
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/vcs_*.svgz
+debian/tmp/usr/share/man/man1/cervisia.1
+debian/icons/cervisia.xpm /usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdesdk/debian/cervisia.menu
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/cervisia.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/cervisia.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(cervisia):\
+  needs="x11"\
+  section="Apps/Programming"\
+  hints="KDE,Version control"\
+  title="Cervisia"\
+  longtitle="Cervisia (CVS Frontend)"\
+  icon="/usr/share/pixmaps/cervisia.xpm"\
+  command="/usr/bin/cervisia"
+

Added: people/jriddell/KDE/3.5/kdesdk/debian/cervisia.override
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/cervisia.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/cervisia.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+# kconf_update scripts don't need to be executable.
+cervisia: script-not-executable ./usr/share/apps/kconf_update/change_colors.pl
+cervisia: script-not-executable ./usr/share/apps/kconf_update/move_repositories.pl
+
+# This is from kdeinit black magic.
+cervisia: no-shlibs-control-file usr/lib/libkdeinit_cervisia.so
+cervisia: postinst-must-call-ldconfig usr/lib/libkdeinit_cervisia.so
+cervisia: postrm-should-call-ldconfig usr/lib/libkdeinit_cervisia.so
+cervisia: package-name-doesnt-match-sonames libkdeinit-cervisia

Added: people/jriddell/KDE/3.5/kdesdk/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,724 @@
+kdesdk (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Update Replaces on libcvsservice0 for cervisia
+  * Build-dep on libdb4.2-dev | libdb4.3-dev for backports
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
+
+kdesdk (4:3.5.0-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  8 Dec 2005 17:54:03 +0000
+
+kdesdk (4:3.5.0-1) alioth; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a kdesdk-dbg package for helping to trace problems.
+
+  * New packages: kunittest, and kdesdk-kio-plugins, which splits
+    out the svn ioslave from kdesdk-misc.
+
+  * Re-libtoolize. This fixes GNU/kFreeBSD, and prunes poxml's
+    excessive dependencies. (Closes: #327706, #329902)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue,  6 Dec 2005 13:10:37 -0500
+
+kdesdk (4:3.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * This package is now in the hands of the Debian Qt/KDE Maintainers. Thanks
+    to Ben Burton for all his work.
+
+  * Acknowledge NMU. (Closes: #330934)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon,  5 Dec 2005 07:23:04 -0500
+
+kdesdk (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Change libdb4.2 build-dep to libdb4.3
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  8 Dec 2005 02:48:59 +0000
+
+kdesdk (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:28:57 +0000
+
+kdesdk (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+  * New upstream pre-release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2005 15:00:05 +0000
+
+kdesdk (4:3.4.2-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build-dep on g++-3.4 on arm, hppa and m68k (closes:#330934). 
+
+ -- Luk Claes <luk at debian.org>  Sat,  1 Oct 2005 20:21:41 +0200
+
+kdesdk (4:3.4.2-2) unstable; urgency=low
+
+  * Built against libfam-dev, not libgamin-dev (closes: #326547).
+  * Updated overrides files to account for kdeinit black magic.
+
+ -- Ben Burton <bab at debian.org>  Sun,  4 Sep 2005 10:58:17 +1000
+
+kdesdk (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * First g++-4 upload to sid.
+  * Adjusted build-dependencies and shlibs files for the C++ ABI transition.
+    Note that the libcvsservice0 package name does not need to change.
+  * Updated FSF address in the copyright file.
+  * Changed the conflicts on kdevelop3-plugins to a versioned replaces as
+    described in the changelog for 4:3.4.0-0pre2.
+  * Removed redundant xlibs-dev recommendation from kapptemplate.
+  * Adjusted Ivan's changelog entry from 29 Feb 2001 to 01 Mar 2001 so the
+    changelog is parseable.
+  * KBabel now treats multiple-line headers correctly (closes: #277341).
+  * 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
+
+kdesdk (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat,  8 Oct 2005 21:59:11 +0000
+
+kdesdk (4:3.4.2-0ubuntu2) breezy; urgency=low
+
+  * Add missing files to libcvsserver0, kdesdk-scripts and kompare.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 28 Jul 2005 17:55:43 +0000
+
+kdesdk (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 26 Jul 2005 16:25:16 +0000
+
+kdesdk (4:3.4.1-0ubuntu5) breezy; urgency=low
+
+  * Rebuild for removed libXcursor.la and libXrender.la
+    and tighten kdelibs dependency.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Sun, 24 Jul 2005 23:54:37 +0000
+
+kdesdk (4:3.4.1-0ubuntu4) breezy; urgency=low
+
+  * Add build-depend on libxi-dev
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 30 Jun 2005 13:42:22 +0000
+
+kdesdk (4:3.4.1-0ubuntu3) breezy; urgency=low
+
+  * Add version to kdesdk-misc conflict on kdevelop3-plugins
+
+ -- Jonathan Riddell <jr at jriddell.org>  Mon,  6 Jun 2005 22:45:10 +0000
+
+kdesdk (4:3.4.1-0ubuntu2) breezy; urgency=low
+
+  * Add libkdeinit_cvsservice.so to libcvsservice0.install
+  * Add cervisia.so and libkdeinit_cervisia.so to cervisia.install
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu,  2 Jun 2005 01:33:59 +0000
+
+kdesdk (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 00:56:16 +0000
+
+kdesdk (4:3.4.1-0ubuntu0pre1) breezy; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 26 May 2005 16:34:06 +0000
+
+kdesdk (4:3.4.0-0pre2) unstable; urgency=low
+
+  * Merge in recent packaging changes from the 3.3 branch.
+  * Introduce a temporary conflicts against kdevelop3-plugins, which provides
+    a copy of the subversion I/O slave taken from kdesdk-misc.  This will be
+    removed once kdevelop has been rebuilt against KDE 3.4 (without the
+    subversion I/O slave), and a versioned replaces will be put in place
+    instead.
+  * 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
+
+kdesdk (4:3.4.0-0pre1) unstable; urgency=low
+
+  * New major upstream release.
+  * Note that although libktnef.la has moved from kdepim-dev to libktnef1-dev,
+    a build-dependency on kdepim-dev is still required for some header files.
+  * Removed cvs dependency from cervisia, since this comes indirectly through
+    libcvsservice0 anyway.  Updated the cvs dependency for libcvsservice
+    to require cvs (>= 1.11), as cervisia used to when it handled cvs itself.
+  * Removed obsolete kderemove tags from menu items.
+
+ -- Ben Burton <bab at debian.org>  Fri, 25 Mar 2005 12:56:49 +1100
+
+kdesdk (4:3.4.0-0ubuntu5) hoary; urgency=low
+
+  * Update cdbs/kde.mk
+
+ -- Jonathan Riddell <jr at jriddell.org>  Tue, 29 Mar 2005 22:58:09 +0000
+
+kdesdk (4:3.4.0-0ubuntu4) hoary; urgency=low
+
+  * Add paths.diff
+
+ -- Jonathan Riddell <jr at jriddell.org>  Mon, 28 Mar 2005 23:01:12 +0000
+
+kdesdk (4:3.4.0-0ubuntu3) hoary; urgency=low
+
+  * added empty empty patches 
+
+ -- Andreas Mueller <amu at ubuntu.com>  Wed, 23 Mar 2005 10:46:56 +0000
+
+kdesdk (4:3.4.0-0ubuntu2) hoary; urgency=low
+
+  * fixed broken patchdir
+  * added KDE branch patches   
+
+ -- Andreas Mueller <amu at ubuntu.com>  Tue, 22 Mar 2005 20:57:56 +0000
+
+kdesdk (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 17 Mar 2005 04:18:57 +0000
+
+kdesdk (4:3.3.2-3) unstable; urgency=high
+
+  * Fresh pull from KDE_3_3_BRANCH for recent bugfixes.
+  * Many thanks to upstream who have relicensed cervisia under the GPL
+    (closes: #296514).  Also noted in debian/copyright that cvsservice is
+    under the LGPL.
+  * Fix kdemangen.pl output to use minus instead of hyphen where appropriate,
+    thanks to Achim Bohnet (closes: #295454).
+  * Fixed amd64/gcc-4.0 build by using longs for node IDs in kcachegrind,
+    thanks to Andreas Jochens (closes: #287032).
+
+ -- Ben Burton <bab at debian.org>  Thu, 31 Mar 2005 19:59:13 +1000
+
+kdesdk (4:3.3.2-2) unstable; urgency=high
+
+  * Fixed drag-and-drop problems in umbrello that can cause a real and/or
+    apparent loss of data (closes: #296433).
+  * Patched kbabel spell-check-as-you-go to use checkWord() instead of check(),
+    which seems to protect it from the kdelibs crash described in #289646.
+  * Added the full text of the GFDL to debian/copyright, since all of the
+    docbook documentation is under this license.
+  * Added a note to README.Debian in the poxml package regarding the
+    necessity of system identifiers (closes: #286103).
+  * Installing the new script cvsforwardport and a corresponding manpage.
+
+ -- Ben Burton <bab at debian.org>  Thu, 24 Mar 2005 07:59:47 +1100
+
+kdesdk (4:3.3.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Rebuilt against libkcal2a and reversioned kdepim-dev and libkcal2-dev
+    build-depends to >= 4:3.3.2 accordingly (closes: #291592).
+  * Fixed setupGUI() typo in kapptemplate (part of #289304).
+  * Added a README.Debian for poxml that outlines the available binaries
+    (closes: #286106).
+  * Applied upstream patch for poxml that addresses escaped literals
+    and KDE-specific credits in split2po (closes: #288929).
+
+ -- Ben Burton <bab at debian.org>  Sat, 22 Jan 2005 07:29:29 +1100
+
+kdesdk (4:3.3.1-2) unstable; urgency=medium
+
+  * Build-depends on kdepim-dev (>= 4:3.3.1), which provides libktnef.la.
+    When building against libkcal2-dev (>= 4:3.3.1), libktnef.la is needed
+    at link time.
+  * Also changed libkcal2-dev in the build-depends to the versioned
+    libkcal2-dev (>= 4:3.3.1) to ensure consistency.
+
+ -- Ben Burton <bab at debian.org>  Thu,  9 Dec 2004 08:16:17 +1100
+
+kdesdk (4:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * 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.
+
+ -- Ben Burton <bab at debian.org>  Thu, 28 Oct 2004 19:03:02 +1000
+
+kdesdk (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * New package kcachegrind-converters.  These foreign format converters
+    are packaged separately so that kcachegrind need not depend on php.
+  * Binary package kmtrace has returned.  Note that the kmtrace libraries
+    for debian are now installed in /usr/lib/kmtrace, not in /usr/lib as
+    is done upstream.
+  * Versioned libqt3-mt-dev build-depends is no longer necessary since
+    kdelibs4-dev already forces Qt 3.3.
+  * Made libcvsservice-dev depend on kdelibs4-dev.
+  * Removed python dependency from poxml, since all apps are now compiled
+    binaries.
+  * Added a sample kde-buildrc to the kdesdk-scripts documentation.
+
+ -- Ben Burton <bab at debian.org>  Fri, 15 Oct 2004 09:55:26 +1000
+
+kdesdk (4:3.2.3-2) unstable; urgency=low
+
+  * Fixed C++ code generator to use keyword "virtual" when declaring
+    abstract operations (closes: #255552).
+
+ -- Ben Burton <bab at debian.org>  Thu, 24 Jun 2004 08:35:22 +1000
+
+kdesdk (4:3.2.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Rebuilt against STL-enabled Qt and corresponding kdelibs.
+  * Added manpages for cvs2dist and build-progress.sh.
+  * Use real paths for doc-base entries instead of symlinked paths
+    (closes: #247690).
+  * Suggests (konqueror | www-browser) for kdesdk-doc-html instead of
+    just www-browser.
+  * KBabel catalogue manager no longer opens spurious empty windows
+    (closes: #237031).
+
+ -- Ben Burton <bab at debian.org>  Wed, 16 Jun 2004 08:41:42 +1000
+
+kdesdk (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Add Conflicts/Replaces for umbrello-manual (closes: #237173).
+  * Don't use Conflicts/Replaces elsewhere where we should just use Replaces.
+  * Have kcachegrind suggest graphviz (closes: #243883).
+
+ -- Ben Burton <bab at debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
+
+kdesdk (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
+
+kdesdk (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 kdesdk metapackage.
+
+ -- Ben Burton <bab at debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
+
+kdesdk (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 Robert Lemmen for previous packaging work on umbrello and
+    to Philipp Frauenfelder for previous packaging work on kcachegrind.
+  * New binary packages kcachegrind, kuiviewer and umbrello.
+  * Created a new package kdesdk-doc-html for HTML documentation.
+
+ -- Ben Burton <bab at debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
+
+kdesdk (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
+
+kdesdk (4:3.1.4-3) unstable; urgency=low
+
+  * New pull from BRANCH; includes bugfixes for kbabel and kompare.
+  * Fixed freeze in KBabel spellcheck (closes: #209397).
+
+ -- Ben Burton <bab at debian.org>  Fri, 12 Dec 2003 10:42:10 +1100
+
+kdesdk (4:3.1.4-2) unstable; urgency=low
+
+  * Patched split2po to handle entities inside attributes correctly;
+    thanks to Denis Barbier (closes: #213036).
+  * Added encoding header to fixsgml; thanks to Petter Reinholdtsen
+    (closes: #208949).  Note that fixsgml is no longer supported
+    upstream and will not be shipped with KDE 3.2.
+
+ -- Ben Burton <bab at debian.org>  Tue, 14 Oct 2003 16:26:05 +1000
+
+kdesdk (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab at debian.org>  Mon, 29 Sep 2003 15:08:53 +1000
+
+kdesdk (4:3.1.3-2) unstable; urgency=low
+
+  * Rebuilt against Qt 3.2 so kbabel no longer crashes (closes: #208509).
+  * Added versioned build-depends on libqt3-mt-dev (>= 3:3.2.1).
+  * Updated admin/ from CVS.
+
+ -- Ben Burton <bab at debian.org>  Fri,  5 Sep 2003 12:07:17 +1000
+
+kdesdk (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Split menu titles into title/longtitle.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab at debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
+
+kdesdk (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-depends on flex-old instead of flex (closes: #193871).
+  * Debian menu pixmaps no longer use a restricted colour map.
+  * Man page overhaul.
+
+ -- Ben Burton <bab at debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
+
+kdesdk (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed binary package kmtrace which claims not to work with
+    glibc >= 2.3.x.
+
+ -- Ben Burton <bab at debian.org>  Sat, 22 Mar 2003 16:18:51 +1100
+
+kdesdk (4:3.1.0-5) unstable; urgency=low
+
+  * Renamed symbolmatch to kmmatch and kdefixincludes to fixkdeincludes;
+    these will be the upstream names in KDE 3.2.
+  * Removed alpha compile options.
+
+ -- Ben Burton <bab at debian.org>  Mon, 17 Mar 2003 08:35:19 +1100
+
+kdesdk (4:3.1.0-4) unstable; urgency=low
+
+  * Updated admin/ so that kapptemplate's admin/ works with the new Qt
+    packaging style.
+
+ -- Ben Burton <bab at debian.org>  Wed, 12 Mar 2003 13:28:16 +1100
+
+kdesdk (4:3.1.0-3) unstable; urgency=low
+
+  * Changed /usr/bin/match to /usr/bin/symbolmatch to avoid filename
+    conflicts (closes: #181840).
+  * Build-depends on libqt3-compat-headers for now until obsolete
+    #includes are removed from both kdesdk and kdelibs.
+  * Added patch to work around flex's namespace problems until the
+    flex package is fixed.
+
+ -- Ben Burton <bab at debian.org>  Tue, 25 Feb 2003 11:50:26 +1100
+
+kdesdk (4:3.1.0-2) unstable; urgency=low
+
+  * First KDE3 upload to debian (closes: #167062).
+  * Rolled the epoch to aid upgrades from the unofficial repository on
+    ftp.kde.org.. *sigh*
+
+ -- Ben Burton <bab at debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
+
+kdesdk (3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Merged kdepalettes package into kdesdk-misc.
+  * Installs shell completion controls.
+  * Replaced the old kde-devel-emacs.el with the new kde-emacs.el.
+
+ -- Ben Burton <bab at debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
+
+kdesdk (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
+
+kdesdk (3.0.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Moved to Chris Cheney's style of debian/rules.
+  * Moved kbabel *.la files into kbabel-dev.
+  * Build-depends on automake1.6.
+
+ -- Ben Burton <benb at acm.org>  Sun, 22 Sep 2002 17:57:55 +1000
+
+kdesdk (3.0.3-2) unstable; urgency=low
+
+  * Rename static kmtrace library to libktrace_s.a.
+  * Install vim helper file.
+  * Take out cvschanged again since it's superseded by cvscheck.
+
+ -- Ben Burton <benb at acm.org>  Sat,  7 Sep 2002 19:03:33 +1000
+
+kdesdk (3.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Thu, 15 Aug 2002 13:22:22 +1000
+
+kdesdk (3.0.2-2) unstable; urgency=low
+
+  * Build-depends on automake1.5.
+  * Install cvschanged.
+  * Don't install kde-build (relies on kde-buildrc).
+
+ -- Ben Burton <benb at acm.org>  Sat,  6 Jul 2002 14:58:13 +1000
+
+kdesdk (3.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
+
+kdesdk (3.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Mon, 13 May 2002 03:15:24 +1000
+
+kdesdk (2.2.2-7) unstable; urgency=low
+
+  * kdesdk-scripts recommends gawk for kdekillall (closes: Bug#156109).
+
+ -- Ben Burton <benb at acm.org>  Sat, 10 Aug 2002 14:25:35 +1000
+
+kdesdk (2.2.2-6) unstable; urgency=low
+
+  * Emptied kdesdk-scripts.links instead of removing it so the diff works
+    correctly (closes: Bug#154803).
+
+ -- Ben Burton <benb at acm.org>  Fri,  2 Aug 2002 14:28:27 +1000
+
+kdesdk (2.2.2-5) unstable; urgency=low
+
+  * Fixed manpage section for kdelnk2desktop.py.1 (closes: #148371).
+
+ -- Ben Burton <benb at acm.org>  Sat,  6 Jul 2002 14:02:27 +1000
+
+kdesdk (2.2.2-4) unstable; urgency=low
+
+  * Package kspy depends on kdelibs-dev (closes: Bug#150707).
+
+ -- Ben Burton <benb at acm.org>  Sun, 23 Jun 2002 13:02:06 +1000
+
+kdesdk (2.2.2-3) unstable; urgency=low
+
+  * Fixed gcc3 build (closes: Bug#138177).
+
+ -- Ben Burton <benb at acm.org>  Tue, 19 Mar 2002 17:01:44 +1100
+
+kdesdk (2.2.2-2) unstable; urgency=low
+
+  * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449).
+
+ -- Ben Burton <benb at acm.org>  Thu,  6 Dec 2001 09:50:47 -0600
+
+kdesdk (2.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
+
+kdesdk (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
+
+kdesdk (2.2.1-3) unstable; urgency=low
+
+  * Builds with automake 1.5.
+  * Installs .py.1 man pages in the correct locations (requires newer
+    debhelper).
+
+ -- Ben Burton <benb at acm.org>  Thu, 11 Oct 2001 15:31:32 -0500
+
+kdesdk (2.2.1-2) unstable; urgency=low
+
+  * Updated parameters for alpha build (closes: Bug#113110).
+
+ -- Ben Burton <benb at acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
+
+kdesdk (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Fri, 31 Aug 2001 21:08:56 -0500
+
+kdesdk (2.2.0-final-1) unstable; urgency=low
+
+  * New upstream release.
+  * Generating HTML docs for users who can't view KDE docbook files.
+  * Build-Depends: requires newer kdelibs-dev for working meinproc.
+  * Suggests: konqueror for packages with docs to view through khelpcenter.
+  * Reinstating doc-base entries.
+  * 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
+
+kdesdk (2.2-beta1-4) unstable; urgency=low
+
+  * Builds on alpha.
+
+ -- Ben Burton <benb at acm.org>  Sun, 29 Jul 2001 00:20:23 +1000
+
+kdesdk (2.2-beta1-3) unstable; urgency=low
+
+  * Build-Depends: added version to kdebase-dev (closes: Bug#103514).
+
+ -- Ben Burton <benb at acm.org>  Wed,  4 Jul 2001 11:41:50 -0500
+
+kdesdk (2.2-beta1-2) unstable; urgency=low
+
+  * Build-Depends: added kdebase-dev (closes: Bug#103255).
+  * Build-Depends: changed libdb-dev back to libdb2-dev since libdb3-dev
+    doesn't work.
+
+ -- Ben Burton <benb at acm.org>  Mon,  2 Jul 2001 22:15:53 -0500
+
+kdesdk (2.2-beta1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added packages kdesdk-doc, kspy and poxml.
+  * Build-Depends: added uic.
+
+ -- Ben Burton <benb at acm.org>  Sun, 17 Jun 2001 14:44:38 -0500
+
+kdesdk (2.1.1-8) unstable; urgency=low
+
+  * Added arm/m68k to the libtool linux arch list (closes: Bug#99498).
+
+ -- Ben Burton <benb at acm.org>  Fri,  1 Jun 2001 18:29:27 -0500
+
+kdesdk (2.1.1-7) unstable; urgency=low
+
+  * Build-Depends: replaced libdb2-dev with libdb-dev; removed sed
+    which is build-essential.
+  * Changed kdesdk to Architecture: any to please the autobuilders.
+  * Minor cosmetic changes.
+
+ -- Ben Burton <benb at acm.org>  Thu, 31 May 2001 12:21:41 -0500
+
+kdesdk (2.1.1-6) unstable; urgency=low
+
+  * Added man pages for kdesdk-scripts (closes: Bug#92451).
+  * Added gdb macros and emacs helper files.
+  * Added suggestions and recommendations for kdesdk-scripts
+    to satisfy requirements of individual scripts.
+  * Fixed location of KDE docs in /usr/bin/kdedoc.
+  * Fixed location of Qt docs in /usr/bin/qtdoc.
+  * Changed conflict for kexample to version (<< 2.1.1-0) so potato
+    packages don't break.
+
+ -- Ben Burton <benb at acm.org>  Sun, 29 Apr 2001 15:52:54 -0500
+
+kdesdk (2.1.1-5) unstable; urgency=low
+ 
+  * Updated Standards-Version to 3.5.2.
+  * Added kderemove="1" to the debian menu items.
+  * Reformatted and fleshed out man pages.
+
+ -- Ben Burton <benb at acm.org>  Fri, 27 Apr 2001 14:56:02 -0500
+
+kdesdk (2.1.1-4) unstable; urgency=low
+
+  * Ensures /usr/bin/extractrc is installed (needed by kdevelop) and
+    conflicts with earlier versions of kdevelop (which provided its own
+    /usr/bin/extractrc).
+
+ -- Ben Burton <benb at acm.org>  Thu,  5 Apr 2001 15:19:13 -0500
+
+kdesdk (2.1.1-3) unstable; urgency=low
+
+  * Added man page for /usr/bin/extractmsg (closes: Bug#92450).
+  * Tidied up various other man pages.
+  * Build-Depends: now requires version (>> 3.0.0) of debhelper.
+  * Added Suggests: kdebase to packages kbabel, kexample.
+  * Replaced gimp, xpaint with gimp | xpaint in Suggests: for kdepalettes.
+  * Upgraded to debian/rules DH_COMPAT=3 and removed postinst scripts.
+  * Rebuilt using correct gcc/libc6 packages.
+
+ -- Ben Burton <benb at acm.org>  Sun,  1 Apr 2001 22:30:27 -0500
+
+kdesdk (2.1.1-2) unstable; urgency=low
+
+  * Build-Depends: Added libdb2-dev (closes: Bug#92174).
+  * Conflicts (kexample): Added kdesdk-scripts (<< 2.1.1-1)
+    (closes: Bug#92432).
+
+ -- Ben Burton <benb at acm.org>  Sun,  1 Apr 2001 11:59:48 -0500
+
+kdesdk (2.1.1-1) unstable; urgency=low
+
+  * New upstream sources.
+  * Adopted by Ben Burton <benb at acm.org> (closes: Bug#84531).
+  * Added packages kdesdk, kapptemplate, kdepalettes.
+  * Split kexample from package kdesdk-scripts into a new package.
+  * Changed some package architectures to all.
+  * Build-Depends: Removed autoconf and gettext which are redundant;
+    required version (>> 2.0.0) of debhelper; added sed.
+  * Removed all Suggests: kdebase flags.
+  * Completely reworked debian/rules.
+  * Added a mime type for kbabel.
+  * Added various man pages.
+  * Added icons to the debian menu items.
+  * Changed admin/Makefile.common to ignore cvs-clean in debian/ so
+    new debian files aren't deleted!
+  * Tidied up package descriptions.
+  * Miscellaneous cleanups in debian.
+
+ -- Ben Burton <benb at acm.org>  Mon, 26 Mar 2001 09:10:56 -0600
+
+kdesdk (2.1.0-1) unstable; urgency=low
+ 
+  * New upstream CVS pull
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 07 Mar 2001 02:00:00 -0700
+
+kdesdk (2.1-final-1.1) unstable; urgency=low
+
+  * Fix for doc link (Closes: #84075)
+  * Fix the description of kbabel (Closes: #84078)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 01 Mar 2001 00:10:00 -0700
+
+kdesdk (2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:00:00 +0100
+
+kdesdk (2.1-beta2-2) unstable; urgency=low
+
+  * Closes: #83652.
+  * Package maintaner change.
+  * Upload sponsored by Ivan E. Moore II <rkrusty at debian.org>.
+
+ -- Mariusz Przygodzki <dune at home.pl>  Sat, 27 Jan 2001 17:18:53 +0100
+
+kdesdk (2.1-beta2-1) unstable; urgency=low
+ 
+  * New upstream beta
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 26 Jan 2001 18:00:00 -0700
+
+Local variables:
+mode: debian-changelog
+End:

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,377 @@
+Source: kdesdk
+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 net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
+Build-Depends: g++-3.4 [arm hppa m68k], cdbs (>= 0.4.27), debhelper (>= 4.0), autotools-dev, gawk, gettext, pkg-config, kdelibs4-dev (>= 4:3.5.1), binutils-dev, bison, flex, kdepim-dev (>= 4:3.5.1), libapr0-dev, libdb4.2-dev | libdb4.3-dev, libkcal2-dev (>= 4:3.5.1), libktnef1-dev (>= 4:3.5.1), libsvn0-dev (>= 1.2.0)
+Standards-Version: 3.6.2
+
+Package: kdesdk
+Architecture: all
+Section: kde
+Depends: cervisia (>= ${Source-Version}), kapptemplate (>= ${Source-Version}), kbabel (>= ${Source-Version}), kbugbuster (>= ${Source-Version}), kcachegrind (>= ${Source-Version}), kdesdk-kfile-plugins (>= ${Source-Version}), kdesdk-kio-plugins (>= ${Source-Version}), kdesdk-misc (>= ${Source-Version}), kdesdk-scripts (>= ${Source-Version}), kmtrace (>= ${Source-Version}), kompare (>= ${Source-Version}), kspy (>= ${Source-Version}), kuiviewer (>= ${Source-Version}), kunittest (>= ${Source-Version}), poxml (>= ${Source-Version}), umbrello (>= ${Source-Version})
+Suggests: kcachegrind-converters, kbabel-dev, kdesdk-doc-html
+Description: software development kit from the official KDE release
+ KDE (the K Desktop Environment) is a powerful Open Source graphical
+ 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 the KDE Software Development Kit, a collection
+ of applications and tools useful for developing KDE applications.
+
+Package: kdesdk-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdesdk
+Replaces: cervisia (<< 4:3.2.0), kbabel (<< 4:3.2.0), kbugbuster (<< 4:3.2.0), kompare (<< 4:3.2.0)
+Description: KDE Software Development Kit 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 SDK 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/umbrello/. Documentation is provided for most
+ KDE SDK packages.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: cervisia
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter, kdesdk-doc-html
+Description: a graphical CVS front end for KDE
+ Cervisia is a KDE-based graphical front end for the CVS client.
+ .
+ As well as providing both common and advanced CVS operations, it offers
+ a variety of methods for graphically viewing information about the CVS
+ repository, your own sandbox and the relationships between different
+ versions of files.  A Changelog editor is also included and is coupled
+ with the commit dialog.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kapptemplate
+Architecture: all
+Section: devel
+Recommends: automake1.9 | automaken, kdelibs4-dev (>= 4:3.5.0)
+Description: creates a framework to develop a KDE application
+ KAppTemplate is a shell script that will create the necessary
+ framework to develop various KDE applications.  It takes care of the
+ autoconf/automake code as well as providing a skeleton and example of
+ what the code typically looks like.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kbabel
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter, kdesdk-doc-html
+Description: PO-file editing suite for KDE
+ This is a suite of programs for editing gettext message files (PO-files).
+ It is designed to help you translate fast and consistently.
+ .
+ This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
+ advanced and easy to use PO-file editor with full navigational and editing
+ capabilities, syntax checking and statistics.  CatalogManager is a multi
+ functional catalog manager which allows you to keep track of many
+ PO-files at once.  KBabelDict is a dictionary to assist with searching
+ for common translations.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kbabel-dev
+Architecture: any
+Section: libdevel
+Depends: kbabel (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.0)
+Replaces: kbabel (<< 4:3.0.8-0)
+Description: PO-file editing suite for KDE (development files)
+ This is a suite of programs for editing gettext message files (PO-files).
+ It is designed to help you translate fast and consistently.
+ .
+ This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
+ advanced and easy to use PO-file editor with full navigational and editing
+ capabilities, syntax checking and statistics.  CatalogManager is a multi
+ functional catalog manager which allows you to keep track of many
+ PO-files at once.  KBabelDict is a dictionary to assist with searching
+ for common translations.
+ .
+ This package contains the KBabel development files.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kbugbuster
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a front end for the KDE bug tracking system
+ KBugBuster is a GUI front end for the KDE bug tracking system.
+ It allows the user to view and manipulate bug reports and provides a
+ variety of options for searching through reports.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kcachegrind
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: valgrind-callgrind | valgrind-calltree
+Suggests: kcachegrind-converters, graphviz, khelpcenter, kdesdk-doc-html
+Description: visualisation tool for valgrind profiling output
+ KCachegrind is a visualisation tool for the profiling data generated
+ by calltree, a profiling skin for valgrind.  Applications can be
+ profiled using calltree without being recompiled, and shared libraries
+ and plugin architectures are supported.
+ .
+ For visualising the output from other profiling tools, several converters
+ can be found in the kcachegrind-converters package.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kcachegrind-converters
+Architecture: all
+Section: devel
+Depends: ${perl:Depends}, php4-cli, python
+Recommends: kcachegrind
+Description: format converters for KCachegrind profiling visualisation tool
+ This is a collection of scripts for converting the output from
+ different profiling tools into a format that KCachegrind can use.
+ .
+ KCachegrind is a visualisation tool for the profiling data generated
+ by calltree, a profiling skin for valgrind.  Applications can be
+ profiled using calltree without being recompiled, and shared libraries
+ and plugin architectures are supported.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kdesdk-kfile-plugins
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Description: KDE file dialog plugins for software development files
+ This is a collection of plugins for the KDE file dialog.  These plugins
+ extend the file dialog to offer advanced meta-information for source files,
+ patch files and Qt Linguist data.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kdesdk-misc
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Recommends: libqt3-mt-dev | libqt3-dev
+Suggests: gimp | xpaint
+Conflicts: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0)
+Replaces: kdepalettes (<= 4:3.1.0-1), scheck (<< 4:3.2.0-0), kdevelop3-plugins (<= 4:3.2.0-3)
+Description: various goodies from the KDE Software Development Kit
+ This package contains miscellaneous goodies provided with the official
+ KDE release to assist with KDE software development.
+ .
+ Included are:
+  - headers to assist with profiling KDE code;
+  - a widget style for checking conformity with the KDE/Qt style guide;
+  - palettes that match the KDE standard colour palette;
+  - a KDE address book plugin that reads the list of KDE CVS accounts.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kdesdk-scripts
+Architecture: all
+Section: devel
+Depends: ${perl:Depends}, python
+Recommends: automake1.9 | automaken, cvs, gawk
+Suggests: khelpcenter, kdesdk-doc-html, dmalloc, gdb, kdelibs4-doc, qt3-doc, valgrind
+Enhances: kate
+Replaces: kdevelop (<< 1:1.4.0-3.2)
+Description: a set of useful development scripts for KDE
+ This package contains a number of scripts which can be used to help in
+ developing KDE-based applications.  Many of these scripts however are
+ not specific to KDE, and in particular there are several general-use
+ scripts to help users in working with SVN and CVS repositories.
+ .
+ In addition to these scripts, this package provides:
+  - gdb macros for Qt/KDE programming;
+  - vim and emacs helper files for Qt/KDE programming;
+  - bash and zsh completion controls for KDE apps;
+  - valgrind error suppressions for KDE apps.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kmtrace
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, less
+Description: a KDE memory leak tracer
+ KMtrace is a KDE tool to assist with malloc debugging using glibc's
+ "mtrace" functionality.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kompare
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: a KDE GUI for viewing differences between files
+ Kompare is a graphical user interface for viewing the differences between
+ files.  It can compare two documents, create a diff file, display a diff
+ file and/or blend a diff file back into the original documents.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kspy
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, kdelibs4-dev (>= 4:3.5.0)
+Description: examines the internal state of a Qt/KDE app
+ KSpy is a tiny library which can be used to graphically display
+ the QObjects in use by a Qt/KDE app.  In addition to the object tree,
+ you can also view the properties, signals and slots of any QObject.
+ .
+ Basically it provides much the same info as QObject::dumpObjectTree() and
+ QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
+ minimal overhead for the application, because the kspy library is
+ loaded dynamically using KLibLoader.
+ .
+ See /usr/share/doc/kspy/README for usage instructions.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kuiviewer
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Suggests: qt3-designer
+Description: viewer for Qt Designer user interface files
+ KUIViewer is a utility to display and test the user interface (.ui) files
+ generated by Qt Designer.  The interfaces can be displayed in a variety of
+ different widget styles.
+ .
+ The Qt Designer itself is in the package qt3-designer.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: libcvsservice0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, cvs (>= 1.11)
+Recommends: kdelibs-bin
+Replaces: cervisia (<< 4:3.5.1)
+Description: DCOP service for accessing CVS repositories
+ This library provides a DCOP service for accessing and working with
+ remote CVS repositories.  Applications may link with this library to
+ access the DCOP service directly from C++.  Alternatively, scripts may
+ access the service using the standard "dcop" command-line tool.
+ .
+ DCOP is the Desktop Communication Protocol used throughout KDE.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: libcvsservice-dev
+Architecture: any
+Section: libdevel
+Depends: libcvsservice0 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.0)
+Replaces: cervisia (<< 4:3.2.0)
+Description: development files for CVS DCOP service
+ The library libcvsservice provides a DCOP service for accessing and
+ working with remote CVS repositories.  Applications may link with this
+ library to access the DCOP service directly from C++.  Alternatively,
+ scripts may access the service using the standard "dcop" command-line
+ tool.
+ .
+ Development files for libcvsservice are included in this package.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: poxml
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Description: tools for using PO-files to translate DocBook XML files
+ This is a collection of tools that facilitate translating DocBook XML
+ files using gettext message files (PO-files).
+ .
+ Also included are some miscellaneous command-line utilities for
+ manipulating DocBook XML files, PO-files and PO-template files.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: umbrello
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter, kdesdk-doc-html
+Conflicts: umbrello-manual (<< 20040311)
+Replaces: umbrello-manual (<< 20040311)
+Description: UML modelling tool and code generator
+ Umbrello UML Modeller is a Unified Modelling Language editor for KDE.
+ With UML you can create diagrams of software and other systems in an
+ industry standard format.  Umbrello can also generate code from your
+ UML diagrams in a number of programming languages.
+ .
+ The program supports class diagrams, sequence diagrams, collaboration
+ diagrams, use case diagrams, state diagrams, activity diagrams, component
+ diagrams and deployment diagrams.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kdesdk-kio-plugins
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, subversion
+Replaces: kdesdk-misc (<< 4:3.5.0)
+Description: subversion ioslave for KDE
+ This package provides easy access to remote SVN repositories from within
+ Konqueror, and KDE generally, by browsing them as if they were a
+ filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kunittest
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Description: unit testing library for KDE
+ KUnitTest is a small library that facilitates the writing of tests for
+ KDE developers. There are two ways to use the KUnitTest library. One is
+ to create dynamically loadable modules and use the kunittestmodrunner or
+ kunittestguimodrunner programs to run the tests. The other is to use the
+ libraries to create your own testing application.
+ .
+ This package is part of KDE, and a component of the KDE SDK module.
+ See the 'kde' and 'kdesdk' packages for more information.
+
+Package: kdesdk-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: libcvsservice-dev (= ${Source-Version}), kbabel-dev (= ${Source-Version})
+Description: debugging symbols for kdesdk
+ This package contains the debugging symbols associated with kdesdk.
+ They will automatically be used by gdb for debugging kdesdk-related
+ issues.

Added: people/jriddell/KDE/3.5/kdesdk/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,626 @@
+This package was debianized by Ivan E. Moore II <rkrusty at debian.org> on
+Fri, 26 Jan 2001 18:00:00 -0700.
+It was brought up to date by Ben Burton <bab at debian.org> on
+Mon, 26 Mar 2001 09:10:56 -0600.
+Thanks to Robert Lemmen and Philipp Frauenfelder for originally packaging
+umbrello and kcachegrind respectively.
+
+It was downloaded via CVS from cvs.kde.org.
+
+Upstream authors:
+
+  Note that kdesdk has many contributers beyond those listed below.
+
+  Cervisia: Bernd Gehrmann <bernd at mail.berlios.de>,
+      Christian Loose <christian.loose at kdemail.net>,
+      Andre Woebbeking <woebbeking at web.de>,
+      Carlos Woelz <carloswoelz at imap-mail.com> and others
+  KAppTemplate: Kurt Granroth <granroth at kde.org>
+  KBabel: Matthias Kiefer <kiefer at kde.org>,
+      Wolfram Diestel <wolfram at steloj.de>, Andrea Rizzi <rizzi at kde.org>,
+      Stanislav Visnovsky <visnovsky at kde.org>, Marco Wegner <dubbleu at web.de>,
+      Asgeir Frimannsson <asgeirf at redhat.com>,
+      Dwayne Bailey <dwayne at translate.org.za>,
+      Bram Schoenmakers <bramschoenmakers at kde.nl> and others
+  KBugBuster: Martijn Klingens <klingens at kde.org>,
+      Simon Hausmann <hausmann at kde.org>,
+      Cornelius Schumacher <schumacher at kde.org>, David Faure <faure at kde.org>
+  KCachegrind: Josef Weidendorfer <Josef.Weidendorfer at gmx.de>
+  KDE Addressbook Plugin: Carsten Pfeiffer <pfeiffer at kde.org>
+  KDEPalettes: Daniel M. Duley <mosfet at jorsm.com>
+  KMTrace: Waldo Bastian <bastian at kde.org>, Mike Haertel <mike at ai.mit.edu>,
+      Andi Kleen <ak at suse.de>
+  Kompare: John Firebaugh <jfirebaugh at kde.org>,
+      Otto Bruggeman <otto.bruggeman at home.nl> and others
+  KProfileMethod: David Faure <faure at kde.org>
+  KSpy: Richard Moore <rich at kde.org>
+  KStartPerf: Geert Jansen <jansen at kde.org>, Rik Hemsley <rik at kde.org>,
+      Simon Hausmann <hausmann at kde.org> and Bill Soudan <soudan at kde.org>
+  KUIViewer: Richard Moore <rich at kde.org>,
+      Ian Reinhart Geiser <geiseri at kde.org> and
+      Benjamin C. Meyer <ben+kuiviewer at meyerhome.net>
+  PO-XML: Stephan Kulow <coolo at kde.org> and
+      Peter Wells <pete at yamuna.demon.co.uk>
+  Style guide check: Maksim Orlovich <orlovich at cs.rochester.edu>,
+      Ryan Cumming <ryan at completely.kicks-ass.org> and others
+  Subversion I/O slave: Mickael Marchand <marchand at kde.org>
+  Umbrello: Paul Hensgen <phensgen at users.sourceforge.net> and many others
+
+Copyright:
+
+  All components of this package are released under the GNU General
+  Public License (GPL), with the following exceptions.  Note that the
+  abbreviation LGPL refers to the GNU Library General Public License.
+
+    ANTLR (part of PO-XML): (see below)
+    CVS service: LGPL
+    Emacs helper files: Mix of GPL and LGPL
+    KBabel: GPL, though some source files are under the LGPL
+    KCachegrind converters:
+      dprof2calltree, pprof2calltree: (see below)
+    KMTrace: LGPL
+    KProfileMethod: LGPL
+    KStartPerf: Artistic License
+    KUIViewer: LGPL
+    Scripts:
+      cheatmake, extractattr, kde-spellcheck.pl: LGPL
+      cvs-clean, cvslastreferenced: BSD License
+      cvscheck: Artistic License
+      extend_dmalloc: (see below)
+      pruneemptydirs, rc2kcfgxt.pl: Released to the public domain
+    Subversion I/O slave: Mix of GPL and LGPL
+    Umbrello: GPL, though a few source files are under the LGPL
+    Umbrello icons: (see below)
+    DocBook documentation: (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`, `/usr/share/common-licenses/BSD'
+  and `/usr/share/common-licenses/Artistic'.
+
+  --------------------
+
+  ANTLR:
+
+  SOFTWARE RIGHTS
+
+  ANTLR 2.6.0 MageLang Insitute, 1998, 1999
+
+  We reserve no legal rights to the ANTLR--it is fully in the public
+  domain. An individual or company may do whatever they wish with source
+  code distributed with ANTLR or the code generated by ANTLR, including
+  the incorporation of ANTLR, or its output, into commercial software.
+
+  We encourage users to develop software with ANTLR. However, we do ask
+  that credit is given to us for developing ANTLR. By "credit", we mean
+  that if you use ANTLR or incorporate any source code into one of your
+  programs (commercial product, research project, or otherwise) that you
+  acknowledge this fact somewhere in the documentation, research report,
+  etc... If you like ANTLR and have developed a nice tool with the
+  output, please mention that you developed it using ANTLR. In addition,
+  we ask that the headers remain intact in our source code. As long as
+  these guidelines are kept, we expect to continue enhancing this system
+  and expect to make other tools available as they are completed.
+
+  --------------------
+
+  Converters dprof2calltree, pprof2calltree for KCachegrind:
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+  - 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.
+
+  - All advertising materials mentioning features or use of this software
+  must display the following acknowledgement: This product includes software
+  developed by OmniTI Computer Consulting.
+
+  - Neither name of the company nor the names of its contributors may be
+  used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS `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.
+
+  Copyright (c) 2004 OmniTI Computer Consulting
+  All rights reserved
+  The following code was written by George Schlossnagle <george at omniti.com>
+  and is provided completely free and without any warranty.
+
+  --------------------
+
+  Script extend_dmalloc:
+
+  Copyright 1995 by Gray Watson
+
+  This file is part of the dmalloc package.
+
+  Permission to use, copy, modify, and distribute this software for
+  any purpose and without fee is hereby granted, provided that the
+  above copyright notice and this permission notice appear in all
+  copies, and that the name of Gray Watson not be used in advertising
+  or publicity pertaining to distribution of the document or software
+  without specific, written prior permission.
+
+  Gray Watson makes no representations about the suitability of the
+  software described herein for any purpose.  It is provided "as is"
+  without express or implied warranty.
+
+  The author may be contacted at gray.watson at letters.com
+
+  --------------------
+
+  Umbrello Icons:
+
+    The images shipped with Umbrello (including images in the source
+    directory umbrello/umbrello/pics as well as the main Umbrello
+    application and mimetype icons) are released under the following
+    license.
+
+      KDE Crystal theme icons.
+      Copyright (C) 2002 and following years KDE Artists
+
+      This library is free software; you can redistribute it and/or
+      modify it under the terms of the GNU Lesser General Public License
+      as published by the Free Software Foundation, version 2.1 of the
+      License.
+
+      This library is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Lesser General Public License for more details.
+
+      You should have received a copy of the GNU Lesser General Public
+      License along with this library; if not, write to the Free
+      Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+      MA 02110-1301, USA.
+
+          **** NOTE THIS ADD-ON ****
+
+      The GNU Lesser General Public License or LGPL is written for
+      software libraries in the first place. We expressly want the LGPL
+      to be valid for this artwork library too.
+
+      KDE Crystal theme icons is a special kind of software library, it
+      is an artwork library, it's elements can be used in a Graphical
+      User Interface, or GUI.
+
+      Source code, for this library means:
+        - for vectors svg;
+        - for pixels, if applicable, the multi-layered formats xcf
+          or psd, or otherwise png.
+
+      The LGPL in some sections obliges you to make the files carry
+      notices. With images this is in some cases impossible or hardly
+      useful.  With this library a notice is placed at a prominent place
+      in the directory containing the elements. You may follow this practice.
+
+      The exception in section 6 of the GNU Lesser General Public
+      License covers the use of elements of this art library in a GUI.
+
+      kde-artists [at] kde.org
+
+  --------------------
+
+  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/kdesdk/debian/icons/catalogmanager.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/icons/catalogmanager.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/icons/catalogmanager.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * catalogmanager_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #6C360B",
+"+ 	c #4C4C4A",
+"@ 	c #0062C9",
+"# 	c #694D58",
+"$ 	c #565855",
+"% 	c #724F47",
+"& 	c #2364B8",
+"* 	c #3661A4",
+"= 	c #1E6BCC",
+"- 	c #4C6094",
+"; 	c #636562",
+"> 	c #836128",
+", 	c #2F6FCA",
+"' 	c #3075D0",
+") 	c #9C612B",
+"! 	c #6D6D6D",
+"~ 	c #4473BD",
+"{ 	c #9D5E3C",
+"] 	c #B35C13",
+"^ 	c #3B7DD4",
+"/ 	c #937641",
+"( 	c #A9702A",
+"_ 	c #4685DB",
+": 	c #C67508",
+"< 	c #B97338",
+"[ 	c #588BDD",
+"} 	c #5C94D9",
+"| 	c #C0832E",
+"1 	c #D07941",
+"2 	c #BD7E5C",
+"3 	c #6394E3",
+"4 	c #8D8F8C",
+"5 	c #978D81",
+"6 	c #C58B19",
+"7 	c #AB8877",
+"8 	c #DA8128",
+"9 	c #A78E6E",
+"0 	c #EE7F06",
+"a 	c #B58E53",
+"b 	c #E28513",
+"c 	c #699CE8",
+"d 	c #6F9EDE",
+"e 	c #B2955A",
+"f 	c #A4977C",
+"g 	c #AB9479",
+"h 	c #AA9384",
+"i 	c #ED8A04",
+"j 	c #BC9747",
+"k 	c #C78E5F",
+"l 	c #D3922E",
+"m 	c #C9924C",
+"n 	c #74A2E5",
+"o 	c #9B9D9A",
+"p 	c #DA8E45",
+"q 	c #DF9425",
+"r 	c #E6912D",
+"s 	c #D8934E",
+"t 	c #D9915A",
+"u 	c #A5A193",
+"v 	c #C99674",
+"w 	c #C2A249",
+"x 	c #E8971D",
+"y 	c #D49A4A",
+"z 	c #A9A19A",
+"A 	c #BC9F73",
+"B 	c #C89683",
+"C 	c #E5924B",
+"D 	c #BFA25D",
+"E 	c #81AAE5",
+"F 	c #C1A169",
+"G 	c #BEA755",
+"H 	c #B6A18B",
+"I 	c #EC9157",
+"J 	c #B3A298",
+"K 	c #AAA5A3",
+"L 	c #B7A777",
+"M 	c #FF9A00",
+"N 	c #D1A34F",
+"O 	c #EA9A3C",
+"P 	c #A6A9A7",
+"Q 	c #D2A15B",
+"R 	c #BAA683",
+"S 	c #CCA26D",
+"T 	c #E2A141",
+"U 	c #E09974",
+"V 	c #C4AA70",
+"W 	c #E0A734",
+"X 	c #DA9D80",
+"Y 	c #E59F59",
+"Z 	c #C3A49D",
+"` 	c #C4AB77",
+" .	c #C9AC65",
+"..	c #F9994D",
+"+.	c #B7ACA0",
+"@.	c #FDA217",
+"#.	c #E9AD13",
+"$.	c #EDA72A",
+"%.	c #BCAE90",
+"&.	c #EEA056",
+"*.	c #E3A74F",
+"=.	c #FFA900",
+"-.	c #92B5E9",
+";.	c #E9AE22",
+">.	c #E1AF3D",
+",.	c #DCAC61",
+"'.	c #B2B4B1",
+").	c #B2B2BC",
+"!.	c #E4A47F",
+"~.	c #FFAE00",
+"{.	c #C8AF94",
+"].	c #E5AA60",
+"^.	c #BAB3AF",
+"/.	c #C9B773",
+"(.	c #FFA63C",
+"_.	c #FFAF12",
+":.	c #FEB300",
+"<.	c #E0B356",
+"[.	c #FEAE21",
+"}.	c #D8B180",
+"|.	c #F6A475",
+"1.	c #CDB590",
+"2.	c #ECB34B",
+"3.	c #F0B153",
+"4.	c #F1BA23",
+"5.	c #A1BEEF",
+"6.	c #E2B37E",
+"7.	c #BBBDB9",
+"8.	c #F0BF27",
+"9.	c #F2C509",
+"0.	c #FEB929",
+"a.	c #E1C53A",
+"b.	c #FFB734",
+"c.	c #C3BFB0",
+"d.	c #D2BF88",
+"e.	c #FFB640",
+"f.	c #C7BFAB",
+"g.	c #FFC012",
+"h.	c #A8C1FA",
+"i.	c #EBBB65",
+"j.	c #EAC24C",
+"k.	c #FFC600",
+"l.	c #DEC65A",
+"m.	c #DBBBA1",
+"n.	c #A8C5F7",
+"o.	c #FFB274",
+"p.	c #FEBE37",
+"q.	c #E7CE21",
+"r.	c #C1C4C0",
+"s.	c #ECC837",
+"t.	c #EABB85",
+"u.	c #FEB280",
+"v.	c #F0B691",
+"w.	c #CDC4A8",
+"x.	c #EBD115",
+"y.	c #D7C0AA",
+"z.	c #FFBE48",
+"A.	c #F3BE77",
+"B.	c #FECF00",
+"C.	c #B1C9F5",
+"D.	c #FFBF5B",
+"E.	c #FFCB1C",
+"F.	c #E2CE5D",
+"G.	c #F0C17E",
+"H.	c #C7C9C5",
+"I.	c #F2CB48",
+"J.	c #CEC7C4",
+"K.	c #FEC35E",
+"L.	c #FDBA91",
+"M.	c #FFC169",
+"N.	c #CFCBBC",
+"O.	c #D9CBA5",
+"P.	c #FFC84F",
+"Q.	c #FBC181",
+"R.	c #FCCB4E",
+"S.	c #FFCD3C",
+"T.	c #BACEF5",
+"U.	c #D2CBC7",
+"V.	c #FCC865",
+"W.	c #FEC66B",
+"X.	c #FFC37A",
+"Y.	c #CCCECB",
+"Z.	c #DAD09C",
+"`.	c #FFDB00",
+" +	c #F9C97C",
+".+	c #F9C691",
+"++	c #FFC878",
+"@+	c #FEDA25",
+"#+	c #D0D2CF",
+"$+	c #C0D3F9",
+"%+	c #FDC59E",
+"&+	c #EAD67B",
+"*+	c #FAC6A9",
+"=+	c #FCD16A",
+"-+	c #FED846",
+";+	c #D8D2CF",
+">+	c #FFD071",
+",+	c #FCD464",
+"'+	c #EBD2A2",
+")+	c #FFD079",
+"!+	c #FFE700",
+"~+	c #D4D6D3",
+"{+	c #FBEA01",
+"]+	c #FFCE92",
+"^+	c #FFD85D",
+"/+	c #FECE9E",
+"(+	c #FFDC54",
+"_+	c #FED482",
+":+	c #FCDE54",
+"<+	c #FEE240",
+"[+	c #CCDBEE",
+"}+	c #FDD48E",
+"|+	c #FEE62B",
+"1+	c #FFD396",
+"2+	c #DEDACB",
+"3+	c #FDDC6F",
+"4+	c #D9DBD7",
+"5+	c #FED6A4",
+"6+	c #FFD3B3",
+"7+	c #FDE752",
+"8+	c #FFF407",
+"9+	c #FDE272",
+"0+	c #FEDA9B",
+"a+	c #FFEB43",
+"b+	c #FFE75B",
+"c+	c #D4E0FB",
+"d+	c #DFE1DD",
+"e+	c #FFFA00",
+"f+	c #FED7C0",
+"g+	c #FDDAB5",
+"h+	c #FFDBAE",
+"i+	c #FEFE00",
+"j+	c #D5E5F9",
+"k+	c #FEE686",
+"l+	c #FFEA73",
+"m+	c #FFE593",
+"n+	c #FCF837",
+"o+	c #E3E5E2",
+"p+	c #FFDEC5",
+"q+	c #FDF16C",
+"r+	c #FFF363",
+"s+	c #E0E8F7",
+"t+	c #FDE1D2",
+"u+	c #DEEAFF",
+"v+	c #FCFC58",
+"w+	c #FFEBB5",
+"x+	c #FFF19B",
+"y+	c #E4EDFC",
+"z+	c #EBEEEA",
+"A+	c #FFF884",
+"B+	c #FFECCD",
+"C+	c #F1F3F0",
+"D+	c #FFFD96",
+"E+	c #F8FAF7",
+"F+	c #FBFDFA",
+"G+	c #FEFFFC",
+"  4 '.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.'.o     ",
+"  4 y+$+$+T.$+T.C.$+5.5.h.-.h.-.-.E E E E E d d n n } } -.).    ",
+"  4 u+h.c+T.$+T.n.n.c n 3 3 [ [ _ [ _ ^ ' ' , , = = @ @ } '.    ",
+"  4 u+h.c+n.T.C.C.T.c 3 3 3 [ [ [ _ ^ ^ ~ ~ = = & * - # % K     ",
+"  4 F+u+y+u+s+j+j+s+j+j+j+j+c+[+c+c+[+y.S +.).Z B U U { 4 K     ",
+"  4 F+F+;+;+4+;+U.J.o+d+H.r.d+;+r.1.T b < v X *+t+f+2 ^.C+).    ",
+"  4 F+E+H.J.#+~+).^.J.J.J.7.H.c.<.x b C v.f+t+t+f+2 Z o+C+'.    ",
+"  4 F+F+s+C+C+C+z+z+C+y+C+d+'+T r Y 6+p+p+p+p+f+!.7 d+C+C+).    ",
+"  4 F+F+o+;+s+d+;+s+2+;+y.<.l T .+h+g+g+f+6+*+*+1 h ;+d+C+'.    ",
+"  4 G+y+J.J.U.s+~+J.;+f.>.q G.h+h+/+h+h+1+/+%+|.1 m h J.C+).    ",
+"  4 G+E+r.#+J.J.s+~+N.N l Q.5+h+5+.+1+1+1+.+L.I t 0+m z C+'.    ",
+"  4 F+E+#+;+r.#+Y.J.F O ++}+1+h+p+w+}+_+_+Q.u.I ].x+F.R C+).    ",
+"  4 F+E+#+s+#+o+~+{.y G.G. + + +1+B+0+_+>+)+o.C *.k+j.g z+^.    ",
+"  4 G+y+;+;+J.y.Q 3.f.P %.++V.M.++0+w+3+^+^+D...O V.l h m.v s ] ",
+"  4 G+F+E+E+1.2.j.,+z ! f V.D.D.D. +w+9+^+(+R...O I.( k t.g+6.. ",
+"  4 G+y+o+o+F #.E.-+&+Z.k+P.z.e.e.W.m+b+<+7+<+(.b : p 5+g+/+)   ",
+"  4 G+E+;+o+N.D 9. at +@+ at +<+S.z.e.e.D.k+a+|+|+!+ at .0 8 X.]+1+]..   ",
+"  4 G+y+#+;+4+J.D x.{+{+!+B.~._.=.D. at +8+8+8+!+M 0 &.A.)+)+m     ",
+"  4 G+C+J.~+#+#+^.G |+8+8+B.~._._.[.|+e+e+e+|+M b 3.W.=+3+j     ",
+"  4 G+y+C+y+o+C+z+4+/.q.S.g.~._.=.~.8+i+i+i+k.M b 2.l+A+A+ .    ",
+"  4 G+C+;+;+;+#+~+#+r.L <.}+z.[.=.k.8+i+e+!+:.[.| a I.q+D+/.    ",
+"  4 F+C+C+y+C+C+C+z+C+C+{.0+w+_+0.`.i+i+{+g.p.$.A 4+L a.r+&+    ",
+"  4 F+C+J.J.).J.#+~+J.H.+.,._+_+>+-+r+n+ at +R.R.6 5 ).P f e  .>   ",
+"  4 G+y+r.~+~+#+J.J.#+J.c.` ,+,+,+^+l+m+m+k+;.9 ;+4+o+;+P +     ",
+"  4 G+C+#+#+#+#+~+J.#+s+7.{.R.^+^+-+4.S.S.8.j #+E+E+F+o++       ",
+"  4 F+E+).).J.[+~+).J.C+C+2+l.7+7+b+w A j / J.C+y+F+;+!         ",
+"  4 F+G+E+E+C+C+C+C+C+E+E+C+O.F.q+r+l.N.;+o C+C+C+~++           ",
+"  4 F+C+J.).J.~+J.#+F+y+F+F+F+N.d.&+F.f.C+).o+C+J.!             ",
+"  4 F+F+F+F+F+F+y+F+F+F+F+E+F+E+d+f.%.;+C+K o+J.+               ",
+"  4 F+F+F+F+F+F+G+F+F+F+F+F+E+F+E+E+F+F+E+).J.$                 ",
+"  4 ~+~+s+;+4+4+~+~+;+s+;+s+~+~+4+~+~+~+~+P                     ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdesdk/debian/icons/cervisia.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/icons/cervisia.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/icons/cervisia.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,195 @@
+/* XPM */
+static char * cervisia_xpm[] = {
+"32 32 160 2",
+"  	c None",
+". 	c #210000",
+"+ 	c #220101",
+"@ 	c #2A0000",
+"# 	c #2D0001",
+"$ 	c #2E0102",
+"% 	c #310002",
+"& 	c #330000",
+"* 	c #340100",
+"= 	c #370001",
+"- 	c #380002",
+"; 	c #3A0000",
+"> 	c #3B0000",
+", 	c #3C0100",
+"' 	c #3C0100",
+") 	c #410003",
+"! 	c #4B0000",
+"~ 	c #4C0000",
+"{ 	c #560000",
+"] 	c #570001",
+"^ 	c #5A0200",
+"/ 	c #5E0000",
+"( 	c #5F0000",
+"_ 	c #600001",
+": 	c #5B0300",
+"< 	c #610002",
+"[ 	c #620003",
+"} 	c #5C0400",
+"| 	c #640100",
+"1 	c #680000",
+"2 	c #630205",
+"3 	c #690000",
+"4 	c #6A0001",
+"5 	c #650300",
+"6 	c #6B0002",
+"7 	c #6C0000",
+"8 	c #6C0004",
+"9 	c #660400",
+"0 	c #6D0100",
+"a 	c #730000",
+"b 	c #6E0300",
+"c 	c #740001",
+"d 	c #750000",
+"e 	c #750002",
+"f 	c #770000",
+"g 	c #760004",
+"h 	c #700400",
+"i 	c #770105",
+"j 	c #790200",
+"k 	c #710601",
+"l 	c #780206",
+"m 	c #7E0001",
+"n 	c #7F0002",
+"o 	c #800000",
+"p 	c #800003",
+"q 	c #7A0400",
+"r 	c #820000",
+"s 	c #810004",
+"t 	c #730903",
+"u 	c #7B0600",
+"v 	c #830200",
+"w 	c #880001",
+"x 	c #830206",
+"y 	c #890002",
+"z 	c #840300",
+"A 	c #8C0000",
+"B 	c #8B0003",
+"C 	c #8C0004",
+"D 	c #850500",
+"E 	c #8D0100",
+"F 	c #8D0105",
+"G 	c #930000",
+"H 	c #8E0300",
+"I 	c #940001",
+"J 	c #950002",
+"K 	c #970000",
+"L 	c #960003",
+"M 	c #980000",
+"N 	c #860809",
+"O 	c #980004",
+"P 	c #900500",
+"Q 	c #990200",
+"R 	c #9D0000",
+"S 	c #910700",
+"T 	c #9F0000",
+"U 	c #A00001",
+"V 	c #A10002",
+"W 	c #A20000",
+"X 	c #9A0500",
+"Y 	c #8A0D04",
+"Z 	c #A40100",
+"` 	c #9B0700",
+" .	c #A90000",
+"..	c #AB0000",
+"+.	c #AC0001",
+"@.	c #A50400",
+"#.	c #AD0001",
+"$.	c #A50405",
+"%.	c #AE0002",
+"&.	c #AC0008",
+"*.	c #AF0000",
+"=.	c #AD0009",
+"-.	c #AE010A",
+";.	c #B40000",
+">.	c #B50000",
+",.	c #B00300",
+"'.	c #A60706",
+").	c #B00303",
+"!.	c #B70007",
+"~.	c #B80008",
+"{.	c #A70907",
+"].	c #B90009",
+"^.	c #B10604",
+"/.	c #A70A0E",
+"(.	c #B1060C",
+"_.	c #A80C07",
+":.	c #9F0F11",
+"<.	c #B20905",
+"[.	c #AA0E08",
+"}.	c #B2090D",
+"|.	c #BC050B",
+"1.	c #B30C06",
+"2.	c #BB0613",
+"3.	c #AB1109",
+"4.	c #B30C0E",
+"5.	c #AE1714",
+"6.	c #B72327",
+"7.	c #B92528",
+"8.	c #A62F2C",
+"9.	c #A13231",
+"0.	c #A63634",
+"a.	c #C22F2E",
+"b.	c #C82C30",
+"c.	c #CA2D2C",
+"d.	c #CA2D31",
+"e.	c #C4312F",
+"f.	c #CB2E2D",
+"g.	c #B43C3C",
+"h.	c #CC3935",
+"i.	c #D23637",
+"j.	c #C53C3E",
+"k.	c #CC393B",
+"l.	c #CD3A3C",
+"m.	c #CE3C3D",
+"n.	c #D13E3F",
+"o.	c #C64547",
+"p.	c #DA3D3D",
+"q.	c #DB3F3E",
+"r.	c #D64242",
+"s.	c #DC403F",
+"t.	c #D04646",
+"u.	c #DD4140",
+"v.	c #DF4240",
+"w.	c #E14542",
+"x.	c #E05659",
+"y.	c #FF8788",
+"z.	c #FF8889",
+"A.	c #FF898A",
+"B.	c #FF8D8B",
+"C.	c #FE9494",
+"                                                                ",
+"    g.r.}.4.4.4.4.}.}.}.}.V !     o.m.}.4.4.}.4.}.}.}.}.Q )     ",
+"    y.h.;.!.1.1.<.^.-.{.V P g     y.e.1.!.1.1.<.%.-.{.$.P a     ",
+"    u.1.;.;.>.>.%.+. at .V ` F g     w.].>.;.>.>.%.+. at .W V B k     ",
+"    r.!.,.>.*.,.+. . at .V V D k     u.!.,.>.+.,.%. . at .V ` B h     ",
+"    v.4.+.*.*.%.+. at . .V Q B 8     s.%.+.*.*.%. at .@. at .Q V x 8     ",
+"    s.3. at . .+. at . .V @.R Q w 8     r.3. . .+.+. .Z @.Q Q x 6     ",
+"    q.-. at .@. at .@.W V Q L J r 7     s.+. at .@. at .@.W V R L L r 9     ",
+"    <.V G G L P E E E r p k 9     1.L J J G P B w E r p g [     ",
+"    ! h g a h a b 6 / / / ] +     ! h 6 6 h 8 b | / / : { .     ",
+"                                                                ",
+"                  0.m.-./.5.}.}.}.}._._.L ,     k.{.{.5.}.s     ",
+"                  y.m.1.!.1.1.<._.}._.'.L a   j.x.!.^.}.'.B     ",
+"                  w.1.>.>.>.!.%.%. .V ` E h   7.f.*.>. at .V Y     ",
+"                  u.!.*.>.*.%.*. . . at .Q B h   6.c.+.>.+./.N     ",
+"                  r.4.+.+.*.,.+. at .V V V D 6   6.e.*. . at .L D     ",
+"                  s.3. . at .+. . . at .V Q L z 6   7.a. . . at .L u     ",
+"                  q.-. at . . at .@.V V Q L L p 9   7.b. at .@. at .L l     ",
+"                  <.Q P J S J E E E z r g 2   S 5.G P F x i     ",
+"                  ! g g h a h a a 6 | < ] @     p 8 6 9 6 }     ",
+"                                                                ",
+"    8.i.}.}.}.}.}.}._./.-.P >     9.a.{._.}.}.}._././.'.E       ",
+"    B.n.1.1.1.1.}.4.-._.&.L g     C.k.].1.1.<.4.^.-._.'.L h     ",
+"    w.1.>.>.>.!.*.+. at .V Q F g     w.1.;.>.>.%.%.+. at .V V D g     ",
+"    r.].;.>.*.*.+.+. .V ` D g     u.1.%.>.>.>.+.+. at .V V D k     ",
+"    v.4.+.*.*.%.*. .$.V V E h     s.<.,.*. .+.+. at .@.` Q B 8     ",
+"    s.}. . . at .+. . at .W Q L z 8     r.%. .+. . . . .W V L w 8     ",
+"    s._. at .@. . at .@.W Q Q Q s 7     u.-. at .@. at .@. at .V R Q Q p 9     ",
+"    |.V Q Q L L J J E w z t 9     4.V Q Q L L P G w z z l 2     ",
+"    ] q q q j j a b a 7 6 9 %     < u q q q j a h b 6 9 9 $     ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdesdk/debian/icons/kbabel.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/icons/kbabel.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/icons/kbabel.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * kbabel_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #000100",
+"+ 	c #250003",
+"@ 	c #1C0702",
+"# 	c #221502",
+"$ 	c #381D01",
+"% 	c #9C0003",
+"& 	c #582402",
+"* 	c #72151D",
+"= 	c #4D2E02",
+"- 	c #252EB8",
+"; 	c #B40804",
+"> 	c #C60100",
+", 	c #D00000",
+"' 	c #6D300D",
+") 	c #CF0009",
+"! 	c #2D33B6",
+"~ 	c #A31620",
+"{ 	c #DD0000",
+"] 	c #BB1113",
+"^ 	c #AC1F03",
+"/ 	c #313CBA",
+"( 	c #F5010B",
+"_ 	c #B62012",
+": 	c #E00B11",
+"< 	c #3643B7",
+"[ 	c #FD0002",
+"} 	c #CA1811",
+"| 	c #C32200",
+"1 	c #7F4700",
+"2 	c #E21709",
+"3 	c #A7302D",
+"4 	c #B13506",
+"5 	c #8F450F",
+"6 	c #BC3412",
+"7 	c #4452C4",
+"8 	c #FA161A",
+"9 	c #BF312D",
+"0 	c #994A31",
+"a 	c #F62120",
+"b 	c #485AC9",
+"c 	c #E4282C",
+"d 	c #835B25",
+"e 	c #DA311E",
+"f 	c #9E5224",
+"g 	c #A85306",
+"h 	c #F1292A",
+"i 	c #5062CA",
+"j 	c #C73B5B",
+"k 	c #A26300",
+"l 	c #EB4000",
+"m 	c #D63D52",
+"n 	c #BC5324",
+"o 	c #526BD0",
+"p 	c #C55516",
+"q 	c #946A2C",
+"r 	c #F73A3B",
+"s 	c #D3521F",
+"t 	c #C96100",
+"u 	c #9A7818",
+"v 	c #CD600E",
+"w 	c #B27004",
+"x 	c #BA6D00",
+"y 	c #AF6848",
+"z 	c #D25E1F",
+"A 	c #6475D0",
+"B 	c #C86832",
+"C 	c #C86E26",
+"D 	c #FC4D51",
+"E 	c #818380",
+"F 	c #CA7603",
+"G 	c #F85453",
+"H 	c #C58000",
+"I 	c #E0644F",
+"J 	c #B38719",
+"K 	c #D97900",
+"L 	c #DF790F",
+"M 	c #F3710A",
+"N 	c #C68616",
+"O 	c #798BDA",
+"P 	c #D27C39",
+"Q 	c #D08230",
+"R 	c #B3922B",
+"S 	c #EF6967",
+"T 	c #E08015",
+"U 	c #DB8603",
+"V 	c #CD8442",
+"W 	c #D77E47",
+"X 	c #F67F03",
+"Y 	c #8790DA",
+"Z 	c #C99517",
+"` 	c #E4852B",
+" .	c #D7920D",
+"..	c #E28F00",
+"+.	c #E18C1E",
+"@.	c #9595C4",
+"#.	c #FB8600",
+"$.	c #C0964F",
+"%.	c #C39B2E",
+"&.	c #DF884A",
+"*.	c #E09502",
+"=.	c #EE8F00",
+"-.	c #D09537",
+";.	c #DD9427",
+">.	c #D48E63",
+",.	c #9FA09A",
+"'.	c #F79100",
+").	c #F78C1F",
+"!.	c #E28C5B",
+"~.	c #EA8280",
+"{.	c #88A3E0",
+"].	c #FF9100",
+"^.	c #E39342",
+"/.	c #F09A00",
+"(.	c #F88081",
+"_.	c #D7A030",
+":.	c #E69064",
+"<.	c #EEA000",
+"[.	c #DC985C",
+"}.	c #DC9C4D",
+"|.	c #E49C46",
+"1.	c #E9A219",
+"2.	c #D1AB2B",
+"3.	c #9AA5E4",
+"4.	c #ECAA09",
+"5.	c #E6A33F",
+"6.	c #ABA6D1",
+"7.	c #CBAF4D",
+"8.	c #EE918F",
+"9.	c #FFA302",
+"0.	c #FEA700",
+"a.	c #BAAFA3",
+"b.	c #E8A657",
+"c.	c #EAB117",
+"d.	c #E8A84F",
+"e.	c #FFA90E",
+"f.	c #EAA662",
+"g.	c #DEB62F",
+"h.	c #E5AE4D",
+"i.	c #E5B238",
+"j.	c #FFB000",
+"k.	c #FEAE10",
+"l.	c #FBA064",
+"m.	c #EFAE3D",
+"n.	c #E7A67E",
+"o.	c #F19D9B",
+"p.	c #FEA759",
+"q.	c #F2B62D",
+"r.	c #EDC100",
+"s.	c #EBA4A4",
+"t.	c #FEB41B",
+"u.	c #FFB904",
+"v.	c #EBBB37",
+"w.	c #EAB855",
+"x.	c #FDB04F",
+"y.	c #ECC02D",
+"z.	c #FFB535",
+"A.	c #FDA2A2",
+"B.	c #D1BE87",
+"C.	c #DDB78C",
+"D.	c #FFBA20",
+"E.	c #FDC200",
+"F.	c #FDB933",
+"G.	c #D5BD8E",
+"H.	c #FFB846",
+"I.	c #FFBF21",
+"J.	c #FFC212",
+"K.	c #FDAF7E",
+"L.	c #E0BD84",
+"M.	c #E3C84E",
+"N.	c #FEBC47",
+"O.	c #FEC52B",
+"P.	c #F3B2B2",
+"Q.	c #FFBE58",
+"R.	c #FFC341",
+"S.	c #FFD000",
+"T.	c #DFCB73",
+"U.	c #FECA2A",
+"V.	c #FACA3A",
+"W.	c #FFBE76",
+"X.	c #FFC169",
+"Y.	c #F3C47F",
+"Z.	c #FEBB92",
+"`.	c #FEC56A",
+" +	c #FFC85E",
+".+	c #FFD130",
+"++	c #FFDA00",
+"@+	c #E6CB95",
+"#+	c #FAC09E",
+"$+	c #FBCC5B",
+"%+	c #F8C68B",
+"&+	c #F4C696",
+"*+	c #FFD23D",
+"=+	c #F0D94D",
+"-+	c #FFC97A",
+";+	c #FED154",
+">+	c #FFCC6E",
+",+	c #F8DE21",
+"'+	c #FDCC75",
+")+	c #FFD840",
+"!+	c #E8CACB",
+"~+	c #FCCF84",
+"{+	c #FFCD8B",
+"]+	c #EAD88C",
+"^+	c #FBDC4A",
+"/+	c #FFE800",
+"(+	c #FFCD91",
+"_+	c #FFD372",
+":+	c #FFD760",
+"<+	c #FFDA52",
+"[+	c #F7DA73",
+"}+	c #FEEC00",
+"|+	c #FFDF45",
+"1+	c #FDD581",
+"2+	c #FCDE54",
+"3+	c #FACFAA",
+"4+	c #FFCF9D",
+"5+	c #FED38E",
+"6+	c #FBDE5C",
+"7+	c #FFD294",
+"8+	c #FFE91A",
+"9+	c #FFE33D",
+"0+	c #FEF200",
+"a+	c #FEE44C",
+"b+	c #FBD897",
+"c+	c #C7E1F6",
+"d+	c #FCE06D",
+"e+	c #FDED25",
+"f+	c #FCCFD2",
+"g+	c #FFD7A2",
+"h+	c #F8E181",
+"i+	c #FFF319",
+"j+	c #FFD5BA",
+"k+	c #FFD8AC",
+"l+	c #FDEB51",
+"m+	c #F6D8D6",
+"n+	c #FFDAB3",
+"o+	c #EADDDD",
+"p+	c #E2E0E4",
+"q+	c #FEFD00",
+"r+	c #FCED5E",
+"s+	c #FFE96C",
+"t+	c #FEDBBA",
+"u+	c #FAF068",
+"v+	c #FEDDC4",
+"w+	c #FFEB7B",
+"x+	c #FFE991",
+"y+	c #D7EBF8",
+"z+	c #FFE4BB",
+"A+	c #FFE2D3",
+"B+	c #FEE6C3",
+"C+	c #F2E8E8",
+"D+	c #FFF77C",
+"E+	c #FFFA88",
+"F+	c #E9F2F4",
+"G+	c #F9F3F2",
+"                                                                ",
+"                                                p W p &         ",
+"                                    ].K 5 B :.#+A+>.            ",
+"                                9.=.K &.#+v+A+A+n.'             ",
+"                              /.+.f.3+j+v+v+A+#+f               ",
+"                          <.U f.&+j+j+t+j+3+j+!.                ",
+"                        <.;.Y.k+g+g+k+g+3+#+Z.W Q               ",
+"                      *.|.7+n+k+g+g+7+7+(+Z.K.W b+|.            ",
+"                    +.5.{+5+7+z+B+b+~+1+{+K.:.[.h+d+            ",
+"                    }.L.~+-+-+{+z+B+1+_+_+W.l.|.h+$+1           ",
+"                ;.w.a.,.C.>+Q.X.-+z+x+:+:+$+p.` _+;.    [.f.g   ",
+"            x 4.;+[+,.E G.Q. +Q.X.b+x+<+^+<+x.` y.k V &+t+[.    ",
+"              4.r.|+h+]+6+R.N.z.H.~+w+a+9+9+N.).F ^.4+g+%+f     ",
+"              d r.++++,+9+O.F.z.H._+l+8+e+8+j.X ` %+{+b+b.      ",
+"      ! - - ! < 0 r.}+}+8+u.k.k.z.O.i+i+i+0+t.#.^.W.`.'+-.      ",
+"      Y b Y b 6. at .B.,+i+/+u.0.z.e.J.q+q+q+i+9.'.m._+d+s+%.      ",
+"      / < A 7 b 6.8.s q.R.F.j.e.9.++q+q+q+S.e.+.N d+E+E+7.      ",
+"    ! Y i A o {.j a h I %+b+>+t.u.}+q+q+/+u.z.k $ Z a+E+T.      ",
+"    / i b 3.o O m G P.o+C.~+5+~+R.i+q+i+J.R.1.= . # J M.h+      ",
+"    {.A o A O {.!+C+P.(.S b._+_+:+s+E+d+[+:+w @ . .     q       ",
+"    o+c+c+c+y+p+P.G 2 r S |.:+:+:+*+:+h+:+1.^ % @               ",
+"    c ~.o.8.S h 8 h (.m+G+ at +<+2+2+y.C  . .4 | { ;               ",
+"    c { { ( 8 r 8.m+G+f+A.~.w.r+r+l+y 3 9 > { { ,               ",
+"    o+P.8.P.!+F+F+P.G 8 [ [ 2 W h+u+$.9 e { { { )               ",
+"    !+F+F+F+o+o.G 8 8 a a : 2 : ; n f Q ).M l , >               ",
+"  : ( r G r a 8 a h e ; _ 6 6 p z 2 C i.t.j.9.X |               ",
+"  ) ( [ [ 8 h c e ] ; 6 4 z +.q.V.m._.v.D.j.0.9.K               ",
+"    % ; ] ~ *   x t v T /.O.*+)+|+<+<+V.O.I.j.e...              ",
+"                ..<.t.I.O.*+)+)+|+|+|+*+V.I.u.k.U               ",
+"                9.e.t.I.V..+a+l+l+a+<+g.Z Z ;.<.H               ",
+"                9.k.D.J.*+)+^+l+=+R                             ",
+"                w ..4.q.y.y.2.u                                 "};

Added: people/jriddell/KDE/3.5/kdesdk/debian/icons/kbabeldict.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/icons/kbabeldict.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/icons/kbabeldict.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * kbabeldict_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #6E310E",
+"+ 	c #8D5201",
+"@ 	c #885902",
+"# 	c #AD570C",
+"$ 	c #9D640A",
+"% 	c #737175",
+"& 	c #A26E07",
+"* 	c #6C7393",
+"= 	c #A37400",
+"- 	c #B36C02",
+"; 	c #C67508",
+"> 	c #D47602",
+", 	c #BF7548",
+"' 	c #828695",
+") 	c #908870",
+"! 	c #CD7340",
+"~ 	c #CE7548",
+"{ 	c #CA8406",
+"] 	c #DD8201",
+"^ 	c #D67A40",
+"/ 	c #B99123",
+"( 	c #8C8FAA",
+"_ 	c #C9853A",
+": 	c #E98000",
+"< 	c #EB7D0B",
+"[ 	c #DA8128",
+"} 	c #E38219",
+"| 	c #F28201",
+"1 	c #E38C00",
+"2 	c #A19980",
+"3 	c #ED8A04",
+"4 	c #8999C5",
+"5 	c #EC8E00",
+"6 	c #979BAA",
+"7 	c #989BB7",
+"8 	c #E29222",
+"9 	c #D79532",
+"0 	c #DD942B",
+"a 	c #E6912D",
+"b 	c #E5990C",
+"c 	c #D9915A",
+"d 	c #A5A193",
+"e 	c #A0A2A5",
+"f 	c #E5924B",
+"g 	c #ED8E52",
+"h 	c #E0936A",
+"i 	c #FF9800",
+"j 	c #F39149",
+"k 	c #D99F4E",
+"l 	c #C1A95B",
+"m 	c #EA9A3C",
+"n 	c #9CA7CE",
+"o 	c #E0A03C",
+"p 	c #EC945C",
+"q 	c #E2A044",
+"r 	c #FF9E00",
+"s 	c #EBA41C",
+"t 	c #C6A775",
+"u 	c #E0A72F",
+"v 	c #C6AC65",
+"w 	c #A7AAC6",
+"x 	c #E29B76",
+"y 	c #E59F59",
+"z 	c #DFA840",
+"A 	c #A5ACCE",
+"B 	c #FDA217",
+"C 	c #C5B25B",
+"D 	c #E8AD20",
+"E 	c #EEA056",
+"F 	c #E3A74F",
+"G 	c #C1B080",
+"H 	c #EBAF15",
+"I 	c #FFA900",
+"J 	c #E4AC3C",
+"K 	c #AFB0BA",
+"L 	c #C3AE91",
+"M 	c #FD9D4F",
+"N 	c #DDAD5F",
+"O 	c #D3AD7C",
+"P 	c #FFAE00",
+"Q 	c #D9AE6B",
+"R 	c #EFA275",
+"S 	c #FFA63C",
+"T 	c #D4AF84",
+"U 	c #FFAF12",
+"V 	c #FEB300",
+"W 	c #C7B97A",
+"X 	c #FEAE21",
+"Y 	c #E3B357",
+"Z 	c #BEB8A4",
+"` 	c #CFB681",
+" .	c #DFB65E",
+"..	c #ECB34B",
+"+.	c #F0B153",
+"@.	c #BEB8B7",
+"#.	c #B5B8D5",
+"$.	c #DCC13F",
+"%.	c #B3BADC",
+"&.	c #B5BCD1",
+"*.	c #FAB926",
+"=.	c #B2BDD8",
+"-.	c #F0BF27",
+";.	c #FEB53B",
+">.	c #D9C25D",
+",.	c #D5B7A3",
+"'.	c #BCBDC7",
+").	c #F2C509",
+"!.	c #FFB734",
+"~.	c #DAC64A",
+"{.	c #FFC012",
+"].	c #D2BE9A",
+"^.	c #FFC400",
+"/.	c #BBC0CF",
+"(.	c #FFB845",
+"_.	c #BCBFDC",
+":.	c #E2CF20",
+"<.	c #E8BC79",
+"[.	c #FFB274",
+"}.	c #EFB590",
+"|.	c #FEBE37",
+"1.	c #ECC837",
+"2.	c #FEB280",
+"3.	c #FFBC48",
+"4.	c #BAC5E0",
+"5.	c #ECD218",
+"6.	c #FFCC06",
+"7.	c #FFBE58",
+"8.	c #FECF00",
+"9.	c #FEC24B",
+"0.	c #FFCB1C",
+"a.	c #C1C8DE",
+"b.	c #F3C279",
+"c.	c #FFC162",
+"d.	c #FEC35B",
+"e.	c #BECAE5",
+"f.	c #FAC26E",
+"g.	c #FDBA91",
+"h.	c #FDC362",
+"i.	c #F9C94D",
+"j.	c #FFC169",
+"k.	c #CBC9CD",
+"l.	c #F5CC4E",
+"m.	c #FFD700",
+"n.	c #F4C38E",
+"o.	c #FFC950",
+"p.	c #FFCD3C",
+"q.	c #FDCC49",
+"r.	c #FCC865",
+"s.	c #FEC66B",
+"t.	c #DFD573",
+"u.	c #DAD09C",
+"v.	c #D1CCCA",
+"w.	c #F9C583",
+"x.	c #FFC57F",
+"y.	c #C7CFE5",
+"z.	c #FFDD02",
+"A.	c #DECCBB",
+"B.	c #CECFD9",
+"C.	c #D2CFD4",
+"D.	c #FFC97A",
+"E.	c #F5E405",
+"F.	c #FED929",
+"G.	c #FCCF68",
+"H.	c #FFDC1D",
+"I.	c #FDC59E",
+"J.	c #CDD1E1",
+"K.	c #FDC4A4",
+"L.	c #FFCD6F",
+"M.	c #FEC793",
+"N.	c #F8D269",
+"O.	c #FFD356",
+"P.	c #FDCD7D",
+"Q.	c #F8C7AB",
+"R.	c #FED848",
+"S.	c #FCD464",
+"T.	c #FEDA40",
+"U.	c #CCD4EA",
+"V.	c #EED87C",
+"W.	c #FFE700",
+"X.	c #FCE02E",
+"Y.	c #FFD760",
+"Z.	c #EBD4AA",
+"`.	c #FFD474",
+" +	c #FED18C",
+".+	c #FECE9E",
+"++	c #FED481",
+"@+	c #FFDB5B",
+"#+	c #FFDD54",
+"$+	c #D4D8E8",
+"%+	c #D7D8E2",
+"&+	c #FEE33D",
+"*+	c #FFEE01",
+"=+	c #FFD395",
+"-+	c #FED689",
+";+	c #DED8D7",
+">+	c #FFE829",
+",+	c #FDD68F",
+"'+	c #FDDC71",
+")+	c #FCD696",
+"!+	c #FFD49C",
+"~+	c #FED5A3",
+"{+	c #FFF300",
+"]+	c #FFE649",
+"^+	c #FFD3B3",
+"/+	c #FDE752",
+"(+	c #FEE26E",
+"_+	c #FFF40F",
+":+	c #FDE275",
+"<+	c #FFEB43",
+"[+	c #FFE75B",
+"}+	c #FED6BD",
+"|+	c #FFD9AC",
+"1+	c #DBDFF0",
+"2+	c #DEDFE9",
+"3+	c #FFFA00",
+"4+	c #FFD9B3",
+"5+	c #FEDCA7",
+"6+	c #E2DFE4",
+"7+	c #FFDDA2",
+"8+	c #E8DFD8",
+"9+	c #FED8C5",
+"0+	c #FEE872",
+"a+	c #FEDBBA",
+"b+	c #FEFE00",
+"c+	c #FFE19E",
+"d+	c #FEE686",
+"e+	c #FFDFB0",
+"f+	c #FFE593",
+"g+	c #E2E3ED",
+"h+	c #FCF837",
+"i+	c #E5E3E7",
+"j+	c #FFDEC3",
+"k+	c #FDF26A",
+"l+	c #FFF363",
+"m+	c #FFE1CC",
+"n+	c #FDE1D2",
+"o+	c #E7E7F2",
+"p+	c #E5EAED",
+"q+	c #FCFC58",
+"r+	c #EBE9ED",
+"s+	c #E9EAF4",
+"t+	c #FFEBB5",
+"u+	c #FFF19B",
+"v+	c #F0EBE9",
+"w+	c #EBECF6",
+"x+	c #FFECCD",
+"y+	c #F0EDF2",
+"z+	c #EDF2F5",
+"A+	c #F2F0F4",
+"B+	c #F5F2F7",
+"C+	c #F2F7FA",
+"D+	c #F7F5F9",
+"E+	c #FBF8FD",
+"F+	c #F7FDFF",
+"G+	c #FCFEFB",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                        =.2+$+=.                    >       ~ h ",
+"                      A a.1+D+D+1+4.4           5 : # , x Q.n+Q.",
+"                %._.4.U.1+y.$+r+A+G+A+U.A   b 5 } f }.9+n+n+m+, ",
+"      n _.y.g+g+p+z+B+A+z+w+_.1+o+o+s+v+Z.o 0 y I.m+m+j+j+}+x . ",
+"A $+z+F+E+B+w+w+s+p+o+o+o+s+g+4.1+o+A. .9 q n.4+a+4+4+^+^+K.!   ",
+"  $+E+B+A+z+A+A+s+w+s+o+o+o+w+y.#. at .u 0 <.|+|+~+~+|+~+.+K.R ^ _ ",
+"  w C+C+w+w+w+A+y+s+y+r+r+s+r+z+'. .0 w.~+e+~+=+=+!+=+M.2.p c )+",
+"    %+D+D+D+B+w+y+A+s+w+s+o+o+i+O o x.w.7+~+x+4+-+++P.w.2.g N u+",
+"    &.z+z+z+B+w+w+z+w+w+p+w+2+,.k <. +D.D.b.7+x+7+++G.P.[.g F d+",
+"      $+E+D+B+C+B+A+A+y+i+A.Q ..Z e L f.s.j.j.!+t+'+S.O.c.M m G.",
+"    C.J.C+C+B+B+w+w+z+w+T J i.N.d % 2 r.d.7.7.P.t+(+#+#+O.M a 1.",
+"    z+z+g+D+G+C+D+D+w+y+O H 0.R.V.u.V.O.3.3.(.s.f+[+]+&+T.S } ; ",
+"  k.6+A+g+A+D+C+B+D+B+z+;+v ).H.H.X.F.p.3.;.;.h.d+<+<+E.>+B < [ ",
+"      K J.g+E+D+C+D+D+A+w+6+v 5.E.W.>+8.P U X (.F._+{+_+*+i < E ",
+"          '.G+E+C+C+B+D+z+z+;+C E._+_+8.P I !.U H.3+b+3+>+i 3 +.",
+"          %+g+F+E+D+C+z+D+B+z+i+W :.p.{.U U I P *+b+b+3+6.r } J ",
+"        p+G+y+G+D+E+E+E+F+E+D+z+6+G N -+9.U I ^.3+b+b+W.U X - $ ",
+"      C.v+G+v+y+G+G+G+z+i+%+$+$+%+%+L c+7+P.|.z.b+3+*+^.|.u +   ",
+"        e '.i+i+i+6+6+g+p+A+B+w+w+w+v.Q ++++L.#+q+h+0.O.o.{     ",
+"              K J.g+F+F+E+C+A+A+w+y+i+T G.S.S.Y.:+f+f+'+H       ",
+"                  6 /.2+B+F+C+D+s+s+i+].O. at +@+R.|.q.R.-.&       ",
+"                      ' &.$+E+G+E+A+s+v+>./+[+[+/ @ & @         ",
+"                            7 &.o+C+G+g+) ~.k+l+$.              ",
+"                                ( %.U.A     l t.~.              ",
+"                                    *                           ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdesdk/debian/icons/kbugbuster.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/icons/kbugbuster.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/icons/kbugbuster.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * kbugbuster_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #000200",
+"+ 	c #000307",
+"@ 	c #080100",
+"# 	c #150300",
+"$ 	c #090F11",
+"% 	c #0F0E0B",
+"& 	c #151100",
+"* 	c #251302",
+"= 	c #1D2000",
+"- 	c #0F212A",
+"; 	c #461B09",
+"> 	c #4A190A",
+", 	c #502006",
+"' 	c #502413",
+") 	c #642803",
+"! 	c #602B0B",
+"~ 	c #672A00",
+"{ 	c #642D00",
+"] 	c #732900",
+"^ 	c #2F414B",
+"/ 	c #324439",
+"( 	c #6F3000",
+"_ 	c #6E3A02",
+": 	c #3A505F",
+"< 	c #703F27",
+"[ 	c #9B3700",
+"} 	c #963F00",
+"| 	c #9B3D00",
+"1 	c #695520",
+"2 	c #585A36",
+"3 	c #77511B",
+"4 	c #954700",
+"5 	c #B83801",
+"6 	c #794E3D",
+"7 	c #865312",
+"8 	c #765B21",
+"9 	c #B84200",
+"0 	c #AC4B05",
+"a 	c #C14200",
+"b 	c #B84800",
+"c 	c #6C6537",
+"d 	c #BD4602",
+"e 	c #7F594B",
+"f 	c #7A6327",
+"g 	c #BA4A02",
+"h 	c #B74E01",
+"i 	c #C34A00",
+"j 	c #906016",
+"k 	c #B55201",
+"l 	c #0E80D2",
+"m 	c #BF4E00",
+"n 	c #CB4902",
+"o 	c #0088E0",
+"p 	c #BE5300",
+"q 	c #C55200",
+"r 	c #1882DB",
+"s 	c #CF4E00",
+"t 	c #078BE3",
+"u 	c #807720",
+"v 	c #597887",
+"w 	c #AB6A00",
+"x 	c #2488DB",
+"y 	c #906A5B",
+"z 	c #298CD8",
+"A 	c #258FE1",
+"B 	c #2D8BE5",
+"C 	c #2195E1",
+"D 	c #D46400",
+"E 	c #868145",
+"F 	c #8C8930",
+"G 	c #3895E2",
+"H 	c #2E99EC",
+"I 	c #3C95E9",
+"J 	c #B57E1E",
+"K 	c #3B99DF",
+"L 	c #DE7200",
+"M 	c #4295F8",
+"N 	c #3D9DDD",
+"O 	c #519ABC",
+"P 	c #A2930D",
+"Q 	c #C48401",
+"R 	c #4996F2",
+"S 	c #D87908",
+"T 	c #B78239",
+"U 	c #9B991E",
+"V 	c #47A1E8",
+"W 	c #889962",
+"X 	c #BC9301",
+"Y 	c #48A4E5",
+"Z 	c #579DF4",
+"` 	c #EA8100",
+" .	c #58A3EC",
+"..	c #6BA5B0",
+"+.	c #8E9B8F",
+"@.	c #A7A320",
+"#.	c #5DA0FE",
+"$.	c #E88B00",
+"%.	c #CA9C00",
+"&.	c #DA9500",
+"*.	c #E48D13",
+"=.	c #D69800",
+"-.	c #62A6FD",
+";.	c #4FB0FE",
+">.	c #D29627",
+",.	c #C7A111",
+"'.	c #6CA4FD",
+").	c #66A9FF",
+"!.	c #C99F29",
+"~.	c #ED9500",
+"{.	c #5AB3F4",
+"].	c #B3A35A",
+"^.	c #A1AC5B",
+"/.	c #9AA2AA",
+"(.	c #91AAA2",
+"_.	c #8DA9B3",
+":.	c #E99C00",
+"<.	c #9DA6A2",
+"[.	c #6AAFFF",
+"}.	c #7AACE6",
+"|.	c #95A8B4",
+"1.	c #82ACD3",
+"2.	c #72ACFF",
+"3.	c #A6A791",
+"4.	c #79AEF5",
+"5.	c #81B0DD",
+"6.	c #A9AF7F",
+"7.	c #EA9F2E",
+"8.	c #78B4F6",
+"9.	c #77B3FF",
+"0.	c #90B0CC",
+"a.	c #A6B677",
+"b.	c #DEA637",
+"c.	c #E9A32B",
+"d.	c #80B1FF",
+"e.	c #9DB1BD",
+"f.	c #83B4FB",
+"g.	c #8AB5EA",
+"h.	c #ADAEB2",
+"i.	c #84B8FF",
+"j.	c #9FB6C8",
+"k.	c #B2BB8A",
+"l.	c #B5B895",
+"m.	c #B5B2B6",
+"n.	c #CBB760",
+"o.	c #87BEFF",
+"p.	c #BAC26A",
+"q.	c #E6C000",
+"r.	c #8EBFF9",
+"s.	c #90BDFF",
+"t.	c #EFBD00",
+"u.	c #ABBBC7",
+"v.	c #98BEED",
+"w.	c #C6C359",
+"x.	c #9FBFDC",
+"y.	c #9DC5C7",
+"z.	c #F6B43F",
+"A.	c #93C4FE",
+"B.	c #B0C1C0",
+"C.	c #B6C0BB",
+"D.	c #B9C0B5",
+"E.	c #93C8FB",
+"F.	c #C3C0AB",
+"G.	c #BFC3B2",
+"H.	c #BFC1BE",
+"I.	c #9DC8FD",
+"J.	c #BEC3C5",
+"K.	c #A0CAF2",
+"L.	c #F3BF4D",
+"M.	c #A7C9E9",
+"N.	c #8FD2FC",
+"O.	c #A0CBFF",
+"P.	c #C0D385",
+"Q.	c #BBC8CF",
+"R.	c #BAD1A3",
+"S.	c #D3C6A0",
+"T.	c #F9D005",
+"U.	c #FECF00",
+"V.	c #E3D23A",
+"W.	c #EFC465",
+"X.	c #CBC9AE",
+"Y.	c #A1D0FE",
+"Z.	c #CCD186",
+"`.	c #C9CAB4",
+" +	c #E9D32E",
+".+	c #A8CEFE",
+"++	c #B3CEE6",
+"@+	c #C0CDCE",
+"#+	c #F9D700",
+"$+	c #9BD8FD",
+"%+	c #DACA9F",
+"&+	c #B5D7C0",
+"*+	c #CFCBBC",
+"=+	c #DACC9A",
+"-+	c #C2D1C4",
+";+	c #C1D8A9",
+">+	c #C9D0C5",
+",+	c #C9CED1",
+"'+	c #ACD6FF",
+")+	c #B3D4FE",
+"!+	c #B1D6F9",
+"~+	c #D6D0BB",
+"{+	c #D5D1C3",
+"]+	c #BEDCCC",
+"^+	c #C7DCBA",
+"/+	c #D4D3CA",
+"(+	c #CBD2E8",
+"_+	c #FADA3F",
+":+	c #C0D8EA",
+"<+	c #FDE020",
+"[+	c #DDD4BA",
+"}+	c #BDD9FE",
+"|+	c #FFE700",
+"1+	c #EDDB73",
+"2+	c #B8DCFF",
+"3+	c #ECD3A3",
+"4+	c #FBEA00",
+"5+	c #CFD9D4",
+"6+	c #D3DBBF",
+"7+	c #DDD9B7",
+"8+	c #E5D7B1",
+"9+	c #D0D9E1",
+"0+	c #E4DAA9",
+"a+	c #EDE45C",
+"b+	c #BFDFFD",
+"c+	c #C5DDFC",
+"d+	c #CDDDEB",
+"e+	c #EADDA3",
+"f+	c #FEDA7E",
+"g+	c #DAE4AB",
+"h+	c #FBE06C",
+"i+	c #CCDFF9",
+"j+	c #CAE2F4",
+"k+	c #FFE368",
+"l+	c #C8E4FC",
+"m+	c #F4E0A7",
+"n+	c #D0E4FE",
+"o+	c #EDE1C1",
+"p+	c #F2E2B6",
+"q+	c #FEFE00",
+"r+	c #FCF058",
+"s+	c #CDE9FF",
+"t+	c #DEE6EF",
+"u+	c #FEE797",
+"v+	c #EDEF9C",
+"w+	c #FBFB38",
+"x+	c #F1E7BF",
+"y+	c #D9E9FD",
+"z+	c #D4ECFE",
+"A+	c #F3EDB0",
+"B+	c #E0F0FE",
+"C+	c #F8F0D8",
+"D+	c #FCF1C9",
+"E+	c #FAF2D0",
+"F+	c #FBF7C0",
+"G+	c #FFFD9D",
+"                                                                ",
+"                        (             (                         ",
+"                          (         (                           ",
+"                            ~     (                             ",
+"      p                     {     ~                             ",
+"      m                     , } k )                     m       ",
+"        p               > 6 6 T W.< y '                 m       ",
+"        m p             ; ' ' !._+! ; >               m         ",
+"          m g b b m     | } Q <+T.=.4 }       g g m m p         ",
+"                  b m     S ~.*.*.$.` D     9 p                 ",
+"                    9 b   h 7.u+u+f+S   m 9 m                   ",
+"                      a 9 E n.7.7.b.a.j 5 g                     ",
+"                        f -+].z.L.b.l.l.8                       ",
+"  p           p m i n c y.C+^+h+h+1+&+D+..7 n m                 ",
+"    m m g b b i s 0 1 3.x+E+Z. +<+V.6+D+o++.3 h n d m m m q     ",
+"                    E.t+0+F+p.c.:.,.g+A+8+B+{.                  ",
+"                  {.B+/+%+m+6.>.7.J =+0+[+z+y+H                 ",
+"                Y n+d+S.%+x+&+v+G+Z.6+3+%+/+l+!+z               ",
+"              N c+c+~+%+0+C+R.a+r+w.]+p+%+S.j+b+Y.z             ",
+"            K )+2+ at +X.>+[+C+Z.w+w+V.6+x+*+~+/+c+c+E.z           ",
+"          V .+.+Q.G.d+Q.<.5+W U @.u (.H.J.y+`. at +!+'+I.C         ",
+"         ..+K.B.D.:+s+,+/.u.^ $ % % v m.J.B+d+G.H.M..+I.z       ",
+"       .A.v.j.x.)+}+n+9+/.|.- + + @ : m.,+z+c+2+++u.x.A.s.G     ",
+"    I i.s.0.v.O.)+2+}+(+F.<.% @ @ . / `.9+c+b+'+.+I.e.r.o.d.x   ",
+"  l 2.9.f.0.A.A.O.'+2+}+{+k.X %.%.&.P `.n+c+}+)+O.I.j.g.f.9.Z   ",
+"  B '.2.}.1.o.A.O..+'+c+(+^.t.|+4+U.X B.l+2+)+.+I.A.g.5.9.d.-.  ",
+"  o -.2.4.4.i.s.I.O..+'+2+F q.q+q+#+w _.b+)+.+O.s.s.f.8.4.-.#.  ",
+"  l #.'.[.9.9.o.s.O..+}+$+2 * = = & _ O b+'+.+I.A.o.f.9.).'.R   ",
+"    M #.'.9.9.8.s.A.I.)+;.  [ # @ ]     E.)+I.A.o.8.9.2.).#.B   ",
+"    r #.-.).2.d.o.s.O.I.r                ..+I.o.i.d.d.).'.R     ",
+"      r R '.9.9.s.s.8.A                   G o.o.i.9.2.#.R       ",
+"          x B I G z                           G I I I l         "};

Added: people/jriddell/KDE/3.5/kdesdk/debian/icons/kcachegrind.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/icons/kcachegrind.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/icons/kcachegrind.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,289 @@
+/* XPM */
+static char * kcachegrind_xpm[] = {
+"32 30 256 2",
+"  	c None",
+". 	c #0036CA",
+"+ 	c #003FCA",
+"@ 	c #0842D6",
+"# 	c #004AD4",
+"$ 	c #1144D1",
+"% 	c #044CD0",
+"& 	c #004FD8",
+"* 	c #0056D9",
+"= 	c #1C52D0",
+"- 	c #2053D8",
+"; 	c #135AD7",
+"> 	c #0069E4",
+", 	c #0F64E0",
+"' 	c #2B59D1",
+") 	c #1365DB",
+"! 	c #2360D6",
+"~ 	c #0E70DE",
+"{ 	c #2A64D4",
+"] 	c #206BD3",
+"^ 	c #4362A7",
+"/ 	c #556185",
+"( 	c #0078F3",
+"_ 	c #246BDB",
+": 	c #236AE7",
+"< 	c #1872E7",
+"[ 	c #8E5A28",
+"} 	c #276CE2",
+"| 	c #346BCE",
+"1 	c #8A5D2F",
+"2 	c #7A5F59",
+"3 	c #516A92",
+"4 	c #426FA5",
+"5 	c #2D71D9",
+"6 	c #137CF1",
+"7 	c #167FE6",
+"8 	c #197FED",
+"9 	c #4C74A0",
+"0 	c #297AE2",
+"a 	c #2979E8",
+"b 	c #4875AC",
+"c 	c #96672C",
+"d 	c #0B8DDE",
+"e 	c #6C6C8D",
+"f 	c #3979DC",
+"g 	c #0092F7",
+"h 	c #3E80B5",
+"i 	c #0093FF",
+"j 	c #736F8B",
+"k 	c #4778DD",
+"l 	c #3285D2",
+"m 	c #3481E3",
+"n 	c #2987E8",
+"o 	c #009CFF",
+"p 	c #4281DD",
+"q 	c #A27035",
+"r 	c #A67331",
+"s 	c #00A2FF",
+"t 	c #6182A9",
+"u 	c #3E8ADF",
+"v 	c #87777E",
+"w 	c #338EE8",
+"x 	c #1798FF",
+"y 	c #6B7FA2",
+"z 	c #6682A3",
+"A 	c #3F8AE5",
+"B 	c #787C96",
+"C 	c #00A6FF",
+"D 	c #548CAA",
+"E 	c #B67522",
+"F 	c #AC7830",
+"G 	c #00ABFF",
+"H 	c #1F9CFC",
+"I 	c #3B92ED",
+"J 	c #BB781D",
+"K 	c #458FE5",
+"L 	c #3C91F3",
+"M 	c #10A7FF",
+"N 	c #3D95EA",
+"O 	c #00B1FF",
+"P 	c #25A8CB",
+"Q 	c #7F839E",
+"R 	c #3D98E5",
+"S 	c #A18057",
+"T 	c #C17D19",
+"U 	c #00B7FF",
+"V 	c #2DA3FD",
+"W 	c #B78239",
+"X 	c #4699F5",
+"Y 	c #459BEF",
+"Z 	c #1EADFE",
+"` 	c #668EE2",
+" .	c #17B5EB",
+"..	c #1CB1F5",
+"+.	c #2DAAEF",
+"@.	c #8A8A9F",
+"#.	c #868DA1",
+"$.	c #5997E7",
+"%.	c #3EA2F6",
+"&.	c #519BEA",
+"*.	c #7293BB",
+"=.	c #AA885E",
+"-.	c #3FA1FC",
+";.	c #00C1FF",
+">.	c #49A0EE",
+",.	c #8A8DA8",
+"'.	c #6B94E2",
+").	c #CE871B",
+"!.	c #7897B3",
+"~.	c #00C7FF",
+"{.	c #15BEFF",
+"].	c #0DC6F4",
+"^.	c #8C94A8",
+"/.	c #8F92AD",
+"(.	c #00CCFF",
+"_.	c #7D99BC",
+":.	c #679EE3",
+"<.	c #3CB3F8",
+"[.	c #9696AC",
+"}.	c #43B7E2",
+"|.	c #20C4FF",
+"1.	c #3FB7F5",
+"2.	c #00D6FC",
+"3.	c #54AEEF",
+"4.	c #4DAFFD",
+"5.	c #74A0E7",
+"6.	c #05D4FF",
+"7.	c #4DB1F8",
+"8.	c #00DAF1",
+"9.	c #36BCFF",
+"0.	c #C69550",
+"a.	c #6FA5EA",
+"b.	c #49BBE6",
+"c.	c #25C9FE",
+"d.	c #35C2F9",
+"e.	c #57B3ED",
+"f.	c #45B9FE",
+"g.	c #00DCFF",
+"h.	c #7DA6CD",
+"i.	c #9C9CB2",
+"j.	c #BF9963",
+"k.	c #95A0BA",
+"l.	c #78A7E7",
+"m.	c #3BC2FF",
+"n.	c #89A5C8",
+"o.	c #65B0F3",
+"p.	c #00E3FF",
+"q.	c #14DBFF",
+"r.	c #60B7F9",
+"s.	c #3CCAF9",
+"t.	c #6FB2F0",
+"u.	c #14DFFE",
+"v.	c #DC9F3A",
+"w.	c #9BA7C1",
+"x.	c #31D2FF",
+"y.	c #A0A7BC",
+"z.	c #00ECFF",
+"A.	c #4DC7F8",
+"B.	c #42CDFD",
+"C.	c #32D6FE",
+"D.	c #6CBAF6",
+"E.	c #83B3E0",
+"F.	c #6BBCF2",
+"G.	c #4DCBF5",
+"H.	c #66C0FB",
+"I.	c #43D2FA",
+"J.	c #1BE6FE",
+"K.	c #9FAFC2",
+"L.	c #E5A739",
+"M.	c #92B6CB",
+"N.	c #35DCFD",
+"O.	c #AEABBC",
+"P.	c #A7AFC4",
+"Q.	c #E8A933",
+"R.	c #55CEFF",
+"S.	c #B7ADB3",
+"T.	c #9AB5D9",
+"U.	c #A8B3C1",
+"V.	c #56D2FD",
+"W.	c #49DAFB",
+"X.	c #95B7ED",
+"Y.	c #D7B05F",
+"Z.	c #6CCCF9",
+"`.	c #57D7FA",
+" +	c #A7BAC6",
+".+	c #F0AF3A",
+"++	c #AEB6CB",
+"@+	c #4BE0FB",
+"#+	c #3EE6FF",
+"$+	c #96C0E8",
+"%+	c #3EEAFC",
+"&+	c #D8B86B",
+"*+	c #92C5EB",
+"=+	c #AABDD6",
+"-+	c #81CEF7",
+";+	c #AFBED2",
+">+	c #5DE0FC",
+",+	c #90C8F5",
+"'+	c #B3BFCD",
+")+	c #A4C4E1",
+"!+	c #E7B969",
+"~+	c #BABECE",
+"{+	c #8CCFFA",
+"]+	c #5FE6FB",
+"^+	c #A9C9D9",
+"/+	c #9ACCF3",
+"(+	c #95D1F6",
+"_+	c #E5C36F",
+":+	c #9AD1F1",
+"<+	c #B7C7DA",
+"[+	c #57F2FE",
+"}+	c #A2CFF1",
+"|+	c #63EEFC",
+"1+	c #A1D3ED",
+"2+	c #99D5FB",
+"3+	c #EAC97B",
+"4+	c #BCD0DC",
+"5+	c #A2D9F8",
+"6+	c #ABD8EC",
+"7+	c #9DDDFB",
+"8+	c #F6CC73",
+"9+	c #A9DFF2",
+"0+	c #A5E1F9",
+"a+	c #F3D17C",
+"b+	c #F4D284",
+"c+	c #A8E4FC",
+"d+	c #ECD8A0",
+"e+	c #B0E6F9",
+"f+	c #B2E8FB",
+"g+	c #B6ECFF",
+"h+	c #B5F0FC",
+"i+	c #BCEEFB",
+"j+	c #C1EEF6",
+"k+	c #D6E7ED",
+"l+	c #B8F3FF",
+"m+	c #C0F2FF",
+"n+	c #C0F6FC",
+"o+	c #FFE8A9",
+"p+	c #C7F5FC",
+"q+	c #FAEBAA",
+"r+	c #F9EBB0",
+"s+	c #C2F9FF",
+"t+	c #D0F5FE",
+"u+	c #C4FBFF",
+"v+	c #D2F7FF",
+"w+	c #CAFDFC",
+"x+	c #D7F8FB",
+"y+	c #D2FCFD",
+"z+	c #CDFFFF",
+"A+	c #D5FFFF",
+"B+	c #E5FAF9",
+"C+	c #DDFFFF",
+"D+	c #E2FFFC",
+"E+	c #E9FFFE",
+"F+	c #F1FEFF",
+"G+	c #F8FDFF",
+"                          ++=+<+<+;+;+                          ",
+"                      P.T.*+/+{+2+2+1+)+++                      ",
+"                    w.E.,+7+0+c+0+0+e+9+1+K.                    ",
+"                  k.T.(+e+i+m+i+g+5+0+g+i+6+K.                  ",
+"                  n.,+0+i+w+A+v+i+m+f+i+m+i+^+                  ",
+"                ,.E.5+c+u+x+E+x+m+y+p+u+w+w+j+[.                ",
+"                ,.,+5+g+w+C+F+x+m+A+y+y+A+D+w+K.                ",
+"                ,.{+7+f+g+v+p+l+A+C+A+A+A+A+A+ +                ",
+"            m.g.!./+0+f+c+c+m+w+E+A+C+D+C+D+D+U.                ",
+"          -.%+p.D *+c+5+g+p+y+x+A+C+E+E+F+E+E+,.                ",
+"      q.s.A N.u.P n.7+c+c+g+s+w+C+C+E+E+G+F+k+e                 ",
+"    u.J.J.N.J.J.8.t 1+f+c+h+u+A+A+E+E+G+G+F+U.                  ",
+"    H.N.p.u.p. .| ^ _.5+i+g+u+A+A+E+E+F+G+~+B                   ",
+"    r.H.J.u.].w w l b _.6+p+s+w+A+C+E+B+'+ at .i.[.                ",
+"  X K e.J.p.1.R       / z K.i+u+A+y+4+#.B i.O.S.0.).            ",
+"m.J.z.p.p.u.9.            3 3 z z 9 h d (     j.!+L.).          ",
+"r.#+p.u.g.2.c.                b.}.{.M G Z g 2 Y.q+b+.+).        ",
+"4.G.N.#+u.2.C.                W.W.Z.M s C H 4 W b+r+8+L.T       ",
+"X ' + ) Z.6.(.|.                [+>+s C u *     F &+r+b+.+J     ",
+"I ' % u D.C.(.(.9.              [+R.o C ]         r 3+o+b+L.E   ",
+"  0 a R t.C.~.c.|.+.            ]+O o o g a         q 3+r+8+v.[ ",
+"      A I.c.|.;.;.{.|.        9.Z o x H x C >         c &+d+=.v ",
+"      K `.~.~.|.s.U O O U {.9.V o o M Y V Z _           1 S v j ",
+"      K 3.x.H.f K Z.m.G M s o o g o &.= { !                     ",
+"    6 w n :.= 5 0 p <.M s <.7.r.s i %.5 #                       ",
+"      k A p ' } 5 a.1.C G >.{ p D.i o m                         ",
+"        } >     = X.-+M G w ! 5.l.H.H.}                         ",
+"                  l.p $.t.| + ` 5.'..                           ",
+"                  f ~ ) %     ' k #                             ",
+"                  % # % $                                       "};

Added: people/jriddell/KDE/3.5/kdesdk/debian/icons/kompare.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/icons/kompare.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/icons/kompare.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kompare[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #080808",
+"X  c #120E0E",
+"o  c #181615",
+"O  c #1F1B25",
+"+  c #1D2219",
+"@  c #252626",
+"#  c #2B3922",
+"$  c #3A3A3A",
+"%  c #2E3239",
+"&  c #273C4B",
+"*  c #304127",
+"=  c #355725",
+"-  c #1F506E",
+";  c #334854",
+":  c #2E4959",
+">  c #305871",
+",  c #3B627C",
+"<  c #40403F",
+"1  c #405C2E",
+"2  c #446232",
+"3  c #497E38",
+"4  c #464749",
+"5  c #515A4A",
+"6  c #585958",
+"7  c #4B575A",
+"8  c #595F62",
+"9  c #516244",
+"0  c #5C6F50",
+"q  c #527142",
+"w  c #5B7151",
+"e  c #42606C",
+"r  c #4F6F7D",
+"t  c #5A6670",
+"y  c #636C5D",
+"u  c #637B54",
+"i  c #636968",
+"p  c #697175",
+"a  c #707771",
+"s  c #1033E6",
+"d  c #1C5D81",
+"f  c #086499",
+"g  c #17648E",
+"h  c #136B9D",
+"j  c #1A6E9E",
+"k  c #196EA3",
+"l  c #166BA8",
+"z  c #1C72A3",
+"x  c #1A6DB0",
+"c  c #266D96",
+"v  c #396785",
+"b  c #327398",
+"n  c #28678B",
+"m  c #2879A7",
+"M  c #397CA4",
+"N  c #3048DF",
+"B  c #2B52D9",
+"V  c #2949EA",
+"C  c #3F5EED",
+"Z  c #3551F0",
+"A  c #2E55E5",
+"S  c #4C748E",
+"D  c #417DA1",
+"F  c #667683",
+"G  c #405DDA",
+"H  c #4352F3",
+"J  c #5070D3",
+"K  c #4B63EB",
+"L  c #576EED",
+"P  c #6D7FEC",
+"I  c #6A7DF4",
+"U  c #3C9E1D",
+"Y  c #3F8929",
+"T  c #30AD0A",
+"R  c #33A111",
+"E  c #32B00E",
+"W  c #3DB11A",
+"Q  c #28AE02",
+"!  c #2A816E",
+"~  c #02C300",
+"^  c #18C900",
+"/  c #20CD00",
+"(  c #3ED70C",
+")  c #38C722",
+"_  c #40802C",
+"`  c #4B8537",
+"'  c #508E36",
+"]  c #4AA609",
+"[  c #41B71F",
+"{  c #5BB00A",
+"}  c #53A915",
+"|  c #46A828",
+" . c #4CA532",
+".. c #4AB629",
+"X. c #56BA38",
+"o. c #56A93D",
+"O. c #579045",
+"+. c #678456",
+"@. c #6A9557",
+"#. c #648E4B",
+"$. c #60AE49",
+"%. c #63B849",
+"&. c #6AB055",
+"*. c #7BA865",
+"=. c #7AB568",
+"-. c #48DA1B",
+";. c #45D621",
+":. c #5CC13E",
+">. c #59DC2D",
+",. c #5DDF30",
+"<. c #46CE2A",
+"1. c #57E50C",
+"2. c #5CE021",
+"3. c #6ADC3A",
+"4. c #6CE436",
+"5. c #71EB22",
+"6. c #6DE726",
+"7. c #64C148",
+"8. c #6CC053",
+"9. c #73C859",
+"0. c #7BC864",
+"q. c #7DD661",
+"w. c #76E445",
+"e. c #3782AC",
+"r. c #3C88B3",
+"t. c #4582A5",
+"y. c #438CB5",
+"u. c #458AB4",
+"i. c #4B92B9",
+"p. c #5796BB",
+"a. c #5186A5",
+"s. c #6B8090",
+"d. c #7C848A",
+"f. c #7D8C94",
+"g. c #7E9098",
+"h. c #659EBE",
+"j. c #7590A6",
+"k. c #5A9CC2",
+"l. c #698AC6",
+"z. c #609EC2",
+"x. c #6C83EA",
+"c. c #7388E6",
+"v. c #6AA3C5",
+"b. c #73A6C3",
+"n. c #79ABC6",
+"m. c #76A9C6",
+"M. c #808F77",
+"N. c #889F7B",
+"B. c #86BE6C",
+"V. c #86AB77",
+"C. c #85F33C",
+"Z. c #80DE5D",
+"A. c #8AC456",
+"S. c #84C46C",
+"D. c #89C672",
+"F. c #83D26B",
+"G. c #8DD27A",
+"H. c #96C376",
+"J. c #92D37E",
+"K. c #88E75B",
+"L. c #83EB4E",
+"P. c #98E875",
+"I. c #9FF36C",
+"U. c #8FE671",
+"Y. c #A9CF7C",
+"T. c #858E93",
+"R. c #89939A",
+"E. c #909499",
+"W. c #889183",
+"Q. c #8497A7",
+"!. c #9DAD92",
+"~. c #98BB89",
+"^. c #96AD8E",
+"/. c #89A0AF",
+"(. c #8AA5B5",
+"). c #98A7AF",
+"_. c #A1BB9A",
+"`. c #ACB3A6",
+"'. c #A2B4BF",
+"]. c #B3BCAA",
+"[. c #B2B9BC",
+"{. c #8396E8",
+"}. c #8295F7",
+"|. c #85ABC8",
+" X c #8CB5CE",
+".X c #85B1C9",
+"XX c #8EB8D0",
+"oX c #97B9CC",
+"OX c #94BCD2",
+"+X c #9BBED2",
+"@X c #98B5D3",
+"#X c #94A6D1",
+"$X c #9FABEC",
+"%X c #9FB1E2",
+"&X c #A6B6CE",
+"*X c #A2B2EC",
+"=X c #98D784",
+"-X c #96D090",
+";X c #99D1A8",
+":X c #9DE094",
+">X c #A0CE87",
+",X c #A8C998",
+"<X c #A9D897",
+"1X c #B4D89E",
+"2X c #ACCFAE",
+"3X c #AEDAA3",
+"4X c #B5CAAA",
+"5X c #B7D6A9",
+"6X c #BBDDB1",
+"7X c #A3ED81",
+"8X c #BBE29C",
+"9X c #ABE295",
+"0X c #BCE5A7",
+"qX c #BDE6B3",
+"wX c #BAF1A0",
+"eX c #9CC3D6",
+"rX c #A4C5D7",
+"tX c #B1CAD7",
+"yX c #B4D7C4",
+"uX c #BAD4DD",
+"iX c #AECEC8",
+"pX c #A7C6E4",
+"aX c #B4CAE9",
+"sX c #B5D3E4",
+"dX c #B6C6F1",
+"fX c #C4DAB9",
+"gX c #C0E5A8",
+"hX c #C6E6B9",
+"jX c #CBF4B3",
+"kX c #C6D6C8",
+"lX c #CAD6DB",
+"zX c #C0CEE0",
+"xX c #C8DBE5",
+"cX c #C4D4F7",
+"vX c #D4DDEC",
+"bX c #D2DBFF",
+"nX c #CAE7C2",
+"mX c #CCE9D3",
+"MX c #D5E9CB",
+"NX c #DAF2CA",
+"BX c #DBF2D5",
+"VX c #DDEED7",
+"CX c #CDE1EC",
+"ZX c #D7E3ED",
+"AX c #D8E9F5",
+"SX c #D6EBEB",
+"DX c #E5FFCD",
+"FX c #E7FADA",
+"GX c #E2EDF6",
+"HX c #E9FAE4",
+"JX c #ECF5F9",
+"KX c #E8F2F8",
+"LX c #F7FDE8",
+"PX c #FEFEFE",
+"IX c #F6FBF7",
+"UX c #E7EBE9",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXf n.b.h.M YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXf lXPXIXxXoXb.h.e.YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXf xXPXPXPXPXPXGXuX Xn.h.YXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXf lXPXPXPXPXJXJXJXJXKXZXtXoX.Xb.YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXh vX6 E.lXPXPXJXJXUXKXGXUXAXZXxXrX+XOX XYXYXYXYXYX",
+"YXYXYXYXYXYXYXh xXUXE.$ @ p [.KXKXKXGXAXSXZXCXCXxXxXuXoXYXYXYXYX",
+"YXYXYXYXYXYXYXl xXPXPXPXZXE.4 o 7 E.xXAXAXAXCXCXxXxXsX(.YXYXYXYX",
+"YXYXYX] YXYXYXl yXC.I.NXJXIXIXZXE.4 X $ a &XAXCXCXsXsX(.YXYXYXYX",
+"YXYXYX5X,XB.A., mXI.4.-.4.K.wXSXKXJXvXQ.4 X @ i g.rXsX(.YXYXYXYX",
+"YXYXYXMXPXPXLXhX,X,XnXjXP.w.-.2.L.7XmXAXAXxXQ.&   @ sX(.YXYXYXYX",
+"YXYXYXMXPXPXPXIXIXJXVXfX,X4XqXP.w.;.;.w.U.qXxXsXpXj.sX(.YXYXYXYX",
+"YXYXYX4X< d.kXPXLXHXHXFXFXVXnX5X4X6XP.w.;.^ ( 4.J.iXpX(.YXYXYXYX",
+"YXYXYXMXIX`.6 # i `.FXHXFXBXBXNXMXnXR.bXyXq.2./ ~ 1.rXQ.YXYXYXYX",
+"YXYXYX#X}.cXIXLX].y + 5 W.fXBXNXnXqX3 w.J.yXsXiXq.5.pXQ.YXYXYXYX",
+"YXYXYXtXP Z Z x.*XHXFX4Xa @ $ y ~.hX' ,.) <.4.q.;XeXpXQ.YXYXYXYX",
+"YXYXYXkXZXLXzXP K V L {.mXDX,X2 9 hXF uX:Xw.,.) ) 5.eXQ.YXYXYXYX",
+"YXYXYX#XH L {.zXDXlXc.K V A G |.jXgX6 '.aXaXrX:Xw.6.eXQ.YXYXYXYX",
+"YXYXYXNXUX$XP H K c.%XMXyXJ B s s 8X; : ; r j. at XpX+XpXj.YXYXYXYX",
+"YXYXYX5X].MXHXSX%XP K V G l.2X<Xh.8Xr v.a., & & > s.pXg.YXYXYXYX",
+"YXYXYX1X4XE.*.!.fXNXnX|.J V N B J 8Xe p.k.k.k.M > - k.g.YXYXYXYX",
+"YXYXYX1XnXhXqX,XN.w +.~.0XqXn.G N 8X7 v v S u.r.r.e.i.f.YXYXYXYX",
+"YXYXYX<X_.!.,X3X9XJ.=.O.2 q *.>X9X8Xv i.D v > > n c y.f.YXYXYXYX",
+"YXYXYX1XhX0X,X*. at .&.=.F.q.%.` = 3 <Xe k.i.i.r.m n - y.T.YXYXYXYX",
+"YXYXYX,X2X3X:X=XG.=. at .O.O.$.7.7.X.A., D D M M M e.z y.f.YXYXYXYX",
+"YXYXYX<X5X-XB.=.S.F.0.9.$.' Y Y | B.v u.M b c c z h y.f.YXYXYXYX",
+"YXYXYX<X<X=X=XD.=.&.&.%.%.7.X.| U B.v y.r.e.b j g g y.d.YXYXYXYX",
+"YXYXYX=X=X=XG.F.F.9.8.%.o. .| | [ B.v r.e.m m m z f y.d.YXYXYXYX",
+"YXYXYX= #.*.D.F.9.9.7.%.:.X.| U R B.S k.m m z z h f y.d.YXYXYXYX",
+"YXYXYXYXYX  # +.*.D.9.:.X.....W T B.O F oXoXz.z f f u.d.YXYXYXYX",
+"YXYXYXYXYXYXYXYX  o 0 V.D.9.W E Q B.. YX  O i '.tXv.v.d.YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX  5 N.~.0.<X. YXYXYXYXYX  6 ).p YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  < W.  YXYXYXYXYXYXYXYX  YXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdesdk/debian/icons/kuiviewer.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/icons/kuiviewer.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/icons/kuiviewer.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kuiviewer[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c black",
+".  c #0C0A1D",
+"X  c #11101E",
+"o  c #18171F",
+"O  c gray10",
+"+  c #0B0824",
+"@  c #0F0B2E",
+"#  c #100C30",
+"$  c #151321",
+"%  c #16122D",
+"&  c #191634",
+"*  c #1B1933",
+"=  c #1F1C38",
+"-  c #311501",
+";  c #3D1C00",
+":  c #3C2500",
+">  c #342110",
+",  c #222223",
+"<  c #2A2A2B",
+"1  c #302E3E",
+"2  c #303033",
+"3  c #1C1742",
+"4  c #1F1A46",
+"5  c #1E194A",
+"6  c #211D46",
+"7  c #211C4D",
+"8  c #231E51",
+"9  c #27224E",
+"0  c #29264B",
+"q  c #2A2452",
+"w  c #2F2A55",
+"e  c #2D285A",
+"r  c #322C57",
+"t  c #332E5C",
+"y  c #3E3D42",
+"u  c #3C3D4B",
+"i  c #343055",
+"p  c #393555",
+"a  c #3B375F",
+"s  c #332D60",
+"d  c #333061",
+"f  c #3A3465",
+"g  c #3D3863",
+"h  c #431D00",
+"j  c #481800",
+"k  c #493400",
+"l  c #542600",
+"z  c #5F2700",
+"x  c #5D3600",
+"c  c #5D3900",
+"v  c #612D00",
+"b  c #633719",
+"n  c #733A00",
+"m  c #723F15",
+"M  c #622E27",
+"N  c #6D392E",
+"B  c #6C3D30",
+"V  c #423D66",
+"C  c #433D6B",
+"Z  c #534200",
+"A  c #525100",
+"S  c #6A560E",
+"D  c #6F5216",
+"F  c #695C11",
+"G  c #7B4E00",
+"H  c #7D540F",
+"J  c #6B4222",
+"K  c #784225",
+"L  c #79432A",
+"P  c #7B463A",
+"I  c #7F5A31",
+"U  c #78583F",
+"Y  c #78642A",
+"T  c #464547",
+"R  c #47464A",
+"E  c #4C4C4D",
+"W  c #424054",
+"Q  c #43405E",
+"!  c #4D4C5C",
+"~  c #535355",
+"^  c #52515B",
+"/  c #454164",
+"(  c #47416D",
+")  c #4A4662",
+"_  c #49436E",
+"`  c #4D4A65",
+"'  c #524E6A",
+"]  c #514B73",
+"[  c #564F78",
+"{  c #56516F",
+"}  c #5A5568",
+"|  c #565177",
+" . c #5A5575",
+".. c #5E577B",
+"X. c #5F5B71",
+"o. c #5F597C",
+"O. c #7E4D52",
+"+. c #635C7D",
+"@. c #794368",
+"#. c #7B486B",
+"$. c #7F5070",
+"%. c #64656C",
+"&. c #6A656F",
+"*. c #6C6C6E",
+"=. c #67657C",
+"-. c #6C6772",
+";. c #69637C",
+":. c #6E6A7E",
+">. c #686674",
+",. c #727276",
+"<. c #5F5F80",
+"1. c #6A6482",
+"2. c #6E6883",
+"3. c #726D83",
+"4. c #756F88",
+"5. c #747082",
+"6. c #767189",
+"7. c #7A7785",
+"8. c #7B748A",
+"9. c #7E7C83",
+"0. c #7D7B8C",
+"q. c #874700",
+"w. c #915200",
+"e. c #8D5834",
+"r. c #8D6C0B",
+"t. c #9D6515",
+"y. c #946631",
+"u. c #A36C00",
+"i. c #A86F00",
+"p. c #AA7400",
+"a. c #A87408",
+"s. c #A7721F",
+"d. c #B17F00",
+"f. c #835774",
+"g. c #845A76",
+"h. c #865E78",
+"j. c #8B6843",
+"k. c #8A6A5C",
+"l. c #8C7151",
+"z. c #8D7758",
+"x. c #887C50",
+"c. c #94604C",
+"v. c #9C6847",
+"b. c #956550",
+"n. c #8B6560",
+"m. c #8B687E",
+"M. c #91767C",
+"N. c #A77A6D",
+"B. c #8C6C80",
+"V. c #81778D",
+"C. c #807F80",
+"Z. c #827C8C",
+"A. c #937D8A",
+"S. c #9C768C",
+"D. c #A67D93",
+"F. c #9A9212",
+"G. c #B48301",
+"H. c #B18214",
+"J. c #BC951E",
+"K. c #968F6D",
+"L. c #97877C",
+"P. c #A8804F",
+"I. c #B08D64",
+"U. c #C4A021",
+"Y. c #C5A52B",
+"T. c #C5A131",
+"R. c #C1A03D",
+"E. c #C09E44",
+"W. c #CEB343",
+"Q. c #CCB04A",
+"!. c #CFB651",
+"~. c #D0B653",
+"^. c #D1B65C",
+"/. c #D1BA55",
+"(. c #C1A163",
+"). c #CBB37D",
+"_. c #D6C358",
+"`. c #D9C776",
+"'. c #DDCE75",
+"]. c #E5D66A",
+"[. c #EEE57A",
+"{. c #838384",
+"}. c #858389",
+"|. c #88868C",
+" X c #89898A",
+".X c #878491",
+"XX c #8A8391",
+"oX c #8E8D90",
+"OX c #96868F",
+"+X c #988B80",
+"@X c #948692",
+"#X c #938C96",
+"$X c #958E98",
+"%X c #998C93",
+"&X c #929293",
+"*X c #969398",
+"=X c #9A9499",
+"-X c #9C9B9B",
+";X c #A88583",
+":X c #A88095",
+">X c #A39C9E",
+",X c #A69EA1",
+"<X c #A5A09F",
+"1X c #A1A0A1",
+"2X c #A9A3A1",
+"3X c #ABA9A5",
+"4X c #AAAAAB",
+"5X c #B3ACA6",
+"6X c #B4AEA9",
+"7X c #B7B2A9",
+"8X c #BAB2AA",
+"9X c #BFB8AF",
+"0X c #B6B5B7",
+"qX c #CFB988",
+"wX c #D0BD85",
+"eX c #C0B9AF",
+"rX c #C4BDB1",
+"tX c #C0BEC1",
+"yX c #D9C983",
+"uX c #D6C897",
+"iX c #C7C0B2",
+"pX c #CEC7B7",
+"aX c #CFC8B7",
+"sX c #D1C9BA",
+"dX c #D6D1BF",
+"fX c #D9D1BF",
+"gX c #EDE595",
+"hX c #F7F687",
+"jX c #E6E1B9",
+"kX c #F2ECAE",
+"lX c #C0C0C1",
+"zX c #C8C8CA",
+"xX c #D9CECA",
+"cX c #DCD4C3",
+"vX c #D1D1D2",
+"bX c #DDD5D0",
+"nX c #D9D9DA",
+"mX c #E0D8C6",
+"MX c #E4DCCB",
+"NX c #E9DFD0",
+"BX c #ECE4D5",
+"VX c #EEE7D8",
+"CX c #F1EBDF",
+"ZX c #FFFDCC",
+"AX c #FCF9D4",
+"SX c #FCFBDD",
+"DX c #E1E1E3",
+"FX c #EEEBE6",
+"GX c #EAEAEC",
+"HX c #F2ECE2",
+"JX c #F0EEEA",
+"KX c #F6F2E9",
+"LX c #FFFFE3",
+"PX c #F4F3F3",
+"IX c #FBF8F3",
+"UX c #FEFEFE",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXA.#.%XYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX{.YX-X#.KX;X+X+Xj.D < YX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXOXh.B.f.FXLXkXI.v.Y.h A YX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  m.bXxXFXAXwX(./.Y.w.; YXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX%XD.UXAXc.J x v i.u.l F YX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX%X:XSXb.Y YXYXZ l p.J.L U ",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX%XS.FXuXJ YXYXYXYXc t.W.!.M ",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX at .FXZX).J YXYXYXYXH R.Q.e.z.",
+"YXYXYXYXYXYXYXYXYXYX7.] ] {.YXYXYXYXM.O.'.].K S YXYXF.y.[.v.l.YX",
+"YXYXYXYXYXYXYXYXYX-X+.IXcX| YXYXYXYXYXx.N I.U.n G r.y.hXgXN.L.YX",
+"YXYXYXYX-XYXYXYXL.3.MXIXKXoX>.YXYXYX=X9.I s.G.d.a.T.].`.wXjXh.,.",
+"YXYX  }.+.3.|. X=.mXUXCXBXVXZ.2.{.3.2.=.b q.j z H._.!.P n.g.OX{.",
+"YXYX X>XIXMX5X3XBXUXCXBXMXcXcX8XiXcXcX8.> - : k m ^.P K.YX4XYXYX",
+"YXYX&XZ.UXUXUXIXJXCXBXNXcXsXrX7X<X*X.X5 . , YXYXY N k.YXYXYXYXYX",
+"YXYXYX;.BXUXIXKXCXBXbXaXiXiX7X,X*X.X0.@ X YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYX7.fXIXKXCXMX*Xg 4 3 5 [ XXXXV.8.5 $ YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYX;.VXKXCXNX*Xi ! R T 1 % f 6.8.4.] &   YXYXYXYXYXYXYXYXYXYX",
+"YXYX}.7XUXCXBX=Xi ~ YXYXYXYX2 & C 4.8..X] p ,.YXYXYXYXYXYXYXYXYX",
+"&X:.7XUXCXBXcXd ! YXYXYXYXYXYXu 7 4.8..X>X8.g ) YXYXYXYXYXYXYXYX",
+"] MXUXCXBXbX9X0 ~ YXYXYXYXYXYX! 4 4..X%X>X8X9X5 YXYXYXYXYXYXYXYX",
+"_ HXHXBXNXcX6X4 ~ YXYXYXYXYXYX~ 8 #X%X,X5X5X3.8 YXYXYXYXYXYXYXYX",
+"X.] 8XMXmXaXrX7 y YXYXYXYXYXYX&...,X>X5X#X] w } YXYXYXYXYXYXYXYX",
+"C.-.a >XaXiX7X2.0   YXYXYXYX4X>.MX2X5X5X] Q *.YXYXYXYXYXYXYXYXYX",
+"YXYX*.r -X6X<X<X| i %.+.-X*X7.mXcX5XrX.Xe   YXYXYXYXYXYXYXYXYXYX",
+"YXYXYX' 1.,X*X.XXXo.t (  .2.mXbX5XrXsX8./ YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXX.-X$X.XV.8.6.V.Z.2X8X2X5XrXsXcX5X/ YXYXYXYXYXYXYXYXYXYXYX",
+"YXYX{.' sXZ.V.8.4.8.8..X$X>X5XrXsXcXMXBX(  XYXYXYXYXYXYXYXYXYXYX",
+"YXYX%.s =X+.8 7 C 8.XX*X,X5X6X0.o.8.pXMX8.{.YXYXYXYXYXYXYXYXYXYX",
+"YXYXT = # + . X . 7 Z.,X5X3X1.w ` ' V 1.:.-XYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXO $ $ y YX< * C 3X9X1.r *.YXYX0.|.4XYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXE 0 .X>Xe &.YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXW 5 9 / YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdesdk/debian/icons/umbrello.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/icons/umbrello.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/icons/umbrello.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,103 @@
+/* XPM */
+static char * umbrello_xpm[] = {
+"32 32 68 1",
+" 	c None",
+".	c #FF0000",
+"+	c #FF0100",
+"@	c #FF0101",
+"#	c #FF0503",
+"$	c #FF0605",
+"%	c #FF0E0A",
+"&	c #FF100C",
+"*	c #FF140F",
+"=	c #FF1712",
+"-	c #FF1813",
+";	c #FF1913",
+">	c #FF1F17",
+",	c #FF1F18",
+"'	c #FF2019",
+")	c #FF221A",
+"!	c #FF241C",
+"~	c #FF261D",
+"{	c #FF291F",
+"]	c #FF2A20",
+"^	c #FF2C22",
+"/	c #FF3025",
+"(	c #FF3629",
+"_	c #FF372B",
+":	c #FF4233",
+"<	c #FF4837",
+"[	c #FF4938",
+"}	c #FF4939",
+"|	c #FF4C3B",
+"1	c #FF4E3C",
+"2	c #FF5945",
+"3	c #FF5E48",
+"4	c #FF604A",
+"5	c #FF624C",
+"6	c #FF6850",
+"7	c #FF745A",
+"8	c #FF775C",
+"9	c #FF7B60",
+"0	c #FF7F63",
+"a	c #FF8C6D",
+"b	c #FF8F6F",
+"c	c #FF9775",
+"d	c #FF9976",
+"e	c #FFA07C",
+"f	c #FFAD86",
+"g	c #FFAF87",
+"h	c #FFB38B",
+"i	c #FFB98F",
+"j	c #FFBC92",
+"k	c #FFC498",
+"l	c #FFC89B",
+"m	c #FFCFA1",
+"n	c #FFD3A3",
+"o	c #FFD9A8",
+"p	c #FFDBAA",
+"q	c #FFDFAD",
+"r	c #FFE2AF",
+"s	c #FFE8B4",
+"t	c #FFEBB6",
+"u	c #FFEDB8",
+"v	c #FFEFB9",
+"w	c #FFEFBA",
+"x	c #FFF4BD",
+"y	c #FFF9C1",
+"z	c #FFFBC2",
+"A	c #FFFDC4",
+"B	c #FFFEC5",
+"C	c #FFFFC6",
+"    ...                         ",
+"  .......                       ",
+" +.}hme!..                      ",
+"..2CCCCw'.                      ",
+"..lCCCCC0.                      ",
+"..kCCCCC9.                      ",
+" .|BCCCs;.                      ",
+" @._eja-...                     ",
+"  ..........                    ",
+"    ...   ...                   ",
+"    ..     ...                  ",
+"    ..      ...                 ",
+"...........  ...                ",
+"...........   ...               ",
+"..........      ...             ",
+"    ..           ...            ",
+"    ..            ...           ",
+"    ...            ...          ",
+"   .....            ...         ",
+"  ... ..         ..........     ",
+"  ..  ...      ......=>#.....   ",
+" ..    ...    .../dpyCCArg<...  ",
+"...     ..   ..&iCCCCCCCCCCo].. ",
+"             .%nCCCCCCCCCCCCu^..",
+"            ..3CCCCCCCCCCCCCCc..",
+"            ..7CCCCCCCCCCCCCCf..",
+"             .,xCCCCCCCCCCCCC1..",
+"             ..(tCCCCCCCCCCz4.. ",
+"              ..*8qCCCCCCvb~..  ",
+"               ...@):56[{$...   ",
+"                 ..........     ",
+"                     ..         "};

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

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

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kapptemplate.override
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kapptemplate.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kapptemplate.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+# These are files to provide for new applications.
+kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING
+kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/compile
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.guess
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.sub
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs-clean.pl
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/debianrules
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/depcomp
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/detect-autoconf.sh
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/install-sh
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/missing
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/mkinstalldirs
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/nmcheck
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/ylwrap
+kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common
+

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kbabel-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kbabel-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kbabel-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+debian/tmp/usr/include/kde/kbabel/catalog.h
+debian/tmp/usr/include/kde/kbabel/catalogfileplugin.h
+debian/tmp/usr/include/kde/kbabel/catalogitem.h
+debian/tmp/usr/include/kde/kbabel/catalogsettings.h
+debian/tmp/usr/include/kde/kbabel/catalogview.h
+debian/tmp/usr/include/kde/kbabel/dictchooser.h
+debian/tmp/usr/include/kde/kbabel/dictionarymenu.h
+debian/tmp/usr/include/kde/kbabel/editcmd.h
+debian/tmp/usr/include/kde/kbabel/findoptions.h
+debian/tmp/usr/include/kde/kbabel/itempart.h
+debian/tmp/usr/include/kde/kbabel/kbabeldatatool.h
+debian/tmp/usr/include/kde/kbabel/kbabeldictbox.h
+debian/tmp/usr/include/kde/kbabel/kbabeldictiface.h
+debian/tmp/usr/include/kde/kbabel/kbproject.h
+debian/tmp/usr/include/kde/kbabel/kbprojectmanager.h
+debian/tmp/usr/include/kde/kbabel/msgfmt.h
+debian/tmp/usr/include/kde/kbabel/poinfo.h
+debian/tmp/usr/include/kde/kbabel/projectsettings.h
+debian/tmp/usr/include/kde/kbabel/regexpextractor.h
+debian/tmp/usr/include/kde/kbabel/searchengine.h
+debian/tmp/usr/include/kde/kbabel/tagextractor.h
+debian/tmp/usr/lib/libkbabelcommon.la
+debian/tmp/usr/lib/libkbabelcommon.so
+debian/tmp/usr/lib/libkbabeldictplugin.la
+debian/tmp/usr/lib/libkbabeldictplugin.so

Added: people/jriddell/KDE/3.5/kdesdk/debian/kbabel.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kbabel.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kbabel.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KBabel for Debian
+-----------------
+
+This application 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 kdesdk-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kbabel.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kbabel.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kbabel.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,120 @@
+debian/tmp/usr/bin/catalogmanager
+debian/tmp/usr/bin/kbabel
+debian/tmp/usr/bin/kbabeldict
+debian/tmp/usr/lib/libkbabelcommon.so.3
+debian/tmp/usr/lib/libkbabelcommon.so.3.2.0
+debian/tmp/usr/lib/libkbabeldictplugin.so.1
+debian/tmp/usr/lib/libkbabeldictplugin.so.1.2.0
+debian/tmp/usr/lib/kde3/kfile_po.la
+debian/tmp/usr/lib/kde3/kfile_po.so
+debian/tmp/usr/lib/kde3/pothumbnail.la
+debian/tmp/usr/lib/kde3/pothumbnail.so
+debian/tmp/usr/lib/kde3/kbabel_accelstool.la
+debian/tmp/usr/lib/kde3/kbabel_accelstool.so
+debian/tmp/usr/lib/kde3/kbabel_argstool.la
+debian/tmp/usr/lib/kde3/kbabel_argstool.so
+debian/tmp/usr/lib/kde3/kbabel_contexttool.la
+debian/tmp/usr/lib/kde3/kbabel_contexttool.so
+debian/tmp/usr/lib/kde3/kbabel_equationstool.la
+debian/tmp/usr/lib/kde3/kbabel_equationstool.so
+debian/tmp/usr/lib/kde3/kbabel_gettextexport.la
+debian/tmp/usr/lib/kde3/kbabel_gettextexport.so
+debian/tmp/usr/lib/kde3/kbabel_gettextimport.la
+debian/tmp/usr/lib/kde3/kbabel_gettextimport.so
+debian/tmp/usr/lib/kde3/kbabel_lengthtool.la
+debian/tmp/usr/lib/kde3/kbabel_lengthtool.so
+debian/tmp/usr/lib/kde3/kbabel_linguistexport.la
+debian/tmp/usr/lib/kde3/kbabel_linguistexport.so
+debian/tmp/usr/lib/kde3/kbabel_linguistimport.la
+debian/tmp/usr/lib/kde3/kbabel_linguistimport.so
+debian/tmp/usr/lib/kde3/kbabel_nottranslatedtool.la
+debian/tmp/usr/lib/kde3/kbabel_nottranslatedtool.so
+debian/tmp/usr/lib/kde3/kbabel_pluraltool.la
+debian/tmp/usr/lib/kde3/kbabel_pluraltool.so
+debian/tmp/usr/lib/kde3/kbabel_punctuationtool.la
+debian/tmp/usr/lib/kde3/kbabel_punctuationtool.so
+debian/tmp/usr/lib/kde3/kbabel_regexptool.la
+debian/tmp/usr/lib/kde3/kbabel_regexptool.so
+debian/tmp/usr/lib/kde3/kbabel_setfuzzytool.la
+debian/tmp/usr/lib/kde3/kbabel_setfuzzytool.so
+debian/tmp/usr/lib/kde3/kbabel_whitespacetool.la
+debian/tmp/usr/lib/kde3/kbabel_whitespacetool.so
+debian/tmp/usr/lib/kde3/kbabel_xliffexport.la
+debian/tmp/usr/lib/kde3/kbabel_xliffexport.so
+debian/tmp/usr/lib/kde3/kbabel_xliffimport.la
+debian/tmp/usr/lib/kde3/kbabel_xliffimport.so
+debian/tmp/usr/lib/kde3/kbabel_xmltool.la
+debian/tmp/usr/lib/kde3/kbabel_xmltool.so
+debian/tmp/usr/lib/kde3/kbabeldict_dbsearchengine.la
+debian/tmp/usr/lib/kde3/kbabeldict_dbsearchengine.so
+debian/tmp/usr/lib/kde3/kbabeldict_poauxiliary.la
+debian/tmp/usr/lib/kde3/kbabeldict_poauxiliary.so
+debian/tmp/usr/lib/kde3/kbabeldict_pocompendium.la
+debian/tmp/usr/lib/kde3/kbabeldict_pocompendium.so
+debian/tmp/usr/lib/kde3/kbabeldict_tmxcompendium.la
+debian/tmp/usr/lib/kde3/kbabeldict_tmxcompendium.so
+debian/tmp/usr/share/applications/kde/catalogmanager.desktop
+debian/tmp/usr/share/applications/kde/kbabel.desktop
+debian/tmp/usr/share/applications/kde/kbabeldict.desktop
+debian/tmp/usr/share/apps/catalogmanager/catalogmanagerui.rc
+debian/tmp/usr/share/apps/kbabel/kbabelui.rc
+debian/tmp/usr/share/apps/kbabel/regexplist.xml
+debian/tmp/usr/share/apps/kbabel/pics
+debian/tmp/usr/share/apps/kbabel/icons
+debian/tmp/usr/share/apps/kconf_update/kbabel-difftoproject.upd
+debian/tmp/usr/share/apps/kconf_update/kbabel-project.upd
+debian/tmp/usr/share/apps/kconf_update/kbabel-projectrename.upd
+debian/tmp/usr/share/config.kcfg/kbabel.kcfg
+debian/tmp/usr/share/config.kcfg/kbprojectsettings.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kbabel/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kbabel/common
+debian/tmp/usr/share/doc/kde/HTML/en/kbabel/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kbabel/*.png
+debian/tmp/usr/share/doc/kde/HTML/en/kbabel/TODO
+debian/tmp/usr/share/icons/hicolor/16x16/apps/catalogmanager.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kbabel.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kbabeldict.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/catalogmanager.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/catalogmanager.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kbabel.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kbabeldict.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/catalogmanager.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kbabel.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kbabeldict.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/catalogmanager.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kbabel.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kbabeldict.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/catalogmanager.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kbabel.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kbabeldict.png
+debian/tmp/usr/share/services/dbsearchengine.desktop
+debian/tmp/usr/share/services/kfile_po.desktop
+debian/tmp/usr/share/services/pothumbnail.desktop
+debian/tmp/usr/share/services/kbabel_accelstool.desktop
+debian/tmp/usr/share/services/kbabel_argstool.desktop
+debian/tmp/usr/share/services/kbabel_contexttool.desktop
+debian/tmp/usr/share/services/kbabel_equationstool.desktop
+debian/tmp/usr/share/services/kbabel_gettext_export.desktop
+debian/tmp/usr/share/services/kbabel_gettext_import.desktop
+debian/tmp/usr/share/services/kbabel_lengthtool.desktop
+debian/tmp/usr/share/services/kbabel_linguist_export.desktop
+debian/tmp/usr/share/services/kbabel_linguist_import.desktop
+debian/tmp/usr/share/services/kbabel_nottranslatedtool.desktop
+debian/tmp/usr/share/services/kbabel_pluralformstool.desktop
+debian/tmp/usr/share/services/kbabel_punctuationtool.desktop
+debian/tmp/usr/share/services/kbabel_regexptool.desktop
+debian/tmp/usr/share/services/kbabel_setfuzzytool.desktop
+debian/tmp/usr/share/services/kbabel_whitespacetool.desktop
+debian/tmp/usr/share/services/kbabel_xliff_export.desktop
+debian/tmp/usr/share/services/kbabel_xliff_import.desktop
+debian/tmp/usr/share/services/kbabel_xmltool.desktop
+debian/tmp/usr/share/services/pocompendium.desktop
+debian/tmp/usr/share/services/poauxiliary.desktop
+debian/tmp/usr/share/services/tmxcompendium.desktop
+debian/tmp/usr/share/servicetypes/kbabel_tool.desktop
+debian/tmp/usr/share/servicetypes/kbabel_validator.desktop
+debian/tmp/usr/share/servicetypes/kbabeldict_module.desktop
+debian/tmp/usr/share/servicetypes/kbabelfilter.desktop
+debian/icons/catalogmanager.xpm /usr/share/pixmaps
+debian/icons/kbabel.xpm /usr/share/pixmaps
+debian/icons/kbabeldict.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kbabel.menu
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kbabel.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kbabel.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,27 @@
+?package(kbabel):\
+        needs="x11"\
+        section="Apps/Programming"\
+        hints="KDE"\
+        title="KBabel"\
+        longtitle="KBabel (Translation Tool)"\
+        icon="/usr/share/pixmaps/kbabel.xpm"\
+        command="/usr/bin/kbabel"
+
+?package(kbabel):\
+        needs="x11"\
+        section="Apps/Programming"\
+        hints="KDE"\
+        title="KBabel Dictionary"\
+        longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
+        icon="/usr/share/pixmaps/kbabeldict.xpm"\
+        command="/usr/bin/kbabeldict"
+
+?package(kbabel):\
+        needs="x11"\
+        section="Apps/Programming"\
+        hints="KDE"\
+        title="KBabel Catalog Manager"\
+        longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
+        icon="/usr/share/pixmaps/catalogmanager.xpm"\
+        command="/usr/bin/catalogmanager"
+

Added: people/jriddell/KDE/3.5/kdesdk/debian/kbabel.mime
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kbabel.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kbabel.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+application/x-gettext; kbabel %s;test=test "$DISPLAY" != ""; priority=5

Added: people/jriddell/KDE/3.5/kdesdk/debian/kbabel.override
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kbabel.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kbabel.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+# This does not include a separate library package.
+kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+debian/tmp/usr/bin/kbugbuster
+debian/tmp/usr/lib/kde3/kcal_bugzilla.la
+debian/tmp/usr/lib/kde3/kcal_bugzilla.so
+debian/tmp/usr/share/applications/kde/kbugbuster.desktop
+debian/tmp/usr/share/apps/kbugbuster/kbugbusterui.rc
+debian/tmp/usr/share/apps/kbugbuster/pics/bars.png
+debian/tmp/usr/share/apps/kbugbuster/pics/logo.png
+debian/tmp/usr/share/apps/kbugbuster/pics/tools.png
+debian/tmp/usr/share/apps/kbugbuster/pics/top-right.png
+debian/tmp/usr/share/doc/kde/HTML/en/kbugbuster/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kbugbuster/common
+debian/tmp/usr/share/doc/kde/HTML/en/kbugbuster/*.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kbugbuster.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kbugbuster.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kbugbuster.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kbugbuster.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kbugbuster.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kbugbuster.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kbugbuster.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kbugbuster.png
+debian/tmp/usr/share/services/kresources/kcal/bugzilla.desktop
+debian/icons/kbugbuster.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.menu
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kbugbuster.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kbugbuster):\
+        needs="x11"\
+        section="Apps/Programming"\
+        hints="KDE"\
+        title="KBugBuster"\
+        longtitle="KBugBuster (KDE Bug Management)"\
+        icon="/usr/share/pixmaps/kbugbuster.xpm"\
+        command="/usr/bin/kbugbuster"
+

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind-converters.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind-converters.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind-converters.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+debian/tmp/usr/bin/dprof2calltree
+debian/tmp/usr/bin/hotshot2calltree
+debian/tmp/usr/bin/memprof2calltree
+debian/tmp/usr/bin/op2calltree
+debian/tmp/usr/bin/pprof2calltree

Added: people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind-converters.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind-converters.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind-converters.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+debian/man/dprof2calltree.1
+debian/man/hotshot2calltree.1
+debian/man/memprof2calltree.1
+debian/man/op2calltree.1
+debian/man/pprof2calltree.1

Added: people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KCachegrind for Debian
+----------------------
+
+This application 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 kdesdk-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 31 Jan 2004 12:08:48 +1100

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,19 @@
+debian/tmp/usr/bin/kcachegrind
+debian/tmp/usr/share/applications/kde/kcachegrind.desktop
+debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/16x16/actions/fromrec.png
+debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
+debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/16x16/actions/recrec.png
+debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/16x16/actions/torec.png
+debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png
+debian/tmp/usr/share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
+debian/tmp/usr/share/apps/kcachegrind/kcachegrindui.rc
+debian/tmp/usr/share/apps/kcachegrind/tips
+debian/tmp/usr/share/doc/kde/HTML/en/kcachegrind/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcachegrind/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcachegrind/*.docbook
+debian/tmp/usr/share/icons/locolor/32x32/apps/kcachegrind.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kcachegrind.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kcachegrind.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kcachegrind.png
+debian/tmp/usr/share/mimelnk/application/x-kcachegrind.desktop
+debian/icons/kcachegrind.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.menu
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kcachegrind.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kcachegrind):\
+  needs="x11"\
+  section="Apps/Programming"\
+  hints="KDE"\
+  title="KCachegrind"\
+  longtitle="KCachegrind (Profiler Frontend)"\
+  icon="/usr/share/pixmaps/kcachegrind.xpm"\
+  command="/usr/bin/kcachegrind"
+

Added: 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.cervisia	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdesdk-doc-html-cervisia
+Title: Cervisia Manual
+Author: Bernd Gehrmann <bernd at mail.berlios.de> and Carlos Woelz <carloswoelz at imap-mail.com>
+Abstract: Cervisia provides a graphical view of CVS.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/cervisia/index.html
+Files: /usr/share/doc/kde/HTML/en/cervisia/*.html
+

Added: 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.kbabel	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+Document: kdesdk-doc-html-kbabel
+Title: KBabel Handbook
+Author: Matthias Kiefer <matthias.kiefer at gmx.de>, Stanislav Visnovsky <visnovsky at kde.org>
+Abstract: KBabel is a suite of an advanced and easy to use PO-file
+ editor KBabel, a multi functional Catalog Manager and a dictionary for
+ translators KBabelDict.  It supports many advanced features and it lets
+ you customize many options.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kbabel/index.html
+Files: /usr/share/doc/kde/HTML/en/kbabel/*.html
+

Added: 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.kcachegrind	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdesdk-doc-html-kcachegrind
+Title: KCachegrind Handbook
+Author: Josef Weidendorfer <Josef.Weidendorfer at gmx.de>
+Abstract: KCachegrind is a profile data visualization tool, written
+ using the KDE environment.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kcachegrind/index.html
+Files: /usr/share/doc/kde/HTML/en/kcachegrind/*.html
+

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Document: kdesdk-doc-html-umbrello
+Title: Umbrello UML Modeller Handbook
+Author: Paul Hensgen and the Umbrello UML Modeller Authors
+Abstract: Umbrello UML Modeller helps the software development process
+ by using the industry standard Unified Modelling Language (UML) to enable
+ you to create diagrams for designing and documenting your systems.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/umbrello/index.html
+Files: /usr/share/doc/kde/HTML/en/umbrello/*.html
+

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

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-kio-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-kio-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-kio-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,55 @@
+debian/tmp/usr/bin/kio_svn_helper
+debian/tmp/usr/lib/kde3/kded_ksvnd.la
+debian/tmp/usr/lib/kde3/kded_ksvnd.so
+debian/tmp/usr/lib/kde3/kio_svn.la
+debian/tmp/usr/lib/kde3/kio_svn.so
+debian/tmp/usr/share/apps/konqueror/servicemenus/subversion_toplevel.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/subversion.desktop
+debian/tmp/usr/share/services/kded/ksvnd.desktop
+debian/tmp/usr/share/services/svn+file.protocol
+debian/tmp/usr/share/services/svn+http.protocol
+debian/tmp/usr/share/services/svn+https.protocol
+debian/tmp/usr/share/services/svn+ssh.protocol
+debian/tmp/usr/share/services/svn.protocol
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_switch.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_merge.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_branch.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_remove.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_add.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/svn_status.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_switch.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_merge.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_branch.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_remove.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_add.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/svn_status.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_switch.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_merge.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_branch.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_remove.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_add.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/actions/svn_status.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_switch.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_merge.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_branch.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_remove.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_add.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/actions/svn_status.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_switch.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_merge.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_branch.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_remove.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_add.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/actions/svn_status.png
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_add.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_status.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_remove.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_switch.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_branch.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/actions/svn_merge.svgz
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_switch.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_merge.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_branch.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_remove.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_add.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/actions/svn_status.png

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+KDE Software Development Kit for Debian
+---------------------------------------
+
+The kdesdk-misc package includes palettes for both the Gimp and Xpaint
+that match the KDE standard colour palette.  They may be useful for
+designing themes and icons.
+
+These palettes have been placed in /usr/share/kdepalettes/.
+Instructions for installation are included in /usr/share/kdepalettes/README.
+
+ -- Ben Burton <bab at debian.org>, Wed, 20 Nov 2002 22:27:44 +1100

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+debian/tmp/usr/include/kde/kprofilemethod.h
+debian/tmp/usr/lib/kde3/kabcformat_kdeaccounts.la
+debian/tmp/usr/lib/kde3/kabcformat_kdeaccounts.so
+debian/tmp/usr/lib/kde3/plugins/styles/scheck.so
+debian/tmp/usr/lib/kde3/plugins/styles/scheck.la
+debian/tmp/usr/share/apps/kabc/formats/kdeaccountsplugin.desktop
+debian/tmp/usr/share/apps/kstyle/themes/scheck.themerc
+kdepalettes/kde_xpaintrc /usr/share/kdepalettes
+kdepalettes/KDE_Gimp /usr/share/kdepalettes
+kdepalettes/README /usr/share/kdepalettes

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.links
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-misc.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+usr/share/kdepalettes/README usr/share/doc/kdesdk-misc/README.palettes

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,65 @@
+kdesdk-scripts for Debian
+-------------------------
+
+Debugger macros:
+
+  Some handy gdb macros (such as for printing QStrings from gdb)
+  have been placed in /usr/share/kdesdk-scripts/kde-devel-gdb.
+
+  To use them, add this line to your ~/.gdbinit :
+
+    source /usr/share/kdesdk-scripts/kde-devel-gdb
+
+Editor helper files:
+
+  Both vim and emacs helper files are provided containing many functions
+  and keybindings for developing KDE/Qt/C++ applications.
+
+  To use the vim helper file, add this line to your ~/.vimrc :
+
+    source /usr/share/kdesdk-scripts/kde-devel-vim.vim
+
+  To use the emacs helper files, add these lines to your ~/.emacs (with
+  your real name and email address substituted as appropriate):
+
+    (add-to-list 'load-path "/usr/share/emacs/site-lisp/kdesdk-scripts")
+    (require 'kde-emacs)
+
+    (setq kde-full-name "Your Name")
+    (setq kde-email "Your Email")
+
+  See the file /usr/share/emacs/site-lisp/kdesdk-scripts/kde-emacs.el for
+  further information regarding emacs.
+
+Shell completion controls:
+
+  Completion controls are provided in /usr/share/kdesdk-scripts/completions/
+  for a variety of shells.
+
+  To enable completion controls for zsh, you need to add the following
+  lines to your ~/.zshrc :
+
+    # Add the KDE completion controls to the zsh function path.
+    set -A fpath $fpath /usr/share/kdesdk-scripts/completions/zsh
+
+    # Initialise the zsh completion system.
+    autoload -U compinit
+    compinit
+
+  To enable completion controls for bash, you must source each of the bash
+  completion files from your ~/.bashrc .  A sample ~/.bashrc line is:
+
+    . /usr/share/kdesdk-scripts/completions/bash/dcop
+
+Valgrind error suppressions:
+
+  A valgrind suppression file is included for ignoring things we don't
+  care about when valgrinding KDE applications.
+
+  The suppression file is provided as /usr/lib/valgrind/kde.supp .
+
+  To use these suppressions, run valgrind with the option:
+
+    --suppressions=/usr/lib/valgrind/kde.supp
+
+ -- Ben Burton <bab at debian.org>, Fri, 15 Oct 2004 09:55:26 +1000

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,68 @@
+debian/tmp/usr/bin/adddebug
+debian/tmp/usr/bin/build-progress.sh
+debian/tmp/usr/bin/cheatmake
+debian/tmp/usr/bin/create_cvsignore
+debian/tmp/usr/bin/create_makefile
+debian/tmp/usr/bin/create_makefiles
+debian/tmp/usr/bin/cvs-clean
+debian/tmp/usr/bin/cvs2dist
+debian/tmp/usr/bin/cvsbackport
+debian/tmp/usr/bin/cvsblame
+debian/tmp/usr/bin/cvscheck
+debian/tmp/usr/bin/cvsforwardport
+debian/tmp/usr/bin/cvslastchange
+debian/tmp/usr/bin/cvslastlog
+debian/tmp/usr/bin/cvsrevertlast
+debian/tmp/usr/bin/cvsversion
+debian/tmp/usr/bin/cxxmetric
+debian/tmp/usr/bin/extend_dmalloc
+debian/tmp/usr/bin/extractattr
+debian/tmp/usr/bin/extractrc
+debian/tmp/usr/bin/findmissingcrystal
+debian/tmp/usr/bin/fixkdeincludes
+debian/tmp/usr/bin/fixuifiles
+debian/tmp/usr/bin/includemocs
+debian/tmp/usr/bin/kde-build
+debian/tmp/usr/bin/kdedoc
+debian/tmp/usr/bin/kdekillall
+debian/tmp/usr/bin/kdelnk2desktop.py
+debian/tmp/usr/bin/kdemangen.pl
+debian/tmp/usr/bin/licensecheck
+debian/tmp/usr/bin/makeobj
+debian/tmp/usr/bin/noncvslist
+debian/tmp/usr/bin/package_crystalsvg
+debian/tmp/usr/bin/png2mng.pl
+debian/tmp/usr/bin/pruneemptydirs
+debian/tmp/usr/bin/qtdoc
+debian/tmp/usr/bin/zonetab2pot.py
+debian/tmp/usr/bin/svn2dist
+debian/tmp/usr/bin/svnrevertlast
+debian/tmp/usr/bin/svnforwardport
+debian/tmp/usr/bin/nonsvnlist
+debian/tmp/usr/bin/kdesvn-build
+debian/tmp/usr/bin/svnlastlog
+debian/tmp/usr/bin/svnversions
+debian/tmp/usr/bin/create_svnignore
+debian/tmp/usr/bin/svnlastchange
+debian/tmp/usr/bin/colorsvn
+debian/tmp/usr/bin/svnaddcurrentdir
+debian/tmp/usr/bin/svnbackport
+debian/tmp/usr/bin/svngettags
+debian/tmp/usr/bin/svnchangesince
+debian/tmp/usr/bin/svn-clean
+debian/tmp/usr/share/apps/katepart/syntax/kdesvn-buildrc.xml
+debian/tmp/usr/share/man/man1/cvsblame.1
+debian/tmp/usr/share/man/man1/cvscheck.1
+debian/tmp/usr/share/man/man1/cvsversion.1
+debian/tmp/usr/share/man/man1/kde-build.1
+debian/tmp/usr/share/man/man1/includemocs.1
+debian/tmp/usr/share/man/man1/noncvslist.1
+debian/tmp/usr/share/man/man1/kdesvn-build.1
+debian/tmp/usr/share/doc/kde/HTML/en/kdesvn-build/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdesvn-build/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdesvn-build/index.docbook
+scripts/kde-devel-gdb /usr/share/kdesdk-scripts
+scripts/kde-devel-vim.vim /usr/share/kdesdk-scripts
+scripts/kde-emacs/*.el /usr/share/emacs/site-lisp/kdesdk-scripts
+scripts/kde.supp /usr/lib/valgrind
+scripts/completions /usr/share/kdesdk-scripts

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+debian/man/adddebug.1
+debian/man/build-progress.sh.1
+debian/man/cheatmake.1
+debian/man/create_cvsignore.1
+debian/man/create_makefile.1
+debian/man/create_makefiles.1
+debian/man/cvs-clean.1
+debian/man/cvs2dist.1
+debian/man/cvsbackport.1
+debian/man/cvscheck.1
+debian/man/cvsforwardport.1
+debian/man/cvslastchange.1
+debian/man/cvslastlog.1
+debian/man/cvsrevertlast.1
+debian/man/cxxmetric.1
+debian/man/extend_dmalloc.1
+debian/man/extractattr.1
+debian/man/extractrc.1
+debian/man/fixkdeincludes.1
+debian/man/fixuifiles.1
+debian/man/findmissingcrystal.1
+debian/man/kdedoc.1
+debian/man/kdekillall.1
+debian/man/kdelnk2desktop.py.1
+debian/man/kdemangen.pl.1
+debian/man/licensecheck.1
+debian/man/makeobj.1
+debian/man/package_crystalsvg.1
+debian/man/png2mng.pl.1
+debian/man/pruneemptydirs.1
+debian/man/qtdoc.1
+debian/man/zonetab2pot.py.1

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.override
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk-scripts.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+# The syntax error is just perlpod docs appearing after the script exits.
+kdesdk-scripts: shell-script-fails-syntax-check ./usr/bin/cvsversion
+kdesdk-scripts: shell-script-fails-syntax-check ./usr/bin/kde-build

Added: people/jriddell/KDE/3.5/kdesdk/debian/kdesdk.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kdesdk.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kdesdk.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+KDE Software Development Kit for Debian
+---------------------------------------
+
+Package kdesdk is a metapackage that depends on the core components of
+the KDE Software Development Kit and suggests the remaining components.
+
+Some applications 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 kdesdk-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kmtrace.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kmtrace.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kmtrace.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+debian/tmp/usr/bin/demangle
+debian/tmp/usr/bin/kminspector
+debian/tmp/usr/bin/kmmatch
+debian/tmp/usr/bin/kmtrace
+debian/tmp/usr/include/kde/ktrace.h
+debian/tmp/usr/lib/kmtrace/libktrace.la
+debian/tmp/usr/lib/kmtrace/libktrace.so
+debian/tmp/usr/lib/kmtrace/libktrace_s.a
+debian/tmp/usr/share/apps/kmtrace/kde.excludes

Added: people/jriddell/KDE/3.5/kdesdk/debian/kmtrace.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kmtrace.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kmtrace.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+debian/man/demangle.1
+debian/man/kmtrace.1
+debian/man/kminspector.1
+debian/man/kmmatch.1

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kompare.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kompare.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kompare.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,26 @@
+debian/tmp/usr/bin/kompare
+debian/tmp/usr/lib/libkompareinterface.la
+debian/tmp/usr/lib/libkompareinterface.so
+debian/tmp/usr/lib/libkompareinterface.so.0
+debian/tmp/usr/lib/libkompareinterface.so.0.0.0
+debian/tmp/usr/lib/kde3/libkomparenavtreepart.la
+debian/tmp/usr/lib/kde3/libkomparenavtreepart.so
+debian/tmp/usr/lib/kde3/libkomparepart.la
+debian/tmp/usr/lib/kde3/libkomparepart.so
+debian/tmp/usr/share/applications/kde/kompare.desktop
+debian/tmp/usr/share/apps/kompare/komparepartui.rc
+debian/tmp/usr/share/apps/kompare/kompareui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kompare/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kompare/common
+debian/tmp/usr/share/doc/kde/HTML/en/kompare/*.docbook
+debian/tmp/usr/share/services/komparenavtreepart.desktop
+debian/tmp/usr/share/services/komparepart.desktop
+debian/tmp/usr/share/servicetypes/komparenavigationpart.desktop
+debian/tmp/usr/share/servicetypes/kompareviewpart.desktop
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kompare.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kompare.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kompare.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kompare.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kompare.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kompare.svgz
+debian/icons/kompare.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kompare.menu
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kompare.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kompare.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kompare):\
+        needs="x11"\
+        section="Apps/Programming"\
+        hints="KDE"\
+        title="Kompare"\
+        longtitle="Kompare (Diff/Patch Frontend)"\
+        icon="/usr/share/pixmaps/kompare.xpm"\
+        command="/usr/bin/kompare"
+

Added: people/jriddell/KDE/3.5/kdesdk/debian/kompare.override
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kompare.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kompare.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+# This does not include a separate library package.
+kompare: package-name-doesnt-match-sonames libkompareinterface0
+kompare: non-dev-pkg-with-shlib-symlink usr/lib/libkompareinterface.so.0.0.0 usr/lib/libkompareinterface.so

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kspy.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kspy.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kspy.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+debian/tmp/usr/include/kde/kspy.h
+debian/tmp/usr/lib/libkspy.la
+debian/tmp/usr/lib/libkspy.so
+debian/tmp/usr/lib/libkspy.so.1
+debian/tmp/usr/lib/libkspy.so.1.2.0

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kspy.override
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kspy.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kspy.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+# There is no -dev package.
+kspy: non-dev-pkg-with-shlib-symlink usr/lib/libkspy.so.1.2.0 usr/lib/libkspy.so
+
+# This does not come with a separate library package.
+kspy: package-name-doesnt-match-sonames libkspy1

Added: people/jriddell/KDE/3.5/kdesdk/debian/kuiviewer.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kuiviewer.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kuiviewer.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+debian/tmp/usr/bin/kuiviewer
+debian/tmp/usr/lib/kde3/libkuiviewerpart.so
+debian/tmp/usr/lib/kde3/libkuiviewerpart.la
+debian/tmp/usr/lib/kde3/quithumbnail.so
+debian/tmp/usr/lib/kde3/quithumbnail.la
+debian/tmp/usr/share/applications/kde/kuiviewer.desktop
+debian/tmp/usr/share/apps/kuiviewer/kuiviewerui.rc
+debian/tmp/usr/share/apps/kuiviewerpart/kuiviewer_part.rc
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kuiviewer.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kuiviewer.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kuiviewer.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kuiviewer.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kuiviewer.png
+debian/tmp/usr/share/services/designerthumbnail.desktop
+debian/tmp/usr/share/services/kuiviewer_part.desktop
+debian/icons/kuiviewer.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kuiviewer.menu
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kuiviewer.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kuiviewer.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kuiviewer):\
+  needs="x11"\
+  section="Apps/Programming"\
+  hints="KDE"\
+  title="KUIViewer"\
+  longtitle="KUIViewer (Qt Designer UI File Viewer)"\
+  icon="/usr/share/pixmaps/kuiviewer.xpm"\
+  command="/usr/bin/kuiviewer"
+

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/kunittest.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/kunittest.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/kunittest.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+debian/tmp/usr/bin/kunittest
+debian/tmp/usr/bin/kunittestmod
+debian/tmp/usr/bin/kunittest_debughelper
+debian/tmp/usr/bin/kunittestguimodrunner
+debian/tmp/usr/lib/libkunittestgui.la
+debian/tmp/usr/lib/libkunittestgui.so
+debian/tmp/usr/lib/libkunittestgui.so.0
+debian/tmp/usr/lib/libkunittestgui.so.0.0.0
+debian/tmp/usr/include/kde/kunittest/runnergui.h

Added: people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice-dev.docs
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice-dev.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice-dev.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+cervisia/cvsservice/DESIGN
+cervisia/cvsservice/TODO

Added: people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+debian/tmp/usr/include/kde/cvsjob_stub.h
+debian/tmp/usr/include/kde/cvsservice_stub.h
+debian/tmp/usr/include/kde/repository_stub.h
+debian/tmp/usr/lib/libcvsservice.la
+debian/tmp/usr/lib/libcvsservice.so
+debian/tmp/usr/lib/libkdeinit_cvsaskpass.la
+debian/tmp/usr/lib/libkdeinit_cvsservice.la

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+debian/tmp/usr/bin/cvsaskpass
+debian/tmp/usr/bin/cvsservice
+debian/tmp/usr/lib/libcvsservice.so.0
+debian/tmp/usr/lib/libcvsservice.so.0.0.1
+debian/tmp/usr/lib/libkdeinit_cvsaskpass.so
+debian/tmp/usr/lib/libkdeinit_cvsservice.so
+debian/tmp/usr/lib/kde3/cvsaskpass.la
+debian/tmp/usr/lib/kde3/cvsaskpass.so
+debian/tmp/usr/lib/kde3/cvsservice.la
+debian/tmp/usr/lib/kde3/cvsservice.so
+debian/tmp/usr/share/services/cvsservice.desktop

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.override
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/libcvsservice0.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+# This is from kdeinit black magic.
+libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsaskpass.so usr/lib/libkdeinit_cvsaskpass.so
+libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsservice.so usr/lib/libkdeinit_cvsservice.so

Added: people/jriddell/KDE/3.5/kdesdk/debian/man/adddebug.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/adddebug.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/adddebug.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,45 @@
+.\"                                      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 ADDDEBUG 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
+adddebug \- modifies Makefile(s) to add debug info
+.SH SYNOPSIS
+.B adddebug
+.RB "[ " \-k " ] [ " \-n " ] [ " \-r " ]"
+.SH DESCRIPTION
+\fBadddebug\fP modifies the \fIMakefile\fP in the current directory
+(and optionally in its subdirectories) to add debug info (\fI\-g3\fP).
+It will also remove optimisations (\fI\-O[1-9]?\fP), and can optionally
+remove \fI\-DNDEBUG\fP and \fI\-DNO_DEBUG\fP as well.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+.B \-k
+Keep optimisations (do not remove \fI\-O[1-9]?\fP flags which are
+removed by default).
+.TP
+.B \-n
+Compile without \fINDEBUG\fP and \fINO_DEBUG\fP being defined (this
+makes kdDebug calls work).
+.TP
+.B \-r
+Recursively search through all subdirectories of the current directory
+and operate on every Makefile that is found.
+.SH AUTHOR
+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/kdesdk/debian/man/build-progress.sh.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/build-progress.sh.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/build-progress.sh.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,56 @@
+.\"                                      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 BUILD-PROGRESS.SH 1 "June 16, 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
+build-progress.sh \- show kde-build progress in your konsole/xterm title bar
+.SH SYNOPSIS
+.B build-progress.sh
+.SH DESCRIPTION
+\fBbuild-progress.sh\fP can be used to watch the progress of a large KDE
+build in the title bar of your konsole or xterm.
+.PP
+The KDE build must be running elsewhere as a separate process, and it
+must be done using
+.BR kde-build (1).
+.PP
+When you run build-progress.sh, it will sit in a permanent loop while
+kde-build runs.  The title bar of the konsole/xterm in which you ran
+build-progress.sh will be continually updated with the directory in
+which the KDE build is currently working.
+.PP
+You must run build-progress.sh from the top-level directory of the KDE
+build tree.  This directory must contain a file named
+\fIkde-buildrc\fP (which is also used by kde-build).  This
+\fIkde-buildrc\fP must contain valid settings for
+\fIKDELOGDIR\fP and \fIKDESRCDIR\fP, or else build-progress.sh will
+fail to work.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH FILES
+.TP
+\fIkde-buildrc\fP
+This file must be contained in the current directory, which must be the
+root of the KDE build tree.  See
+.BR kde-build (1)
+for further information.
+.SH SEE ALSO
+.BR kde-build (1).
+.SH AUTHOR
+build-progress.sh was written by Malte Starostik <malte 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/kdesdk/debian/man/catalogmanager.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/catalogmanager.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/catalogmanager.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,66 @@
+.\"                                      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 CATALOGMANAGER 1 "March 19, 2005"
+.\" 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
+catalogmanager \- advanced catalog manager for KBabel
+.SH SYNOPSIS
+.B catalogmanager
+.RI "[ " generic-options " ]"
+[ \fB\-\-project\fP \fIconfig-file\fP ]
+.SH DESCRIPTION
+\fBCatalogManager\fP is part of a suite of programs for editing gettext
+message files (PO-files).  This suite is designed to help you translate fast
+and consistently.
+.PP
+This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
+advanced and easy to use PO-file editor with full navigational and editing
+capabilities, syntax checking and statistics.  CatalogManager (this program)
+is a multi functional catalog manager which allows you to keep track of many
+PO-files at once.  KBabelDict is a dictionary to assist with searching
+for common translations.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+Below are the catalogmanager-specific options.
+For a full summary of options, run \fIcatalogmanager \-\-help\fP.
+.TP
+\fB\-\-project\fP \fIconfig-file\fP
+Load the configuration from the given file.
+.SH SEE ALSO
+.BR kbabel (1),
+.BR kbabeldict (1).
+.PP
+Full user documentation for KBabel is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kbabel/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kbabel/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
+.SH AUTHOR
+KBabel was written by Matthias Kiefer <kiefer at kde.org>,
+Wolfram Diestel <wolfram at steloj.de>, Andrea Rizzi <rizzi at kde.org>,
+Stanislav Visnovsky <visnovsky at kde.org>, Marco Wegner <dubbleu at web.de>,
+Asgeir Frimannsson <asgeirf at redhat.com>,
+Dwayne Bailey <dwayne at translate.org.za>,
+Bram Schoenmakers <bramschoenmakers at kde.nl> 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/kdesdk/debian/man/cheatmake.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cheatmake.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cheatmake.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,72 @@
+.\"                                      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 CHEATMAKE 1 "September 27, 2002"
+.\" 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
+cheatmake \- fool make into not rebuilding certain files
+.SH SYNOPSIS
+.B cheatmake hidechange
+.I file
+.br
+.B cheatmake show
+.br
+.B cheatmake why
+.I file
+.SH DESCRIPTION
+\fBcheatmake\fP is used to save time when recompiling.  It can fool \fBmake\fP
+into skipping files that haven't changed in a meaningful way.  This can be
+used for instance when you change a comment in a file but none of the actual
+code.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+The different modes of operation are as follows.
+.TP
+\fBhidechange\fP \fIfile\fP
+Hides the fact that the given file has changed by moving its timestamp
+back into the past.  Use this option with care!
+.TP
+\fBshow\fP
+Lists which files make currently needs to rebuild.
+.TP
+\fBwhy\fP \fIfile\fP
+Explains why make must rebuild the given file.
+.SH ENVIRONMENT VARIABLES
+One of the following variables (but not both) should be set if the
+source
+directory is different from the build directory.
+If the build directory is simply a subdirectory of the source directory,
+the simpler variable OBJ_SUBDIR should be used.
+.TP
+OBJ_SUBDIR
+Indicates that the build directory is in the given subdirectory of the
+source directory.  For instance, if the source directory is \fIkdesdk\fP
+and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+should be set to \fIobj-i386-linux\fP.
+.TP
+OBJ_REPLACEMENT
+A \fBsed\fP expression that is used to transform the source directory
+into the build directory.
+For instance, if the source directory is \fI~/src/kdesdk\fP and the
+build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#kdesdk#kdesdk-obj#\fP.
+.SH SEE ALSO
+.BR make (1).
+.SH AUTHOR
+cheatmake was written by David Faure <faure 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/kdesdk/debian/man/create_cvsignore.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/create_cvsignore.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/create_cvsignore.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 CREATE_CVSIGNORE 1 "March 20, 2005"
+.\" 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
+create_cvsignore \- creates preliminary .cvsignore in current directory
+.SH SYNOPSIS
+.B create_cvsignore
+[ \fB\-r\fP ]
+.SH DESCRIPTION
+\fBcreate_cvsignore\fP is used to create a preliminary \fI.cvsignore\fP
+file in the current directory.  It does this by adding some standard
+stuff according to what it finds in \fIMakefile.am\fP.
+.PP
+No lines will be removed from any existing \fI.cvsignore\fP.
+If there is not already a \fI.cvsignore\fP, it will be added to the CVS
+repository.
+.PP
+Note that you must have a \fIMakefile.am\fP in the current directory for
+this tool to work.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB-r\fP
+Recursively process this directory and all directories beneath it.
+.SH AUTHOR
+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/kdesdk/debian/man/create_makefile.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/create_makefile.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/create_makefile.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 CREATE_MAKEFILE 1 "September 26, 2002"
+.\" 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
+create_makefile \- creates Makefile.in and Makefile from a Makefile.am
+.SH SYNOPSIS
+.B create_makefile
+.I relativepath/Makefile
+.br
+.B create_makefile
+.I relativepath
+.SH DESCRIPTION
+\fBcreate_makefile\fP creates the \fIMakefile.in\fP and \fIMakefile\fP
+in a subdirectory containing a \fIMakefile.am\fP.
+This script saves time compared to re-running configure completely.
+.PP
+Note that you must supply the path to the desired \fIMakefile\fP, not the
+existing \fIMakefile.am\fP (though the final \fI/Makefile\fP may be omitted).
+.PP
+This script may be run from the toplevel directory (the
+one containing \fIconfigure\fP) or from one of its subdirectories.
+Note that \fIrelativepath\fP must be a relative path, not an absolute path.
+.PP
+If the source directory is different from the build directory (see the
+environment variables below), it will be assumed that the \fIMakefile.am\fP
+and \fIMakefile.in\fP belong beneath the source directory and that the
+\fIMakefile\fP belongs beneath the build directory.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH ENVIRONMENT VARIABLES
+One of the following variables (but not both) should be set if the
+source
+directory is different from the build directory.
+If the build directory is simply a subdirectory of the source directory,
+the simpler variable OBJ_SUBDIR should be used.
+.TP
+OBJ_SUBDIR
+Indicates that the build directory is in the given subdirectory of the
+source directory.  For instance, if the source directory is \fIkdesdk\fP
+and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+should be set to \fIobj-i386-linux\fP.
+.TP
+OBJ_REPLACEMENT
+A \fBsed\fP expression that is used to transform the source directory
+into the build directory.
+For instance, if the source directory is \fI~/src/kdesdk\fP and the
+build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#kdesdk#kdesdk-obj#\fP.
+.SH SEE ALSO
+.BR create_makefiles (1).
+.SH AUTHOR
+create_makefile was written by David Faure <faure 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/kdesdk/debian/man/create_makefiles.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/create_makefiles.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/create_makefiles.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,63 @@
+.\"                                      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 CREATE_MAKEFILES 1 "September 27, 2002"
+.\" 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
+create_makefiles \- recreates all Makefiles beneath a directory
+.SH SYNOPSIS
+.B create_makefiles
+.I dir
+.SH DESCRIPTION
+\fBcreate_makefiles\fP recreates all \fIMakefile\fPs in
+\fIdir\fP and its (recursed) subdirectories from the corresponding
+\fIMakefile.am\fP templates.
+.PP
+This script must be run from the toplevel directory (the
+one containing \fIconfigure\fP).
+This script saves time compared to re-running configure completely.
+.PP
+If the source directory is different from the build directory (see the
+environment variables below), it will be assumed that each \fIMakefile.am\fP
+and \fIMakefile.in\fP belongs beneath the source directory and that each
+\fIMakefile\fP belongs beneath the build directory.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH ENVIRONMENT VARIABLES
+One of the following variables (but not both) should be set if the
+source
+directory is different from the build directory.
+If the build directory is simply a subdirectory of the source directory,
+the simpler variable OBJ_SUBDIR should be used.
+.TP
+OBJ_SUBDIR
+Indicates that the build directory is in the given subdirectory of the
+source directory.  For instance, if the source directory is \fIkdesdk\fP
+and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+should be set to \fIobj-i386-linux\fP.
+.TP
+OBJ_REPLACEMENT
+A \fBsed\fP expression that is used to transform the source directory
+into the build directory.
+For instance, if the source directory is \fI~/src/kdesdk\fP and the
+build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#kdesdk#kdesdk-obj#\fP.
+.SH SEE ALSO
+.BR create_makefile (1).
+.SH AUTHOR
+create_makefiles was written by David Faure <faure 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/kdesdk/debian/man/cvs-clean.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvs-clean.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvs-clean.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 CVS-CLEAN 1 "March 20, 2005"
+.\" 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
+cvs\-clean \- delete all files and directories not registered with CVS
+.SH SYNOPSIS
+.B cvs\-clean
+[ \fB-n, \-\-dry-run\fP ]
+[ \fB-h, \-\-help\fP ]
+.SH DESCRIPTION
+\fBcvs\-clean\fP recursively deletes everything in or beneath the
+current directory that is not known to CVS (i.e., that has not been
+checked out of or checked into a CVS repository).
+.PP
+A list of all files and directories that are deleted will be written to
+the console.
+.PP
+This script behaves similarly to the \fIcvs-clean\fP target from the
+file \fIadmin/Makefile.common\fP found in most KDE application sources.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB-n, \-\-dry-run\fP
+Print the intended actions to the console, but do not change anything on
+the filesystem.
+.TP
+\fB-h, \-\-help\fP
+Display usage information.
+.SH SEE ALSO
+.BR cvs (1).
+.SH AUTHOR
+This utility was written by Oswald Buddenhagen <ossi 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/kdesdk/debian/man/cvs2dist.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvs2dist.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvs2dist.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,201 @@
+.\"                                      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 CVS2DIST 1 "March 19, 2005"
+.\" 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
+cvs2dist \- convert subdirectories within KDE CVS into standalone
+source packages
+.SH SYNOPSIS
+.B cvsdist
+.I path-to-module
+.I directory-in-module
+[ \fB\-n, \-\-name\fP \fIname\fP ]
+[ \fB\-v, \-\-version\fP \fIversion\fP ]
+[ \fB\-\-admin-dir\fP \fIdir\fP ]
+[ \fB\-\-cvs-root\fP \fIroot\fP ]
+[ \fB\-B, \-\-branch\fP \fIbranch\fP ]
+[ \fB\-\-no-i18n\fP ]
+[ \fB\-\-no-i18n-lang\fP \fIlanguages\fP ]
+[ \fB\-\-log=\fP\fIlogfile\fP | \fB\-l\fP ]
+[ \fB\-m, \-\-make-unpackaged\fP ]
+[ \fB\-g, \-\-no-gzip\fP ]
+[ \fB\-b, \-\-no-bz2, \-\-no-bzip2\fP ]
+[ \fB\-o, \-\-only-directory\fP ]
+[ \fB\-r, \-\-required-header\fP \fIheader\fP ]
+[ \fB\-e, \-\-required-header-error-message\fP \fImessage\fP ]
+[ \fB\-d, \-\-remove-hidden\fP ]
+[ \fB\-\-replace-files\fP \fIpairs\fP ]
+[[--] \fIaddfile\fP ... ]
+.PP
+.B cvsdist
+\fB\-h, \-\-help\fP
+.SH DESCRIPTION
+Each module in the KDE CVS tree contains a large number of applications
+all bundled together.
+\fBcvs2dist\fP is used to extract a single application or component from
+one of these large CVS modules and bundle it into a standalone package.
+The application or component will be bundled into a standard
+distribution tarball (with a configure script and so on) that users can
+download, build and install.
+.PP
+By default, cvs2dist automatically tries to check out all translations
+of strings and documentation from the corresponding parts of the
+\fIkde-i18n\fP CVS module and include them in the final packages.
+This can be suppressed or modified using the options \-\-no-i18n or
+\-\-no-i18n-lang.
+.PP
+The initial argument \fIpath-to-module\fP should specify where the CVS
+module has been checked out on your system, and the second argument
+\fIdirectory-in-module\fP should specify which directory within this
+module is to be packaged (all subdirectories beneath it will be included
+and so on).  See the EXAMPLE section below for details.
+.PP
+Both gzip and bzip2 compressed tarballs will be created by default and
+will be called \fIname[-version].tar.gz\fP and \fIname[-version].tar.bz2\fP.
+The \fIname\fP component will be the last directory component of
+\fIdirectory-in-module\fP unless otherwise specified by \-\-name, and
+the \fIversion\fP component will not be included unless it is specified by
+\-\-version.
+.PP
+Additional files from outside the CVS tree can be included in the final
+packages by passing them after all other options (these are the
+\fIaddfile\fP arguments displayed above).  These additional files will
+be placed in the top level directory of the final packages.
+The \-\- that precedes them is optional.
+.PP
+Many options are available for customising these procedures, as seen below.
+Note that cvs2dist will remove any temporary files that it creates.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-n, \-\-name\fP \fIname\fP
+The name of the package (to be used in the names of the final tarballs
+and directories).  Specifically, the compressed tarballs will be called
+\fIname-version.tar.gz\fP and \fIname-version.tar.bz2\fP (see the
+\-\-version option below for further information).
+This package name defaults to the last directory component of
+\fIdirectory-in-module\fP.
+.TP
+\fB\-v, \-\-version\fP \fIversion\fP
+The version of the package (to be used in the names of the final
+tarballs and directories).  If this is not supplied, no version is used
+at all (i.e., the compressed tarballs will just be called \fIname.tar.gz\fP
+and \fIname.tar.bz2\fP).
+.TP
+\fB\-\-admin-dir\fP \fIdir\fP
+The location of \fIadmin/\fP on the filesystem.  Symbolic links may
+be used.  Defaults to \fIpath-to-module/admin\fP.
+.TP
+\fB\-\-cvs-root\fP \fIroot\fP
+The value to use as CVSROOT when checking out translations from CVS.
+Defaults to the CVSROOT environment variable.
+If \-\-no-i18n is passed then this option has no effect.
+.TP
+\fB\-B, \-\-branch\fP \fIbranch\fP
+Use the given CVS branch for checking out translations from CVS.
+If \-\-no-i18n is passed then this option has no effect.
+.TP
+\fB\-\-no-i18n\fP
+Do not check out any translations from CVS.
+.TP
+\fB\-\-no-i18n-lang\fP \fIlanguages\fP
+Exclude the given language(s) when checking out translations from CVS.
+The list of languages should be comma-separated,
+such as \fI\-\-no-i18n-lang uk,de,en_GB\fP .
+.TP
+\fB\-\-log=\fP\fIlogfile\fP
+Log all proceedings to the given logfile.  Note that the = is essential,
+and may not be omitted.
+.TP
+\fB\-l\fP
+Log all proceedings to the default logfile in the current directory.
+.TP
+\fB\-m, \-\-make-unpackaged\fP
+In addition to the compressed tarballs, an unpacked distribution will be
+created in the current directory.
+.TP
+\fB\-g, \-\-no-gzip\fP
+Do not create a gzip package (\fIname-version.tar.gz\fP).
+.TP
+\fB\-b, \-\-no-bz2, \-\-no-bzip2\fP
+Do not create a bzip2 package (\fIname-version.tar.bz2\fP).
+.TP
+\fB\-o, \-\-only-directory\fP
+Alias for \-mgb.  No packages will be created, only an unpacked directory.
+.TP
+\fB\-r, \-\-required-header\fP \fIheader\fP
+When the user runs configure, an error will be generated if
+\fIheader\fP is not found on the user's system.
+.TP
+\fB\-e, \-\-required-header-error-message\fP \fImessage\fP
+The error to display to a user when the header passed with
+\-\-required-header is not found on the user's system.  Defaults to a
+sensible message.
+.TP
+\fB\-d, \-\-remove-hidden\fP
+Remove hidden files and directories (e.g., dotfiles) from the packages.
+.TP
+\fB\-h, \-\-help\fP
+Display instructions on how to use cvs2dist.
+.TP
+\fB\-\-replace-files\fP \fIpairs\fP
+Move one or more files around in the final distribution packages.
+The \fIpairs\fP argument should be a comma-separated list of
+replacements to make.  Each replacement specifies a single file to move, and
+should be of the form \fIsource\fP@\fIdest\fP.
+.br
+For each replacement, the source file will be moved to the
+destination file (in particular, the source file will be deleted).
+All filenames are relative to the top-level directory
+of the package.  Spaces in filenames are not allowed.
+.br
+Please be careful when using this option!  Try to avoid the use of ..
+in the filenames, since it may cause unexpected problems.
+.br
+An example of this option might be
+\fI\-\-replace-files take_this_file at move_it_here,configure.in.bot.dist at configure.in.bot\fP .
+.SH EXAMPLE
+The following example creates packages of the kolf picture plugin from
+the CVS source tree currently checked out in \fI/sources\fP.
+.PP
+.RS
+\fIexample$\fP cvs2dist /sources/kdegames kolf/objects/picture
+\-n kolf-picture \-v 0.9 \-r "kolf/game.h" \-\-log ~/tmp/extra-file
+.RE
+.PP
+The packages will be named \fIkolf-picture-0.9\fP and
+the process will be logged.  For configure to succeed when a user builds
+these packages, the header \fIkolf/game.h\fP must be installed or an
+error will occur.  The additional file \fI~/tmp/extra-file\fP will be
+included in the packages even though it is not part of the CVS source tree.
+.SH FILES
+.TP
+\fI~/.cvs2distrc\fP
+Any options found in this file will be
+added to the beginning of the command-line arguments.
+.SH SEE ALSO
+.BR cvs (1).
+.PP
+For the latest updates to this script, see the cvs2dist website
+\fIhttp://www.katzbrown.com/shiritsu/programming/cvs2dist/\fP.
+.SH AUTHOR
+cvs2dist was written by Jason Katz-Brown <jason at katzbrown.com>,
+Sebastian Stein <seb.stein at hpfsc.de>, Dominique Devriese <devriese at kde.org>
+and Michael Buesch <mbuesch at freenet.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/kdesdk/debian/man/cvsaskpass.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvsaskpass.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvsaskpass.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,63 @@
+.\"                                      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 CVSASKPASS 1 "March 19, 2005"
+.\" 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
+cvsaskpass \- prompt for a password for the CVS DCOP service
+.SH SYNOPSIS
+.B cvsaskpass
+.RI "[ " generic-options " ]"
+.I prompt
+.SH DESCRIPTION
+This utility displays a dialog box prompting the user for the password to
+a CVS repository, then writes the password to standard output and exits.
+You should not need to run this program directly \- it is designed for
+the internal use of
+.BR cvsservice (1).
+.PP
+The prompt should be of the following form:
+.RS
+.PP
+\fIuser\fP@\fIhost\fP's password:
+.RE
+.PP
+This will allow the dialog box to display the details of the CVS
+repository to the user.
+.PP
+This utility is part of the CVS service provided with Cervisia, which in
+turn is part of the KDE Software Development Kit.
+.SH OPTIONS
+For a full summary of options, run \fIcvsaskpass \-\-help\fP.
+.SH RETURN VALUE
+If a password was succefully obtained, 0 is returned.  If no prompt was
+supplied on the command-line or if the dialog was cancelled, 1 is returned.
+.SH SEE ALSO
+.BR cervisia (1),
+.BR cvsservice (1),
+.BR dcop (1).
+.PP
+Details of how to use the CVS service from within another script or C++
+program can be found in \fI/usr/share/doc/libcvsservice0/DESIGN\fP.
+.SH AUTHOR
+The CVS service was written by Christian Loose <christian.loose at kdemail.net>.
+.br
+Cervisia was written by Bernd Gehrmann <bernd at physik.hu-berlin.de>,
+Christian Loose <christian.loose at kdemail.net>,
+Andre Woebbeking <woebbeking at web.de>,
+Carlos Woelz <carloswoelz at imap-mail.com> 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/kdesdk/debian/man/cvsbackport.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvsbackport.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvsbackport.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 CVSBACKPORT 1 "March 20, 2005"
+.\" 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
+cvsbackport \- backport the last change in HEAD to a branch
+.SH SYNOPSIS
+.B cvsbackport
+\fIfile\fP ...
+.SH DESCRIPTION
+For each file given on the command line,
+\fBcvsbackport\fP will attempt to determine the last change made to
+the file in HEAD and then backport that change to a CVS branch (the
+branch name is hard-coded; see below).
+.PP
+The changes to be backported will be displayed on screen, and you will
+have the chance to confirm or abort before any commits are made.
+.PP
+The files must be checked out from HEAD when you run this utility.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH WARNINGS
+The branch tag is hard-coded into the script (currently it is set to
+KDE_3_4_BRANCH).
+.PP
+If you abort (i.e., you do not make the suggested commits), your files
+will be checked out from the branch (and not from HEAD as they were
+before).
+.SH SEE ALSO
+.BR cvsblame (1),
+.BR cvsforwardport (1),
+.BR cvslastchange (1),
+.BR cvslastlog (1),
+.BR cvsrevertlast (1).
+.SH AUTHOR
+This utility was written by Dirk Mueller and David Faure.
+.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/kdesdk/debian/man/cvscheck.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvscheck.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvscheck.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,107 @@
+.\"                                      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 CVSCHECK 1 "March 26, 2005"
+.\" 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
+cvscheck \- offline status report for files in a checked-out CVS module
+.SH SYNOPSIS
+.B cvscheck
+[ \fB\-u, \-\-unknown\fP ]
+[ \fB\-m, \-\-modified\fP ]
+[ \fB\-\-missing\fP ]
+[ \fB\-t, \-\-tagged\fP ]
+[ \fB\-a, \-\-added\fP ]
+[ \fB\-r, \-\-removed\fP ]
+[ \fB\-c, \-\-conflicts\fP ]
+[ \fB\-l, \-\-local\fP ]
+[ \fIdir\fP ... ]
+.SH DESCRIPTION
+\fBcvscheck\fP prints information about the status of your local CVS
+checkout without communicating with the server.  This means it is
+extremely fast and does not require a network connection.
+.PP
+The given directories and all of their subdirectories will be processed
+recursively (though see the \-\-local option below).
+If no directory is given, the current directory and its
+recursed subdirectories will be used.
+.PP
+Each file with an interesting status will be printed with a status
+character in front of its name.  The status characters are as follows.
+.TP
+? \fIfoobar.c\fP
+The file is not known to CVS.  Maybe you should add it?
+.TP
+M \fIfoobar.c\fP
+The file is for sure locally modified.
+.TP
+m \fIfoobar.c\fP
+The file \fImight\fP have local changes.  You should diff with the
+server to make sure.
+.TP
+C \fIfoobar.c\fP
+The file has a CVS conflict and therefore cannot be committed.
+.TP
+U \fIfoobar.c\fP
+The file is in CVS but is somehow missing in your local checkout.
+.TP
+T \fIfoobar.c\fP
+The file has an unusual sticky CVS tag.
+.TP
+A \fIfoobar.c\fP
+You have "cvs add"ed this file but you have not yet committed.
+.TP
+R \fIfoobar.c\fP
+You have "cvs remove"d this file but you have not yet committed.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+By default cvscheck will display the status for all files in and
+beneath the requested directories.  The following options however can be
+used to display only files with a particular status and/or in a
+particular directory.
+.TP
+\fB\-u, \-\-unknown\fP
+Show only unknown (?) files.
+.TP
+\fB\-m, \-\-modified\fP
+Show only modified (m/M) files.
+.TP
+\fB\-\-missing\fP
+Show only missing (U) files.
+.TP
+\fB\-t, \-\-tagged\fP
+Show only tagged (T) files.
+.TP
+\fB\-a, \-\-added\fP
+Show only added (A) files.
+.TP
+\fB\-r, \-\-removed\fP
+Show only removed (R) files.
+.TP
+\fB\-c, \-\-conflicts\fP
+Show only conflict (C) files.
+.TP
+\fB\-l, \-\-local\fP
+Do not recurse.  That is, process the given directory but none of its
+subdirectories.
+.SH SEE ALSO
+.BR cvs (1).
+.SH AUTHOR
+cvscheck was written by Dirk Mueller <mueller at kde.org> and
+Sirtaj Singh Kang <taj 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/kdesdk/debian/man/cvsforwardport.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvsforwardport.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvsforwardport.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 CVSFORWARDPORT 1 "March 20, 2005"
+.\" 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
+cvsforwardport \- forwardport the last change in a branch to HEAD
+.SH SYNOPSIS
+.B cvsforwardport
+\fIfile\fP ...
+.SH DESCRIPTION
+For each file given on the command line,
+\fBcvsforwardport\fP will attempt to determine the last change made to
+the file in the primary CVS branch and then forwardport that change to HEAD.
+The branch name is hard-coded; see below.
+.PP
+The changes to be forwardported will be displayed on screen, and you will
+have the chance to confirm or abort before any commits are made.
+.PP
+The files must be checked out from the branch when you run this utility.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH WARNINGS
+The branch tag is hard-coded into the script (currently it is set to
+KDE_3_4_BRANCH).
+.PP
+If you abort (i.e., you do not make the suggested commits), your files
+will be checked out from HEAD (and not from the branch as they were
+before).
+.SH SEE ALSO
+.BR cvsbackport (1),
+.BR cvsblame (1),
+.BR cvslastchange (1),
+.BR cvslastlog (1),
+.BR cvsrevertlast (1).
+.SH AUTHOR
+This utility was written by Dirk Mueller and David Faure.
+.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/kdesdk/debian/man/cvslastchange.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvslastchange.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvslastchange.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 CVSLASTCHANGE 1 "March 20, 2005"
+.\" 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
+cvslastchange \- display the last committed changes for a file
+.SH SYNOPSIS
+.B cvslastchange
+\fIfile\fP [ \fIrevision\fP ]
+.br
+.B cvslastchange
+\fBM\fP +\fIdigits\fP -\fIdigits\fP
+.I file revision
+.SH DESCRIPTION
+\fBcvslastchange\fP displays the last changes committed to the CVS
+for the given file.
+It does this by launching '\fIcvs log\fP' and '\fIcvs diff\fP'.
+.PP
+If a revision is passed, the changes committed for that particular revision
+will be displayed.  Otherwise the currently checked out revision will be used.
+.PP
+This tool works with other branches as well as with HEAD.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fBM\fP +\fIdigits\fP -\fIdigits\fP
+These options are currently ignored.
+.SH ENVIRONMENT VARIABLES
+.TP
+CVSLASTCHANGE_KEEP_WHITESPACE
+Define this variable if you do not want the whitespace to be modified
+in any way when displaying changes.  Usually the whitespace is tidied
+up a little before the changes are displayed on screen.
+.br
+This variable is useful if you are using cvslastchange to extract a
+patch that can be applied elsewhere.
+.SH SEE ALSO
+.BR cvsbackport (1),
+.BR cvsblame (1),
+.BR cvsforwardport (1),
+.BR cvslastlog (1),
+.BR cvsrevertlast (1).
+.SH AUTHOR
+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/kdesdk/debian/man/cvslastlog.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvslastlog.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvslastlog.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 CVSLASTLOG 1 "March 20, 2005"
+.\" 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
+cvslastlog \- prints the log of the last commit for a file
+.SH SYNOPSIS
+.B cvslastlog
+.I file
+.SH DESCRIPTION
+\fBcvslastlog\fP shows the log associated with the last CVS commit for the
+given file.
+It depends on the version of the local file, not the one on the server.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH SEE ALSO
+.BR cvsbackport (1),
+.BR cvsblame (1),
+.BR cvsforwardport (1),
+.BR cvslastchange (1),
+.BR cvsrevertlast (1).
+.SH AUTHOR
+cvslastlog was written by David Faure <faure 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/kdesdk/debian/man/cvsrevertlast.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvsrevertlast.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvsrevertlast.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 CVSREVERTLAST 1 "March 20, 2005"
+.\" 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
+cvsrevertlast \- revert files in CVS by one version
+.SH SYNOPSIS
+.B cvsrevertlast
+\fIfile\fP ...
+.SH DESCRIPTION
+\fBcvsrevertlast\fP is used to revert all the files on the command line
+by one version in CVS.  The files will not be committed.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH SEE ALSO
+.BR cvsbackport (1),
+.BR cvsblame (1),
+.BR cvsforwardport (1),
+.BR cvslastchange (1),
+.BR cvslastlog (1).
+.SH AUTHOR
+This utility was written by Charles Samuels <charles 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/kdesdk/debian/man/cvsservice.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cvsservice.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cvsservice.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,79 @@
+.\"                                      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 CVSSERVICE 1 "March 19, 2005"
+.\" 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
+cvsservice \- a DCOP service for accessing CVS repositories
+.SH SYNOPSIS
+.B cvsservice
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+The CVS service is a DCOP service for accessing and working with
+remote CVS repositories.  Applications may link with this library to
+access the DCOP service directly from C++.  Alternatively, scripts may
+access the service using the standard
+.BR dcop (1)
+command-line tool.
+.PP
+DCOP is the Desktop Communication Protocol used throughout KDE.
+.PP
+The CVS DCOP service consists of the following three parts:
+.TP
+\fBCvsService\fP
+The main interface to the functionality of the
+.BR cvs (1)
+command line client.  There is one method for each CVS command, e.g., add,
+checkout, commit, etc.  The methods assemble the command line
+arguments, create a CvsJob and return a DCOPRef object for it
+to the caller.  There is one instance of this service for each
+application instance.
+.TP
+\fBRepository\fP
+This DCOPObject manages the configuration data of the current
+CVS repository.  The data is automatically updated when other
+service instances change it.
+.TP
+\fBCvsJob\fP
+This class represents a CVS job.  You can execute and cancel it,
+and you can retrieve the output of the cvs client by either
+connecting to the proper DCOP signals or by using the output()
+method.  There are two types of jobs.  First the non-concurrent
+job which has to run alone, like cvs update or import.  Second
+the jobs which can run concurrently like cvs log or annotate.
+.PP
+The CVS service is provided with Cervisia, which is part of the KDE
+Software Development Kit.
+.SH OPTIONS
+For a full summary of options, run \fIcvsservice \-\-help\fP.
+.SH SEE ALSO
+.BR cervisia (1),
+.BR cvs (1),
+.BR cvsaskpass (1),
+.BR dcop (1).
+.PP
+Details of how to use the CVS service from within a shell script, a C++
+program or through the JavaScript bindings can be found in
+\fI/usr/share/doc/libcvsservice0/DESIGN\fP.
+.SH AUTHOR
+The CVS service was written by Christian Loose <christian.loose at kdemail.net>.
+.br
+Cervisia was written by Bernd Gehrmann <bernd at physik.hu-berlin.de>,
+Christian Loose <christian.loose at kdemail.net>,
+Andre Woebbeking <woebbeking at web.de>,
+Carlos Woelz <carloswoelz at imap-mail.com> 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/kdesdk/debian/man/cxxmetric.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/cxxmetric.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/cxxmetric.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,34 @@
+.\"                                      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 CXXMETRIC 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
+cxxmetric \- simple source metrics for C and C++
+.SH SYNOPSIS
+.B cxxmetric
+.RI "[ " file " ... ]"
+.SH DESCRIPTION
+\fBcxxmetric\fP counts lines of code, comment and blank space and
+calculates various other statistics for each given source file.
+Source files must be in C or C++.
+.PP
+If no source files are specified then all C/C++ files in or beneath the
+current directory will be used.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH AUTHOR
+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/kdesdk/debian/man/demangle.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/demangle.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/demangle.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,57 @@
+.\"                                      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 DEMANGLE 1 "February 25, 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
+demangle \- undo C++ name mangling for symbols
+.SH SYNOPSIS
+.B demangle
+.SH DESCRIPTION
+\fBDemangle\fP reads a list of C++ mangled symbol names from standard
+input and converts these names to human-readable form on standard
+output.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH EXAMPLE
+Create a file called \fInames\fP containing the following mangled symbol
+names:
+.PP
+.RS
+_ZNK6Object10metaObjectEv
+.br
+_ZN8QPtrListI5ArrowE5clearEv
+.br
+_ZTC4Kolf0_11KMainWindow
+.RE
+.PP
+These names can then be demangled as follows:
+.PP
+.RS
+\fIexample$\fP demangle < names
+.br
+Object::metaObject() const
+.br
+QPtrList<Arrow>::clear()
+.br
+construction vtable for KMainWindow-in-Kolf
+.RE
+.SH SEE ALSO
+.BR kminspector (1),
+.BR kmmatch (1),
+.BR kmtrace (1).
+.SH AUTHOR
+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/kdesdk/debian/man/dprof2calltree.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/dprof2calltree.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/dprof2calltree.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 DPROF2CALLTREE 1 "October 15, 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
+dprof2calltree \- convert perl's DProf profiling data to KCachegrind calltree format
+.SH SYNOPSIS
+.B dprof2calltree
+\fB\-f\fP \fIinput\fP
+[ \fB\-o\fP \fIoutput\fP ]
+.SH DESCRIPTION
+\fBdprof2calltree\fP reads the \fItmon.out\fP profiling data output by
+Perl's Devel::DProf profiling package, and converts it into calltree format
+for use by KCachegrind.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-f\fP \fIinput\fP
+Specifies the DProf \fItmon.out\fP file to convert.
+.TP
+\fB\-o\fP \fIoutput\fP
+Write the calltree output to the given file for use by KCachegrind.
+If omitted, the output will be written to file of the form
+\fIcachgrind.out.<input>\fP.
+.SH EXAMPLE
+If you run a perl script as:
+.PP
+.RS
+perl -d:DProf yourscript.pl
+.RE
+.PP
+then this will write profiling data to \fItmon.out\fP.  You can then
+work with this data in KCachegrind as follows:
+.PP
+.RS
+dprof2calltree -f tmin.out -o cachegrind.out.foo
+.br
+kcachegrind cachegrind.out.foo
+.RE
+.SH SEE ALSO
+.BR kcachegrind (1).
+.SH AUTHOR
+This converter was written by George Schlossnagle <george at omniti.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/kdesdk/debian/man/extend_dmalloc.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/extend_dmalloc.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/extend_dmalloc.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,43 @@
+.\"                                      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 EXTEND_DMALLOC 1 "April 29, 2001"
+.\" 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
+extend_dmalloc \- analyse return-addresses from dmalloc logfiles
+.SH SYNOPSIS
+.B extend_dmalloc
+.I dmalloc-log binary
+.SH DESCRIPTION
+\fBextend_dmalloc\fP will run
+.BR gdb (1)
+to get information on the return-addresses from a
+.BR dmalloc (1)
+logfile.  Specifically it will examine any \fIra=\fP lines and try to
+get the corresponding line numbers.
+.PP
+The argument \fIbinary\fP must be the binary that generated the log
+\fIdmalloc-log\fP.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH NOTES
+You may wish to direct the output from extend_dmalloc to a file, since
+otherwise gdb seems to prompt for a return as if you are at the end of a
+page.
+.SH AUTHOR
+extend_dmalloc was written by Gray Watson <gray.watson at letters.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/kdesdk/debian/man/extractattr.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/extractattr.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/extractattr.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,61 @@
+.\"                                      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 EXTRACTATTR 1 "March 20, 2005"
+.\" 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
+extractattr \- extract element attributes from UI and XML GUI files
+.SH SYNOPSIS
+.B extractattr
+\fB\-\-attr=\fP\fIname\fP
+[ \fB\-\-attr=\fP\fIname\fP ... ]
+[ \fB\-\-context=\fP\fIname\fP ]
+\fIfile\fP ...
+.PP
+.B extractattr \-\-help
+.SH DESCRIPTION
+\fBextractattr\fP finds all of the given element attributes within the
+given files.  It then writes the corresponding \fIi18n()\fP calls to
+standard output (usually redirected to rc.cpp) so that xgettext can parse
+them.  Only the attributes specified by \fB\-\-attr\fP will be extracted.
+.PP
+Both Qt designer (.ui) files and XML GUI (.rc) files are understood.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-\-attr=\fP\fIname\fP
+Specifies an attribute to be extracted.  This option may be used
+multiple times.
+.br
+The \fIname\fP argument must be of the form
+\fIElement\fP,\fIattribute\fP or
+\fIElement\fP,\fIattribute\fP,\fIcontext\fP.
+.br
+The context is optional, and is used in constructing the i18n() calls.
+If specified it will override the default context set by \fB\-\-context\fP.
+.TP
+\fB\-\-context=\fP\fIname\fP
+Give all i18n() calls the given context: i18n("\fIname\fP", ...).
+.TP
+\fB\-\-help\fP
+Display a summary of options.
+.SH EXAMPLE
+extractattr \-\-attr=Title,data \-\-attr=Description,data,Stencils file.ui
+.SH AUTHOR
+This utility was written by Richard Evans <rich at ridas.com> 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/kdesdk/debian/man/extractrc.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/extractrc.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/extractrc.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 EXTRACTRC 1 "March 20, 2005"
+.\" 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
+extractrc \- extract message strings from UI and XML GUI files
+.SH SYNOPSIS
+.B extractrc
+[ \fB\-\-tag\-group=\fP\fIgroup\fP ]
+[ \fB\-\-tag=\fP\fIname\fP ... ]
+[ \fB\-\-context=\fP\fIname\fP ]
+\fIfile\fP ...
+.PP
+.B extractrc \-\-help
+.SH DESCRIPTION
+\fBextractrc\fP finds all text tags and other message strings within the
+given files.  It then writes the corresponding \fIi18n()\fP calls to
+standard output (usually redirected to rc.cpp) so that xgettext can parse
+them.
+.PP
+It understands both Qt designer (.ui) files and XML GUI (.rc) files.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+Note that the old \fB\-\-lines\fP option is deprecated; source line
+numbers are now always included in comments.
+.TP
+\fB\-\-tag\-group=\fP\fIgroup\fP
+Use a predefined group of tags that we are interested in.
+Valid groups are default, koffice and none.
+The default group will be used if this option is omitted.
+.TP
+\fB\-\-tag=\fP\fIname\fP
+Extract also the contents of the tag \fIname\fP.
+This option may be used multiple times
+(e.g., \-\-tag=tag_one \-\-tag=tag_two).
+.TP
+\fB\-\-context=\fP\fIname\fP
+Give all i18n() calls the given context: i18n("\fIname\fP", ...).
+.TP
+\fB\-\-help\fP
+Display a summary of options.
+.SH AUTHOR
+This utility was written by Richard Evans <rich at ridas.com> 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/kdesdk/debian/man/findmissingcrystal.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/findmissingcrystal.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/findmissingcrystal.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 FINDMISSINGCRYSTAL 1 "February 6, 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
+findmissingcrystal \- determine which KDE Crystal icons are the same as
+the KDE Classic hicolor icons
+.SH SYNOPSIS
+.B findmissingcrystal
+.I module
+.SH DESCRIPTION
+\fBfindmissingcrystal\fP is a small utility that runs through the icons
+in the given KDE module and determines which Crystal icons from that
+module are identical to the old KDE Classic hicolor icons.
+.PP
+This script \fBmust\fP be run from the top-level directory of a KDE source
+tree (i.e., the directory containing \fIkdelibs\fP, \fIkdebase\fP, etc.).
+It is assumed that \fImodule\fP is a top-level module in the source tree,
+and it is also assumed that the source tree contains the \fIkdeartwork\fP
+module (which contains the old hicolor icons).
+.PP
+For each Crystal icon in the given module, a message will be output
+describing whether the icon is new (no matching hicolor icon was found),
+different from the hicolor icon or the same as the hicolor icon.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH AUTHOR
+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/kdesdk/debian/man/fixkdeincludes.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/fixkdeincludes.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/fixkdeincludes.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,73 @@
+.\"                                      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 FIXKDEINCLUDES 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
+fixkdeincludes \- reduce the number of #includes in KDE source files
+.SH SYNOPSIS
+.B fixkdeincludes
+[ \fB\-v, \-\-verbose\fP ]
+[ \fB\-e, \-\-experimental\fP ]
+[ \fB\-m, \-\-modify\fP ]
+[ \fIfile\fP ... ]
+.br
+.B fixkdeincludes \-\-help
+.SH DESCRIPTION
+\fBfixkdeincludes\fP tries to reduce the number of #includes in C++ source
+files.  Much of its processing is specific to KDE sources and so it
+might not work so well with sources for non-KDE applications.
+.PP
+The following problems are identified by fixkdeincludes:
+.PP
+.RS
+Including headers that are no longer supported but which exist for
+compatibility with older Qt/KDE versions;
+.PP
+Including the same file multiple times;
+.PP
+Using #include <...> instead of #include "...".
+.RE
+.PP
+There is also an experimental mode which tries removing each #include
+one at a time (with a few exceptions) to see whether the source still
+compiles.  Note that this experimental mode will modify the original sources.
+.PP
+By default the sources will not be modified; the identified problems
+will simply be written to standard output.
+.PP
+The list of C++ sources to examine should be given on the command-line.
+If no files are given, all C++ sources in or beneath the current
+directory will be examined (with the exception of directories whose
+\fIMakefile.am\fP contains \-UQT_NO_COMPAT or \-UKDE_NO_COMPAT).
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-v, \-\-verbose\fP
+Verbose mode.  Additional debugging information is written to standard output.
+.TP
+\fB\-e, \-\-experimental\fP
+Experimental mode, as described above in detail.  Note that this option
+implies \fB\-\-modify\fP.
+.TP
+\fB\-m, \-\-modify\fP
+As well as writing messages to standard output, actually modify the
+original sources to fix any problems that were found.
+.SH AUTHOR
+fixkdeincludes was written by Dirk Mueller <mueller 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/kdesdk/debian/man/fixuifiles.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/fixuifiles.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/fixuifiles.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,63 @@
+.\"                                      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 FIXUIFILES 1 "March 20, 2005"
+.\" 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
+fixuifiles \- remove undesirable features from Qt/KDE .ui files
+.SH SYNOPSIS
+.B fixuifiles
+[ \fB\-v, \-\-verbose\fP ]
+[ \fB\-\-omitqtcheck\fP ]
+[ \fIfile\fP ... ]
+.br
+.B fixuifiles \-\-help
+.SH DESCRIPTION
+\fBfixuifiles\fP processes one or more Qt/KDE user interface definition
+files (.ui files) and tries to remove some of the insanities found
+therein.  If no filenames are given, fixuifiles will process all .ui
+files in or beneath the current directory.
+.PP
+The following problems are fixed:
+.PP
+.RS
+Too high minimum Qt version;
+.PP
+Hardcoded untranslatable Alt+Letter accels (auto-added by Qt Designer);
+.PP
+Captions that are equal to class names (auto-added by Qt Designer).
+.RE
+.PP
+The threshold Qt version can be set
+using either a \fI.qt_minversion\fP file (containing simply the Qt version
+number) or a \fIconfigure.in.in\fP file (containing an appropriate
+MIN_CONFIG macro).  These files may be in the directory containing the .ui
+file or any parent directory.  If no threshold Qt version is found,
+a sensible default will be used.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-v, \-\-verbose\fP
+Verbose mode.  Additional debugging information is written to standard output.
+.TP
+\fB\-\-omitqtcheck\fP
+Do not check the minimum Qt version.
+.SH AUTHOR
+fixuifiles was written by David Faure <faure at kde.org> and
+Dirk Mueller <mueller 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/kdesdk/debian/man/hotshot2calltree.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/hotshot2calltree.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/hotshot2calltree.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,57 @@
+.\"                                      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 HOTSHOT2CALLTREE 1 "October 15, 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
+hotshot2calltree \- convert hotshot profiling data to KCachegrind calltree format
+.SH SYNOPSIS
+.B hotshot2calltree
+[ \fB\-\-file\-limit\fP \fIlimit\fP ]
+\fB\-o\fP \fIoutput\fP \fIinput\fP [ \fIinput\fP ... ]
+.SH DESCRIPTION
+\fBhotshot2calltree\fP reads one or more pstat profiling data files
+as output by the hotshot python profiler, and converts them into
+calltree format for use by KCachegrind.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-o\fP \fIoutput\fP
+Write the calltree output into the given file for use by KCachegrind.
+This may be \fB\-\fP if you wish to write to standard output.
+.TP
+\fIinput\fP ...
+Read the hotshot profiling data from the given file(s).
+.TP
+\fB\-\-file\-limit\fP \fIlimit\fP
+Stop after the given number of input files.
+.SH EXAMPLE
+Suppose that you have used hotshot to profile a python app, with results
+dumped to the file \fIpythongrind.prof\fP.  You may then work with this
+data in KCachegrind as follows.
+.PP
+.RS
+hotshot2cachegrind \-o cachegrind.out.0 pythongrind.prof
+.br
+kcachegrind cachegrind.out.0
+.RE
+.SH SEE ALSO
+.BR kcachegrind (1).
+.SH AUTHOR
+This converter was written by Jorg Beyer <job at webde-ag.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/kdesdk/debian/man/kapptemplate.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kapptemplate.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kapptemplate.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,69 @@
+.\"                                      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 KAPPTEMPLATE 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
+kapptemplate \- creates a framework to develop a KDE application
+.SH SYNOPSIS
+.B kapptemplate
+[ \fB\-\-noinit\fP ] [ \fB\-\-default\fP ]
+.RB "[ " \-\-full\-app " | " \-\-kpart\-app " | " \-\-kpart\-plugin
+.RB " | " \-\-existing " ]"
+.PP
+.B kapptemplate \-\-help
+.SH DESCRIPTION
+\fBKAppTemplate\fP is a shell script that will create the necessary
+framework to develop various KDE applications.  It takes care of the
+autoconf/automake code as well as providing a skeleton and example of
+what the code typically looks like.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.SS General Options
+.TP
+\-\-help
+Display a full summary of options.
+.TP
+\-\-noinit
+Don't run 'make \-f Makefile.cvs'.
+.TP
+\-\-default
+Use default values instead of prompting.
+.SS Framework Types
+.TP
+\-\-full\-app
+Create a full featured KDE application.
+.TP
+\-\-kpart\-app
+Create a full featured KPart application.
+.TP
+\-\-kpart\-plugin
+Create a KPart plugin framework.
+.TP
+\-\-existing
+Converting existing source to an automake/autoconf KDE framework.
+.SH FILES
+.TP
+.I ~/.kapptemplate
+Stores default values.
+.SH SEE ALSO
+The original documentation from the program author
+is available in \fI/usr/share/doc/kapptemplate/\fP.
+.SH AUTHOR
+KAppTemplate was written by Kurt Granroth <granroth 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/kdesdk/debian/man/kbabel.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kbabel.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kbabel.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,74 @@
+.\"                                      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 KBABEL 1 "March 19, 2005"
+.\" 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
+kbabel \- a PO-file editor for KDE
+.SH SYNOPSIS
+.B kbabel
+.RI "[ " generic-options " ]"
+[ \fB\-\-gotomsgid\fP \fImsgid\fP ] [ \fB\-\-nosplash\fP ]
+[ \fB\-\-project\fP \fIconfig-file\fP ]
+.RI "[ " file " ]"
+.SH DESCRIPTION
+\fBKBabel\fP is part of a suite of programs for editing gettext message
+files (PO-files).  It is designed to help you translate fast and
+consistently.
+.PP
+This suite includes KBabel, CatalogManager and KBabelDict.  KBabel (this
+program) is an advanced and easy to use PO-file editor with full navigational
+and editing capabilities, syntax checking and statistics.  CatalogManager is
+a multi functional catalog manager which allows you to keep track of many
+PO-files at once.  KBabelDict is a dictionary to assist with searching
+for common translations.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+Below are the kbabel-specific options.
+For a full summary of options, run \fIkbabel \-\-help\fP.
+.TP
+\fB\-\-gotomsgid\fP \fImsgid\fP
+Go to the entry with the given message ID.
+.TP
+.B \-\-nosplash
+Disable splashscreen at startup.
+.TP
+\fB\-\-project\fP \fIconfig-file\fP
+Load the configuration from the given file.
+.SH SEE ALSO
+.BR catalogmanager (1),
+.BR kbabeldict (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kbabel/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kbabel/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
+.SH AUTHOR
+KBabel was written by Matthias Kiefer <kiefer at kde.org>,
+Wolfram Diestel <wolfram at steloj.de>, Andrea Rizzi <rizzi at kde.org>,
+Stanislav Visnovsky <visnovsky at kde.org>, Marco Wegner <dubbleu at web.de>,
+Asgeir Frimannsson <asgeirf at redhat.com>,
+Dwayne Bailey <dwayne at translate.org.za>,
+Bram Schoenmakers <bramschoenmakers at kde.nl> 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/kdesdk/debian/man/kbabeldict.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kbabeldict.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kbabeldict.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,66 @@
+.\"                                      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 KBABELDICT 1 "March 19, 2005"
+.\" 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
+kbabeldict \- the KBabel dictionary for translators
+.SH SYNOPSIS
+.B kbabeldict
+.RI "[ " generic-options " ]"
+.RB "[ " \-\-nosplash " ]"
+.SH DESCRIPTION
+\fBKBabelDict\fP is part of a suite of programs for editing gettext message
+files (PO-files).  This suite is designed to help you translate fast and
+consistently.
+.PP
+This suite includes KBabel, CatalogManager and KBabelDict.  KBabel is an
+advanced and easy to use PO-file editor with full navigational and editing
+capabilities, syntax checking and statistics.  CatalogManager is a multi
+functional catalog manager which allows you to keep track of many
+PO-files at once.  KBabelDict (this program) is a dictionary to assist
+with searching for common translations.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+Below are the kbabeldict-specific options.
+For a full summary of options, run \fIkbabeldict \-\-help\fP.
+.TP
+.B \-\-nosplash
+Disable splashscreen at startup.
+.SH SEE ALSO
+.BR kbabel (1),
+.BR catalogmanager (1).
+.PP
+Full user documentation for KBabel is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kbabel/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kbabel/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kbabel/\fP.
+.SH AUTHOR
+KBabel was written by Matthias Kiefer <kiefer at kde.org>,
+Wolfram Diestel <wolfram at steloj.de>, Andrea Rizzi <rizzi at kde.org>,
+Stanislav Visnovsky <visnovsky at kde.org>, Marco Wegner <dubbleu at web.de>,
+Asgeir Frimannsson <asgeirf at redhat.com>,
+Dwayne Bailey <dwayne at translate.org.za>,
+Bram Schoenmakers <bramschoenmakers at kde.nl> 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/kdesdk/debian/man/kbugbuster.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kbugbuster.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kbugbuster.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 KBUGBUSTER 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
+kbugbuster \- front end for the KDE bug tracking system
+.SH SYNOPSIS
+.B kbugbuster
+.RI "[ " generic-options " ]"
+[ \fB\-d, \-\-disconnected\fP ]
+[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
+[ \fB\-\-bug\fP \fInumber\fP ]
+.SH DESCRIPTION
+\fBKBugBuster\fP is a GUI front end for the KDE bug tracking system.
+It allows the user to view and manipulate bug reports and provides a
+variety of options for searching through reports.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+Below are the kbugbuster-specific options.
+For a full summary of options, run \fIkbugbuster \-\-help\fP.
+.TP
+[ \fB\-d, \-\-disconnected\fP ]
+Start in disconnected mode.
+.TP
+[ \fB\-\-pkg, \-\-package\fP \fIpkg\fP ]
+Start with the bug list for the given package.
+.TP
+[ \fB\-\-bug\fP \fInumber\fP ]
+Start with the given bug report.
+.SH AUTHOR
+KBugBuster was written by Martijn Klingens <klingens at kde.org>,
+Simon Hausmann <hausmann at kde.org>, Cornelius Schumacher <schumacher at kde.org>
+and David Faure <faure 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/kdesdk/debian/man/kcachegrind.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kcachegrind.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kcachegrind.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,67 @@
+.\"                                      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 KCACHEGRIND 1 "March 25, 2005"
+.\" 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
+kcachegrind \- a visualisation tool for valgrind profiling output
+.SH SYNOPSIS
+.B kcachegrind
+.RI "[ " generic-options " ]"
+[ \fB\-r\fP \fIexec\fP ] [ \fItrace-file\fP ]
+.SH DESCRIPTION
+\fBKCachegrind\fP is a visualisation tool for the profiling data generated
+by \fBcalltree\fP, a profiling skin for \fBvalgrind\fP.  Applications can be
+profiled using calltree without being recompiled, and shared libraries
+and plugin architectures are supported.
+.PP
+For visualising the output from other profiling tools, several converters
+are available.  On Debian systems these can be found in the
+\fIkcachegrind-converters\fP package.
+.PP
+This application is part of the KDE Software Development Kit.
+.SH OPTIONS
+Below are the kcachegrind-specific options.
+For a full summary of options, run \fIkcachegrind \-\-help\fP.
+.TP
+\fB\-r\fP \fIexec\fP
+Run the program \fIexec\fP under cachegrind.
+.TP
+\fItrace-file\fP
+Visualise data from the given trace.
+.SH SEE ALSO
+.BR calltree (1),
+.BR dprof2calltree (1),
+.BR hotshot2calltree (1),
+.BR memprof2calltree (1),
+.BR op2calltree (1),
+.BR pprof2calltree (1),
+.BR valgrind (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kcachegrind/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kcachegrind/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kcachegrind/\fP.
+.SH AUTHOR
+KCachegrind 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/kdesdk/debian/man/kdedoc.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kdedoc.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kdedoc.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 KDEDOC 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
+kdedoc \- view documentation for a KDE class
+.SH SYNOPSIS
+.B kdedoc
+.I classname
+.SH DESCRIPTION
+\fBkdedoc\fP opens the documentation for the KDE class \fIclassname\fP
+in kfm/konqueror.  Note that the class name is case sensitive.  It is
+assumed that you have the kdelibs documentation installed.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH EXAMPLES
+To bring up help on the class KAboutDialog:
+.PP
+.RS
+kdedoc KAboutDialog
+.RE
+.SH DEBIAN USERS
+The kdelibs documentation is in the Debian package \fIkdelibs4-doc\fP,
+which will need to be installed.
+.SH SEE ALSO
+.BR qtdoc (1).
+.SH AUTHOR
+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/kdesdk/debian/man/kdekillall.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kdekillall.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kdekillall.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,36 @@
+.\"                                      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 KDEKILLALL 1 "April 29, 2001"
+.\" 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
+kdekillall \- kills processes started with kdeinit
+.SH SYNOPSIS
+.B kdekillall
+[ \fB\-\fP\fIsignal\fP ] \fIprocess-name\fP
+.SH DESCRIPTION
+\fBkdekillall\fP kills all processes with a particular name
+that were started through kdeinit.  Specifically, it kills all processes
+\fBkdeinit:\fP \fIprocess-name\fP.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-\fP\fIsignal\fP
+Kill the processes with signal \fIsignal\fP.  This option defaults to
+SIGTERM.  Run \fIkill \-l\fP for a list of possible signals.
+.SH AUTHOR
+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/kdesdk/debian/man/kdelnk2desktop.py.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kdelnk2desktop.py.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kdelnk2desktop.py.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 KDELNK2DESKTOP.PY 1 "November 14, 2002"
+.\" 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
+kdelnk2desktop.py \- converts .kdelnk to .desktop
+.SH SYNOPSIS
+.B kdelnk2desktop.py
+.RI "[ " kdelnk-file " ] ..."
+.SH DESCRIPTION
+\fBkdelnk2desktop.py\fP is used to convert
+a \fI.kdelnk\fP file (used by KDE 1) into a \fI.desktop\fP
+file (used by KDE 2 and later).
+.PP
+File \fIkdelnk-file\fP must have a name ending in \fI.kdelnk\fP.
+After kdelnk2desktop.py is run, this will be replaced by a new file
+ending in \fI.desktop\fP.  The original \fIkdelnk-file\fP will be
+removed.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH WARNING
+If \fIkdelnk-file\fP does not end in \fI.kdelnk\fP,
+the results of this script are unpredictable.
+.SH AUTHOR
+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/kdesdk/debian/man/kdemangen.pl.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kdemangen.pl.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kdemangen.pl.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 KDEMANGEN.PL 1 "October 15, 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
+kdemangen.pl \- automatically create a draft manpage for a KDE app
+.SH SYNOPSIS
+.B kdemangen.pl
+.I /path/to/application
+.SH DESCRIPTION
+\fBkdemangen.pl\fP will automatically create a draft manpage for a KDE
+application.  Manpages are always better when hand-tailored, but this
+should give you a fairly good start.
+.PP
+To create the manpage, it will use the \-\-author and \-\-help\-all
+output for the application passed on the command line.
+It will also use the description in the
+Debian control file if one is available.  To make use of this additional
+feature, you must run kdemangen.pl from within the \fIdebian/\fP
+subdirectory of the application sources.
+.PP
+The new manpage will be written to standard output.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH WARNING
+This utility will only work for a full KDE application that uses
+KCmdLineArgs (which most full KDE applications do).
+.SH EXAMPLE
+.RS
+cd /path/to/kde/srcs/kdeedu/debian
+.br
+kdemangen /usr/bin/kstars > kstars.1
+.RE
+.SH AUTHOR
+kdemangen.pl was written by Dominique Devriese <devriese 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/kdesdk/debian/man/kminspector.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kminspector.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kminspector.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 KMINSPECTOR 1 "February 25, 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
+kminspector \- run a program with the KDE memory leak tracer
+.SH SYNOPSIS
+.B kminspector
+\fIprogram\fP [ \fIprogram-args\fP ]
+.SH DESCRIPTION
+\fBKMinspector\fP runs the given program, examines its memory
+allocation behaviour using \fIlibktrace\fP and pipes the resulting
+allocation tree through \fIless\fP.
+.PP
+The given program does not need to be specially compiled.
+.PP
+This utility is provided with KMtrace,
+a KDE tool to assist with malloc debugging using
+glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
+current (9/9/2000) glibc versions only logs the return-address of the
+malloc/free call. The library included with KMtrace
+logs a complete backtrace upon malloc/free.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH SEE ALSO
+.BR demangle (1),
+.BR kmmatch (1),
+.BR kmtrace (1).
+.PP
+Much more extensive documentation for KMtrace can be found in
+\fI/usr/share/doc/kmtrace/README\fP.
+.SH AUTHOR
+KMtrace was written by Waldo Bastian <bastian at kde.org>,
+Mike Haertel <mike at ai.mit.edu> and Andi Kleen <ak at suse.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/kdesdk/debian/man/kmmatch.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kmmatch.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kmmatch.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 KMMATCH 1 "February 26, 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
+kmmatch \- search for symbols in a map file
+.SH SYNOPSIS
+.B kmmatch
+.I map-file call-file
+.SH DESCRIPTION
+\fBKMMatch\fP determines which symbols from a given set (\fIcall-file\fP) are
+present in a given map file.
+.PP
+The \fImap-file\fP should contain output from \fInm\fP (which extracts
+information from object files).  It must \fBnot\fP contain any blank
+lines or header information (such as the name of the object file); this
+means you may need to strip the first few lines of \fInm\fP output from
+the \fImap-file\fP.
+.PP
+The \fIcall-file\fP should contain a list of symbols (such as function
+calls made by a program), one per line.
+.PP
+This utility will find which of the symbols in \fIcall-file\fP are
+present in \fImap-file\fP and write them to standard error, one per
+line, in the order in which they appear in \fIcall-file\fP.
+.PP
+Note that this utility is called \fBmatch\fP in the original KDE
+distribution; it has been renamed to \fBkmmatch\fP in Debian to
+avoid conflicts with unrelated packages.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH SEE ALSO
+.BR demangle (1),
+.BR kminspector (1),
+.BR kmtrace (1),
+.BR nm (1).
+.SH AUTHOR
+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/kdesdk/debian/man/kmtrace.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kmtrace.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kmtrace.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,72 @@
+.\"                                      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 KMTRACE 1 "February 25, 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
+kmtrace \- a KDE memory leak tracer
+.SH SYNOPSIS
+.B kmtrace
+[ \fIgeneric-options\fP ]
+[ \fB\-x, \-\-exclude\fP \fIfile\fP ]
+[ \fB\-e, \-\-exe\fP \fIfile\fP ]
+[ \fB\-t, \-\-tree\fP \fIfile\fP
+[ \fB\-\-th, \-\-treethreshold\fP \fIvalue\fP ]
+[ \fB\-\-td, \-\-treedepth\fP \fIvalue\fP ]]
+[ \fItrace-log\fP ]
+.SH DESCRIPTION
+\fBKMtrace\fP is a KDE tool to assist with malloc debugging using
+glibc's "mtrace" functionality. Unfortunately the mtrace that is part of
+current (9/9/2000) glibc versions only logs the return-address of the
+malloc/free call. The library included with KMtrace
+logs a complete backtrace upon malloc/free.
+.PP
+KMtrace will investigate the trace log specified on the command line,
+or \fIktrace.out\fP if no trace log is specified.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+Below are the kmtrace-specific options.
+For a full summary of options, run \fIkmtrace \-\-help\fP.
+.TP
+\fB\-x, \-\-exclude\fP \fIfile\fP
+File containing symbols to exclude from output.
+.TP
+\fB\-e, \-\-exe\fP \fIfile\fP
+Executable to use for looking up unknown symbols.
+.TP
+\fB\-t, \-\-tree\fP \fIfile\fP
+Write a tree of the allocations to the given file.
+.TP
+\fB\-\-th, \-\-treethreshold\fP \fIvalue\fP
+When writing the allocations tree, hide subtrees allocating less than the
+given memory amount.
+.TP
+\fB\-\-td, \-\-treedepth\fP \fIvalue\fP
+When writing the allocations tree, hide subtrees that are deeper than the
+specified depth.
+.SH SEE ALSO
+.BR demangle (1),
+.BR kminspector (1),
+.BR kmmatch (1).
+.PP
+Much more extensive documentation can be found in
+\fI/usr/share/doc/kmtrace/README\fP.
+.SH AUTHOR
+KMtrace was written by Waldo Bastian <bastian at kde.org>,
+Mike Haertel <mike at ai.mit.edu> and Andi Kleen <ak at suse.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/kdesdk/debian/man/kompare.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kompare.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kompare.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,79 @@
+.\"                                      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 KOMPARE 1 "March 25, 2005"
+.\" 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
+kompare \- a KDE GUI for viewing differences between files
+.SH SYNOPSIS
+.B kompare
+[ \fIgeneric-options\fP ]
+.br
+.B kompare
+[ \fIgeneric-options\fP ] [ \fB\-c\fP ] \fIURL1 URL2\fP
+.br
+.B kompare
+[ \fIgeneric-options\fP ] [ \fB\-o\fP [ \fB\-n\fP ]] \fIdiff\fP
+.br
+.B kompare
+[ \fIgeneric-options\fP ] \fB\-b\fP \fIURL diff\fP
+.SH DESCRIPTION
+\fBKompare\fP is a graphical user interface for viewing the differences
+between two files.  It will also optionally create a diff file.
+.PP
+Depending upon what is passed on the command line, Kompare can compare
+documents, display diff files and blend diff files back into original
+documents.
+.PP
+If an url is given as - then Kompare will read the corresponding file
+from standard input.  Thus (for instance) Kompare can be used as:
+.PP
+.RS
+cvs diff | kompare \-o \-
+.RE
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+Below are the kompare-specific options.
+For a full summary of options, run \fIkompare \-\-help\fP.
+.TP
+\fB\-b\fP \fIURL diff\fP
+Blends \fIdiff\fP into URL.  \fIdiff\fP is expected to be diff output and
+\fIURL\fP the file or folder that the diff output needs to be blended into.
+.TP
+\fB\-c\fP \fIURL1 URL2\fP
+Compares \fIURL1\fP with \fIURL2\fP.  This is the default mode if two
+URLs are passed.
+.TP
+\fB\-n\fP
+Used with \fB\-o\fP to stop Kompare from checking for the original file.
+.TP
+\fB\-o\fP \fIdiff\fP
+Opens the given diff file.  This is the default mode if only one URL is
+passed.
+.br
+Kompare will check to see if it can find
+the original file(s).  If it can, it will blend the original file(s) into
+the diff output and show the result in the viewer.  Passing \fB\-n\fP
+will disable this check.
+.SH SEE ALSO
+The original documentation from the program author
+is available in \fI/usr/share/doc/kompare/\fP.
+.SH AUTHOR
+Kompare was written by John Firebaugh <jfirebaugh at kde.org>,
+Otto Bruggeman <otto.bruggeman at home.nl> 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/kdesdk/debian/man/kuiviewer.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/kuiviewer.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/kuiviewer.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,65 @@
+.\"                                      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 KUIVIEWER 1 "March 25, 2005"
+.\" 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
+kuiviewer \- a viewer for Qt Designer user interface files
+.SH SYNOPSIS
+.B kuiviewer
+.RI "[ " generic-options " ]"
+.RI "[ " ui-file ... " ]"
+.PP
+.B kuiviewer
+.RI "[ " generic-options " ]"
+{ \fB\-s, \-\-takescreenshot\fP \fIfilename\fP }
+[ \fB\-w, \-\-screenshotwidth\fP \fIint\fP ]
+[ \fB\-h, \-\-screenshotheight\fP \fIint\fP ]
+.I ui-file
+.SH DESCRIPTION
+\fBKUIViewer\fP is a utility to display and test the user interface (.ui)
+files generated by \fBQt Designer\fP.  The interfaces can be displayed in a
+variety of different widget styles.
+.PP
+Normally KUIViewer launches a full GUI, allowing the user to interact with
+the given interface.
+By passing the \fB\-\-takescreenshot\fP option, you can make KUIViewer dump a
+screenshot of the interface instead and exit immediately.  Other options
+are available to control precisely how this screenshot is constructed.
+.PP
+This application is part of the KDE Software Development Kit.
+.SH OPTIONS
+Below are the kuiviewer-specific options.
+For a full summary of options, run \fIkuiviewer \-\-help\fP.
+.TP
+\fB\-s, \-\-takescreenshot\fP \fIfilename\fP
+Take a screenshot of the given interface and exit immediately.
+The \fIfilename\fP argument specifies where the screenshot will be saved.
+This screenshot will be saved in PNG format.
+.TP
+\fB\-w, \-\-screenshotwidth\fP \fIint\fP
+Before taking a screenshot, resize the interface to the given width.
+.TP
+\fB\-h, \-\-screenshotheight\fP \fIint\fP
+Before taking a screenshot, resize the interface to the given height.
+.SH SEE ALSO
+.BR designer (1).
+.SH AUTHOR
+KUIViewer was written by Richard Moore <rich at kde.org>,
+Ian Reinhart Geiser <geiseri at kde.org> and
+Benjamin C. Meyer <ben+kuiviewer at meyerhome.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/kdesdk/debian/man/licensecheck.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/licensecheck.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/licensecheck.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,37 @@
+.\"                                      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 LICENSECHECK 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
+licensecheck \- simple license checker for source files
+.SH SYNOPSIS
+.B licensecheck
+.RB "[ " \-v " ]"
+\fIfile\fP ...
+.SH DESCRIPTION
+\fBlicensecheck\fP examines the comments at the beginning of each given
+source file and tries to determine which license the file is placed
+under.  It does this by searching for blocks of text that it recognises
+as belonging to various licenses.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+.B \-v
+Verbose mode.
+.SH AUTHOR
+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/kdesdk/debian/man/makeobj.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/makeobj.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/makeobj.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,66 @@
+.\"                                      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 MAKEOBJ 1 "March 20, 2005"
+.\" 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
+makeobj \- run make from the correct directory
+.SH SYNOPSIS
+.B makeobj
+[ \fImake-argument\fP ... ]
+.SH DESCRIPTION
+\fBmakeobj\fP is a wrapper around \fBmake\fP which basically checks
+whether it's in the source directory or the build directory and changes
+to the correct directory before calling make.
+.PP
+The command-line arguments will (generally) be passed directly to make.
+.PP
+This script is useful if the source directory is different from the
+build directory and the Makefiles are kept in the build directory, as is
+common for instance when building the KDE sources.  This script can however
+be used in more standard scenarios (such as non-KDE projects for which the
+source and build directories are the same), where it will behave just like
+make.
+.PP
+One of the environment variables OBJ_SUBDIR or OBJ_REPLACEMENT
+should be set to indicate where the build directory is in relation to
+the source directory.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH ENVIRONMENT VARIABLES
+Note that only one of OBJ_SUBDIR and OBJ_REPLACEMENT should be used.
+If the build directory is simply a subdirectory of the source directory,
+the simpler variable OBJ_SUBDIR should be used.
+.TP
+OBJ_SUBDIR
+Indicates that the build directory is in the given subdirectory of the
+source directory.  For instance, if the source directory is \fIkdesdk\fP
+and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+should be set to \fIobj-i386-linux\fP.
+.TP
+OBJ_REPLACEMENT
+A \fBsed\fP expression that is used to transform the source directory
+into the build directory.
+For instance, if the source directory is \fI~/src/kdesdk\fP and the
+build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#src/kdesdk#src/kdesdk-obj#\fP.
+.SH SEE ALSO
+.BR make (1),
+.BR sed (1).
+.SH AUTHOR
+makeobj was written by Stephan Kulow <coolo 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/kdesdk/debian/man/memprof2calltree.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/memprof2calltree.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/memprof2calltree.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,36 @@
+.\"                                      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 MEMPROF2CALLTREE 1 "October 15, 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
+memprof2calltree \- convert memprof profiling data to KCachegrind calltree format
+.SH SYNOPSIS
+.B memprof2calltree
+.SH DESCRIPTION
+\fBmemprof2calltree\fP reads the memory profiles of memprof and
+converts them into calltree format for use by KCachegrind.
+.PP
+The memprof data must be supplied on standard input, and the
+corresponding calltree data will be written to standard output.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH SEE ALSO
+.BR kcachegrind (1).
+.SH AUTHOR
+This converter 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/kdesdk/debian/man/op2calltree.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/op2calltree.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/op2calltree.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,43 @@
+.\"                                      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 OP2CALLTREE 1 "October 15, 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
+op2calltree \- convert OProfile profiling data to KCachegrind calltree format
+.SH SYNOPSIS
+.B op2calltree
+.SH DESCRIPTION
+\fBop2calltree\fP reads the profiling data output by OProfile v0.8 and
+converts it into calltree format for use by KCachegrind.
+.PP
+The OProfile data must be supplied on standard input, and should be
+obtained by running:
+.PP
+.RS
+opreport \-gdf
+.RE
+.PP
+This converter will then write a separate calltree data file for each
+application, to a file of the form \fIoprof.out.<app>\fP.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH SEE ALSO
+.BR kcachegrind (1).
+.SH AUTHOR
+This converter 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/kdesdk/debian/man/package_crystalsvg.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/package_crystalsvg.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/package_crystalsvg.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,41 @@
+.\"                                      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 PACKAGE_CRYSTALSVG 1 "October 15, 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
+package_crystalsvg \- bundle up Crystal SVG sources from a KDE checkout
+.SH SYNOPSIS
+.B package_crystalsvg
+.SH DESCRIPTION
+\fBpackage_crystalsvg\fP assumes that the current directory contains one
+or more checked-out KDE modules.  It searches these modules for Crystal
+SVG vector sources (.svgz or .svg.gz files)
+and packages them up into a tarball.  The tarball will also
+contain \fIFILES\fP (describing the contents of the tarball and which
+KDE modules/paths they were copied from) as well as some other bits and
+pieces.
+.PP
+Note that you must at least have kdelibs checked out for this utility to
+run.
+.PP
+The final tarball will be created in the current working directory.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH AUTHOR
+package_crystalsvg was written by Frans Englich <frans.englich at telia.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/kdesdk/debian/man/png2mng.pl.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/png2mng.pl.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/png2mng.pl.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 PNG2MNG.PL 1 "October 15, 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
+png2mng.pl \- combine a set of PNG images into an animated MNG image
+.SH SYNOPSIS
+.B png2mng.pl
+.I basename width height
+.SH DESCRIPTION
+\fBpng2mng.pl\fP reads a sequence of PNG images and combines them into
+a single animated MNG image.
+.PP
+The individual PNG images should be numbered consecutively from zero up,
+and should have names of the form
+.I basenameXXXX
+where
+.I XXXX
+is the four-digit sequence number (0000, 0001, 0002, etc).
+The width and height of the PNG images should
+also be included on the command line.
+.PP
+The final animated MNG image will be written to standard output.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH EXAMPLE
+The following example will combine the files hi32-action-kde-0000.png,
+hi32-action-kde-0001.png, hi32-action-kde-0002.png, etc., and write
+the resulting animated image to hi32-action-kde.mng:
+.PP
+.RS
+png2mng.pl hi32-action-kde- 32 32 > hi32-action-kde.mng
+.RE
+.SH AUTHOR
+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/kdesdk/debian/man/po2xml.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/po2xml.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/po2xml.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,40 @@
+.\"                                      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 PO2XML 1 "March 19, 2005"
+.\" 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
+po2xml \- translates a DocBook XML file using a PO-file
+.SH SYNOPSIS
+.B po2xml
+.I original-XML translated-PO
+.SH DESCRIPTION
+\fBpo2xml\fP is a command-line tool that translates the DocBook
+XML file \fIoriginal-XML\fP using the gettext message file
+\fItranslated-PO\fP.  The resulting translated XML file is sent to standard
+output.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH SEE ALSO
+.BR split2po (1),
+.BR swappo (1),
+.BR transxx (1),
+.BR xml2pot (1).
+.SH AUTHOR
+The PO-XML tools were written by Stephan Kulow <coolo at kde.org> and
+Peter Wells <pete at yamuna.demon.co.uk>.
+.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/kdesdk/debian/man/pprof2calltree.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/pprof2calltree.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/pprof2calltree.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 PPROF2CALLTREE 1 "October 15, 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
+pprof2calltree \- convert APD profiling data to KCachegrind calltree format
+.SH SYNOPSIS
+.B pprof2calltree
+\fB\-f\fP \fIinput\fP
+.SH DESCRIPTION
+\fBpprof2calltree\fP reads the pprof profiling data output by
+APD (http://pecl.php.net/apd/), and converts it into calltree format
+for use by KCachegrind.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-f\fP \fIinput\fP
+Specifies the APD pprof trace file to convert.  This generally has a
+name of the form \fIpprof.XXXXX.Y\fP.  The calltree output for
+KCachegrind will then be written to the file \fIcachegrind.out.XXXXX.Y\fP.
+.SH EXAMPLE
+Suppose you profile a script with APD and obtain the pprof trace file
+\fIpprof.12345.1\fP.  You can then work with this data in KCachegrind as
+follows.
+.PP
+.RS
+pprof2calltree -f pprof.12345.1
+.br
+kcachegrind cachegrind.out.12345.1
+.RE
+.PP
+.SH SEE ALSO
+.BR kcachegrind (1).
+.SH AUTHOR
+This converter was written by George Schlossnagle <george at omniti.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/kdesdk/debian/man/pruneemptydirs.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/pruneemptydirs.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/pruneemptydirs.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,65 @@
+.\"                                      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 PRUNEEMPTYDIRS 1 "September 27, 2002"
+.\" 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
+pruneemptydirs \- detects stale source dirs in a CVS tree
+.SH SYNOPSIS
+.B pruneemptydirs
+[ \fB\-f\fP ]
+.SH DESCRIPTION
+\fBpruneemptydirs\fP is used to clean up a local CVS tree.
+It detects directories containing remnants of old stuff which has been
+removed from the CVS.  Such stale directories often break compilation.
+The current directory and all directories beneath it will be examined.
+.PP
+Note that this tool does not remove anything; it simply prints what to
+do as a series of remove commands.  You can copy and paste these commands,
+or use them with eval in a script.
+.PP
+This tool works better if the source directory is not the same as the
+build directory, since it will not print directories containing old
+executables.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-f\fP
+Actually perform the deletions instead of just printing them out.
+Use this option with care (no warranties, etc.)!
+.SH ENVIRONMENT VARIABLES
+One of the following variables (but not both) should be set if the source
+directory is different from the build directory.
+If the build directory is simply a subdirectory of the source directory,
+the simpler variable OBJ_SUBDIR should be used.
+.TP
+OBJ_SUBDIR
+Indicates that the build directory is in the given subdirectory of the
+source directory.  For instance, if the source directory is \fIkdesdk\fP
+and the build directory is \fIkdesdk/obj-i386-linux\fP, then OBJ_SUBDIR
+should be set to \fIobj-i386-linux\fP.
+.TP
+OBJ_REPLACEMENT
+A \fBsed\fP expression that is used to transform the source directory
+into the build directory.
+For instance, if the source directory is \fI~/src/kdesdk\fP and the
+build directory is \fI~/src/kdesdk-obj\fP, then OBJ_REPLACEMENT could
+be set to \fIs#kdesdk#kdesdk-obj#\fP.
+.SH AUTHOR
+pruneemptydirs was written by David Faure <faure 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/kdesdk/debian/man/qtdoc.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/qtdoc.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/qtdoc.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 QTDOC 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
+qtdoc \- view documentation for a Qt class
+.SH SYNOPSIS
+.B qtdoc
+.RI "[ " classname " ]"
+.SH DESCRIPTION
+\fBqtdoc\fP opens a Qt help page in kfm/konqueror.
+If \fIclassname\fP is given, it opens the help page for that class (note
+that the class name is case insensitive).  Otherwise the main Qt help
+page is opened.  It is assumed that you have the Qt documentation
+installed.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH ENVIRONMENT VARIABLES
+.TP
+QTDIR
+The directory beneath which the Qt documentation is installed.
+Thus the main Qt help page should be in \fI$QTDIR/doc/html/\fP.
+If $QTDIR is not set, \fI/usr/share/qt3\fP will be assumed.
+.SH EXAMPLES
+To bring up help on class QString:
+.PP
+.RS
+qtdoc QString
+.RE
+.SH DEBIAN USERS
+The Qt documentation is in the Debian package \fIqt3-doc\fP, which will
+need to be installed.
+.SH SEE ALSO
+.BR kdedoc (1).
+.SH AUTHOR
+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/kdesdk/debian/man/split2po.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/split2po.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/split2po.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 SPLIT2PO 1 "March 19, 2005"
+.\" 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
+split2po \- creates a PO-file from two DocBook XML files
+.SH SYNOPSIS
+.B split2po
+.I original-XML translated-XML
+.SH DESCRIPTION
+\fBsplit2po\fP is a command-line tool that takes the two given DocBook
+XML files and produces a gettext message file (PO-file) that represents
+the changes between them.  The resulting PO-file is sent to standard
+output.
+.PP
+.I translated-XML
+must be the result of translating
+.I original-XML
+into another language.  It is this translation that the resulting
+PO-file will represent.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH ENVIRONMENT VARIABLES
+.TP
+NO_CREDITS
+If set, the "ROLES_OF_TRANSLATORS" and "CREDIT_FOR_TRANSLATORS" messages
+will be omitted.  By default these are always included at the end of
+the PO-file, with empty message strings.
+.br
+These messages are used with KDE documentation, so you may wish to set
+NO_CREDITS if you are working with some other type of non-KDE documentation.
+.TP
+REPORT_MISMATCHES
+Set this variable to "no" if you wish mismatch reporting to be
+suppressed.  By default, any apparent mismatches between the two XML
+files will be noted on standard error.
+.SH SEE ALSO
+.BR po2xml (1),
+.BR swappo (1),
+.BR transxx (1),
+.BR xml2pot (1).
+.SH AUTHOR
+The PO-XML tools were written by Stephan Kulow <coolo at kde.org> and
+Peter Wells <pete at yamuna.demon.co.uk>.
+.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/kdesdk/debian/man/swappo.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/swappo.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/swappo.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 SWAPPO 1 "March 19, 2005"
+.\" 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
+swappo \- swap msgid and msgstr fields in a PO-file
+.SH SYNOPSIS
+.B swappo
+.I PO-file
+.SH DESCRIPTION
+\fBswappo\fP reads the given PO-file and swaps the \fImsgid\fP and
+\fImsgstr\fP fields for every message.  The result is a new PO-file that
+translates in the opposite direction.  For example, if \fIPO-file\fP
+translates from English to French, the new PO-file will translate from
+French to English.
+.PP
+The new PO-file will be written to standard output.  The old PO-file
+will remain untouched.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH SEE ALSO
+.BR po2xml (1),
+.BR split2po (1),
+.BR transxx (1),
+.BR xml2pot (1).
+.SH AUTHOR
+The PO-XML tools were written by Stephan Kulow <coolo at kde.org> and
+Peter Wells <pete at yamuna.demon.co.uk>.
+.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/kdesdk/debian/man/testkspy.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/testkspy.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/testkspy.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,46 @@
+.\"                                      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 TESTKSPY 1 "May 3, 2001"
+.\" 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
+testkspy \- show off KSpy's capabilities
+.SH SYNOPSIS
+.B testkspy
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBtestkspy\fP is a small application that shows off KSpy's capabilities.
+It simply uses KSpy to spy on itself.
+.PP
+\fBKSpy\fP is a tiny library which can be used to graphically display
+the QObjects in use by a Qt/KDE app.  In addition to the object tree,
+you can also view the properties, signals and slots of any QObject.
+.PP
+Basically it provides much the same info as QObject::dumpObjectTree() and
+QObject::dumpObjectInfo(), but in a much more convenient form.  KSpy has
+minimal overhead for the application, because the kspy library is
+loaded dynamically using KLibLoader.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+For a full summary of options, run \fItestkspy \-\-help\fP.
+.SH SEE ALSO
+Instructions on using KSpy with your own applications can be found in
+\fI/usr/share/doc/kspy/README\fP.
+.SH AUTHOR
+KSpy was written by Richard Moore <rich 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/kdesdk/debian/man/transxx.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/transxx.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/transxx.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,47 @@
+.\"                                      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 TRANSXX 1 "March 19, 2005"
+.\" 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
+transxx \- create a basic fleshed-out PO-file from a PO-template file
+.SH SYNOPSIS
+.B transxx
+[ \fB\-\-text\fP \fItranslation\fP ]
+.I template
+.SH DESCRIPTION
+\fBtransxx\fP is a command-line tool that produces a basic fleshed-out
+PO-file from a PO-template file.  Some of the formatting and
+structure of the \fImsgid\fP strings will be copied to the \fImsgstr\fP
+strings, but otherwise text will be translated to "xx".
+.PP
+The fleshed-out PO-file is sent to standard output.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH OPTIONS
+.TP
+\fB\-\-text\fP \fItranslation\fP
+Use the given translation everywhere instead of "xx".
+.SH SEE ALSO
+.BR po2xml (1),
+.BR split2po (1),
+.BR swappo (1),
+.BR xml2pot (1).
+.SH AUTHOR
+The PO-XML tools were written by Stephan Kulow <coolo at kde.org> and
+Peter Wells <pete at yamuna.demon.co.uk>.
+.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/kdesdk/debian/man/umbrello.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/umbrello.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/umbrello.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 UMBRELLO 1 "March 19, 2005"
+.\" 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
+umbrello \- a UML modelling tool and code generator
+.SH SYNOPSIS
+.B umbrello
+.RI "[ " generic-options " ]"
+[ \fIfile\fP ]
+.SH DESCRIPTION
+\fBUmbrello UML Modeller\fP is a Unified Modelling Language editor for KDE.
+With UML you can create diagrams of software and other systems in an
+industry standard format.  Umbrello can also generate code from your
+UML diagrams in a number of programming languages.
+.PP
+The program supports class diagrams, sequence diagrams, collaboration
+diagrams, use case diagrams, state diagrams, activity diagrams, component
+diagrams and deployment diagrams.
+.PP
+This application is part of the KDE Software Development Kit.
+.SH OPTIONS
+For a full summary of options, run \fIumbrello \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/umbrello/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/umbrello/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdesdk-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/umbrello/\fP.
+.SH AUTHOR
+Umbrello was written by Paul Hensgen <phensgen at users.sourceforge.net> and
+many 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/kdesdk/debian/man/xml2pot.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/xml2pot.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/xml2pot.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,45 @@
+.\"                                      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 XML2POT 1 "March 19, 2005"
+.\" 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
+xml2pot \- creates a PO-template file from a DocBook XML file
+.SH SYNOPSIS
+.B xml2pot
+.I original-XML
+.SH DESCRIPTION
+\fBxml2pot\fP is a command-line tool that produces a gettext message
+template file from the DocBook XML file \fIoriginal-XML\fP.
+The template file is sent to standard output.
+.PP
+The resulting template file can be used to create gettext message files
+(PO-files) for a variety of languages.  These can then be used in conjunction
+with
+.BR po2xml (1)
+to translate the original XML file into these other languages.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH SEE ALSO
+.BR po2xml (1),
+.BR split2po (1),
+.BR swappo (1),
+.BR transxx (1).
+.SH AUTHOR
+The PO-XML tools were written by Stephan Kulow <coolo at kde.org> and
+Peter Wells <pete at yamuna.demon.co.uk>.
+.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/kdesdk/debian/man/zonetab2pot.py.1
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/man/zonetab2pot.py.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/man/zonetab2pot.py.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 ZONETAB2POT.PY 1 "November 14, 2002"
+.\" 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
+zonetab2pot.py \- converts a timezone list to a PO-file template
+.SH SYNOPSIS
+.B zonetab2pot.py
+[ \fItimezone-list\fP ]
+.SH DESCRIPTION
+\fBzonetab2pot.py\fP reads the timezone list given on the command-line
+and converts it to a gettext message file (PO-file) template containing
+the names of the individual timezones.
+.PP
+The given timezone list should be in the same format as the system
+\fIzone.tab\fP.  If no timezone list is specified on the command-line,
+\fI/usr/share/zoneinfo/zone.tab\fP will be used.
+.PP
+The new PO-file template will be written to standard output.
+.PP
+This utility is part of the KDE Software Development Kit.
+.SH AUTHOR
+zonetab2pot.py was written by Lukas Tinkl <lukas 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/kdesdk/debian/patches/02_env.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/02_env.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/patches/02_env.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,40 @@
+--- kde.orig/scripts/create_makefile
++++ kde.patched/scripts/create_makefile
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/bash
+ 
+ # Create Makefile.in and Makefile in a directory (containing a Makefile.am !)
+ # Saves time compared to re-running configure completely
+--- kde.orig/scripts/kdelnk2desktop.py
++++ kde.patched/scripts/kdelnk2desktop.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ 
+ import os, sys, string
+ 
+--- kde.orig/scripts/zonetab2pot.py
++++ kde.patched/scripts/zonetab2pot.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ '''This script reads timezone list as its first argument
+ or from /usr/share/zoneinfo/zone.tab, and converts it
+ to a PO file template.
+--- kde.orig/kcachegrind/converters/hotshot2calltree
++++ kde.patched/kcachegrind/converters/hotshot2calltree
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ # _*_ coding: latin1 _*_
+ 
+ #
+--- kde.orig/kcachegrind/converters/pprof2calltree
++++ kde.patched/kcachegrind/converters/pprof2calltree
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions are met:
+ #

Added: people/jriddell/KDE/3.5/kdesdk/debian/patches/03_kde-buildrc.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/03_kde-buildrc.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/patches/03_kde-buildrc.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+--- kde.orig/scripts/kde-build
++++ kde.patched/scripts/kde-build
+@@ -881,6 +881,9 @@ The following error codes are returned b
+ 
+         cd ~/scripts/; vi ./kde-buildrc; ./kde-build
+ 
++On Debian systems, an example F<kde-buildrc> can be found in
++the directory /usr/share/doc/kdesdk-scripts/.
++
+ =head1 BUGS
+ 
+ Probably.

Added: people/jriddell/KDE/3.5/kdesdk/debian/patches/04_kmtrace.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/04_kmtrace.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/patches/04_kmtrace.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+--- kde.orig/kmtrace/Makefile.am
++++ kde.patched/kmtrace/Makefile.am
+@@ -33,13 +33,15 @@ kmmatch_LDFLAGS = $(all_libraries)
+ 
+ bin_SCRIPTS = kminspector
+ 
+-lib_LIBRARIES = libktrace_s.a
++kmtracelibdir = $(libdir)/kmtrace
++
++kmtracelib_LIBRARIES = libktrace_s.a
+ libktrace_s_a_SOURCES = ktrace_s.c
+ 
+ ktrace_s.c: $(srcdir)/ktrace.c
+ 	$(LN_S) $(srcdir)/ktrace.c $@
+ 
+-lib_LTLIBRARIES = libktrace.la
++kmtracelib_LTLIBRARIES = libktrace.la
+ libktrace_la_LDFLAGS = -avoid-version
+ libktrace_la_SOURCES = ksotrace.cpp ktrace.c
+ libktrace_la_LIBADD = $(LIBDL)
+--- kde.orig/kmtrace/README
++++ kde.patched/kmtrace/README
+@@ -23,7 +23,7 @@ friends.
+ 
+ You can activate malloc logging by starting yourApplication as:
+ 
+-	MALLOC_TRACE=/tmp/ktrace.out LD_PRELOAD=$KDEDIR/lib/libktrace.so yourApplication
++	MALLOC_TRACE=/tmp/ktrace.out LD_PRELOAD=/usr/lib/kmtrace/libktrace.so yourApplication
+ 
+ 2) The manual way
+ 
+@@ -37,7 +37,7 @@ Add as first statement in main():
+ 
+ Add ktrace_s.a to the LDADD line in your Makefile.am like:
+ 
+-	kicker_LDADD = kicker.la /opt/kde/lib/libktrace_s.a
++	kicker_LDADD = kicker.la /usr/lib/kmtrace/libktrace_s.a
+ 
+ Note that the static library is used.
+ You can now activate malloc logging by starting yourApplication as:
+--- kde.orig/kmtrace/kminspector.in
++++ kde.patched/kmtrace/kminspector.in
+@@ -2,7 +2,7 @@
+ 
+ export MALLOC_TREE=kminspector.tree
+ export MALLOC_THRESHOLD=2000
+-export LD_PRELOAD=@kde_libraries@/libktrace.so
++export LD_PRELOAD=@kde_libraries@/kmtrace/libktrace.so
+ 
+ $*
+ 

Added: people/jriddell/KDE/3.5/kdesdk/debian/patches/05_paths.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/05_paths.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/patches/05_paths.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,53 @@
+--- kde.orig/scripts/kde-devel-gdb
++++ kde.patched/scripts/kde-devel-gdb
+@@ -1,6 +1,6 @@
+ # This file defines handy gdb macros for printing out Qt types
+ # To use it, add this line to your ~/.gdbinit :
+-# source /path/to/kde/sources/kdesdk/scripts/kde-devel-gdb
++# source /usr/share/kdesdk-scripts/kde-devel-gdb
+ 
+ # Please don't use tabs in this file. When pasting a
+ # macro definition to gdb, tabs are interpreted as completion.
+--- kde.orig/scripts/kde-devel-vim.vim
++++ kde.patched/scripts/kde-devel-vim.vim
+@@ -1,5 +1,5 @@
+ " To use this file, add this line to your ~/.vimrc:, w/o the dquote
+-" source /path/to/kde/sources/kdesdk/scripts/kde-devel-vim.vim
++" source /usr/share/kdesdk-scripts/kde-devel-vim.vim
+ "
+ " For CreateChangeLogEntry() : If you don't want to re-enter your
+ " Name/Email in each vim session then make sure to have the viminfo
+--- kde.orig/scripts/kde-emacs/kde-emacs.el
++++ kde.patched/scripts/kde-emacs/kde-emacs.el
+@@ -21,7 +21,7 @@
+ ;;; Installation:
+ ;;
+ ;; Put the following lines in your ".emacs":
+-;; (add-to-list 'load-path "~/path-to-kde-emacs")
++;; (add-to-list 'load-path "/usr/share/emacs/site-lisp/kdesdk-scripts")
+ ;; (require 'kde-emacs)
+ ;; 
+ ;; I also strongly recommend to add the following two lines to 
+--- kde.orig/scripts/qtdoc
++++ kde.patched/scripts/qtdoc
+@@ -1,4 +1,9 @@
+ #!/bin/sh
++
++if [ -z "$QTDIR" ]; then
++  QTDIR=/usr/share/qt3
++fi
++
+ # Run from command line, to open a qt help page in kfm/konqueror
+ # No argument => main page
+ # Classname (case insensitive) => page for this class
+--- kde.orig/scripts/kdedoc
++++ kde.patched/scripts/kdedoc
+@@ -6,7 +6,7 @@
+ # You can edit this line to set the directory holding your KDE docs, or you
+ # can use the environment variable KDEDOCS to avoid future conflicts with this
+ # file if the default changes.
+-KDEDOCS=${KDEDOCS:-"$KDEDIR/share/doc/HTML/en/kdelibs-apidocs"}
++KDEDOCS=${KDEDOCS:-"/usr/share/doc/kde/HTML/en/kdelibs-apidocs"}
+ 
+ if [ $# = 1 ]; then
+   if [ -e "$KDEDOCS/doxygen.css" ]; then

Added: people/jriddell/KDE/3.5/kdesdk/debian/patches/06_pod2man.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/06_pod2man.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/patches/06_pod2man.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+--- kde.orig/scripts/Makefile.am
++++ kde.patched/scripts/Makefile.am
+@@ -41,17 +41,19 @@
+ #%.1: %
+ #	pod2man $< $@
+ 
++pod2man_options = "--center=K Desktop Environment (SDK)" "--release=KDE 3.5"
++
+ kde-build.1: kde-build
+-	pod2man $(srcdir)/kde-build > $@
++	pod2man $(pod2man_options) $< > $@
+ kdesvn-build.1: kdesvn-build
+-	pod2man $(srcdir)/kdesvn-build > $@
++	pod2man $(pod2man_options) $< > $@
+ cvsversion.1: cvsversion
+-	pod2man $(srcdir)/cvsversion > $@
++	pod2man $(pod2man_options) $< > $@
+ cvscheck.1: cvscheck
+-	pod2man $(srcdir)/cvscheck > $@
++	pod2man $(pod2man_options) $< > $@
+ noncvslist.1: noncvslist
+-	pod2man $(srcdir)/noncvslist > $@
++	pod2man $(pod2man_options) $< > $@
+ cvsblame.1: cvsblame
+-	pod2man $(srcdir)/cvsblame > $@
++	pod2man $(pod2man_options) $< > $@
+ includemocs.1: includemocs
+-	pod2man $(srcdir)/includemocs > $@
++	pod2man $(pod2man_options) $< > $@

Added: people/jriddell/KDE/3.5/kdesdk/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/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/kdesdk/debian/poxml.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/poxml.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/poxml.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,39 @@
+PO/XML tools for Debian
+-----------------------
+
+Overview:
+
+  This package contains several tools for working with PO-files and
+  DocBook XML files.
+
+  Binaries included are:
+
+    po2xml:   translates a DocBook XML file using a PO-file
+    split2po: creates a PO-file from two DocBook XML files
+    swappo:   swaps msgid and msgstr fields in a PO-file
+    transxx:  creates a basic fleshed-out PO-file from a PO-template file
+    xml2pot:  creates a PO-template file from a DocBook XML file
+
+  Please see the relevant manpages for further information on each tool.
+
+Warning:
+
+  The PO/XML tools are fussy about system identifiers (unlike some other
+  XML processing tools).  When writing DocBook XML files, if a DTD is
+  declared then a system identifier must be included also.
+
+  Thus (for example) the following declaration is invalid, and will cause
+  the PO/XML tools to break:
+
+    <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+
+  On the other hand, both of the following declarations are acceptable:
+
+    <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+        "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd">
+    <!DOCTYPE article>
+
+  See "DocBook: The Definitive Guide" (in the docbook-defguide package)
+  for further information.
+
+ -- Ben Burton <bab at debian.org>, Thu, 24 Mar 2005 07:59:47 +1100

Added: people/jriddell/KDE/3.5/kdesdk/debian/poxml.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/poxml.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/poxml.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+debian/tmp/usr/bin/po2xml
+debian/tmp/usr/bin/split2po
+debian/tmp/usr/bin/swappo
+debian/tmp/usr/bin/transxx
+debian/tmp/usr/bin/xml2pot

Added: people/jriddell/KDE/3.5/kdesdk/debian/poxml.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/poxml.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/poxml.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+debian/man/po2xml.1
+debian/man/split2po.1
+debian/man/swappo.1
+debian/man/transxx.1
+debian/man/xml2pot.1

Added: people/jriddell/KDE/3.5/kdesdk/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,68 @@
+#!/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_DH_STRIP_ARGS := --dbg-package=kdesdk-dbg
+
+PACKAGES_WITH_LIBS := kbabel kompare kspy kunittest libcvsservice0
+
+DEB_DH_MAKESHLIBS_ARGS_kbabel			:= -V'kbabel (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_kompare			:= -V'kompare (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_kspy			:= -V'kspy (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_kunittest		:= -V'kunittest (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_libcvsservice0		:= -V'libcvsservice0 (>= 4:3.5.0-1)'
+
+#shlibs_ver = 4:3.5.0-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_INSTALL_CHANGELOGS_cervisia := cervisia/ChangeLog
+DEB_INSTALL_CHANGELOGS_kapptemplate := kapptemplate/ChangeLog
+DEB_INSTALL_CHANGELOGS_kbabel := kbabel/ChangeLog
+DEB_INSTALL_CHANGELOGS_kcachegrind := kcachegrind/ChangeLog
+DEB_INSTALL_CHANGELOGS_kompare := kompare/ChangeLog
+DEB_INSTALL_CHANGELOGS_umbrello := umbrello/ChangeLog
+
+binary-install/kdesdk-scripts::
+	mv -f debian/kdesdk-scripts/usr/share/man/pl/man1/kdemangen.1 \
+		debian/kdesdk-scripts/usr/share/man/man1/kdemangen.pl.1; \
+	mv -f debian/kdesdk-scripts/usr/share/man/pl/man1/png2mng.1 \
+		debian/kdesdk-scripts/usr/share/man/man1/png2mng.pl.1; \
+	mv -f debian/kdesdk-scripts/usr/share/man/py/man1/kdelnk2desktop.1 \
+		debian/kdesdk-scripts/usr/share/man/man1/kdelnk2desktop.py.1; \
+	mv -f debian/kdesdk-scripts/usr/share/man/py/man1/zonetab2pot.1 \
+		debian/kdesdk-scripts/usr/share/man/man1/zonetab2pot.py.1; \
+	mv -f debian/kdesdk-scripts/usr/share/man/sh/man1/build-progress.1 \
+		debian/kdesdk-scripts/usr/share/man/man1/build-progress.sh.1; \
+	rm -rf debian/kdesdk-scripts/usr/share/man/pl; \
+	rm -rf debian/kdesdk-scripts/usr/share/man/py; \
+	rm -rf debian/kdesdk-scripts/usr/share/man/sh; \
+	install -p -D -m644 scripts/kde-buildrc \
+		debian/kdesdk-scripts/usr/share/doc/kdesdk-scripts/kde-buildrc.example
+
+binary-install/kdesdk-misc::
+	install -p -D -m644 kdeaccounts-plugin/README \
+		debian/kdesdk-misc/usr/share/doc/kdesdk-misc/README.kdeaccounts-plugin
+	install -p -D -m644 kioslave/svn/AUTHORS \
+		debian/kdesdk-misc/usr/share/doc/kdesdk-misc/AUTHORS.kioslave-svn
+	install -p -D -m644 kioslave/svn/README \
+		debian/kdesdk-misc/usr/share/doc/kdesdk-misc/README.kioslave-svn
+	install -p -D -m644 kprofilemethod/README \
+		debian/kdesdk-misc/usr/share/doc/kdesdk-misc/README.kprofilemethod
+	install -p -D -m644 scheck/README \
+		debian/kdesdk-misc/usr/share/doc/kdesdk-misc/README.scheck


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

Added: people/jriddell/KDE/3.5/kdesdk/debian/umbrello.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/umbrello.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/umbrello.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+Umbrello for Debian
+-------------------
+
+This application 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 kdesdk-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 31 Jan 2004 12:08:48 +1100

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/umbrello.install
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/umbrello.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/umbrello.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,46 @@
+debian/tmp/usr/bin/umbrello
+debian/tmp/usr/share/applications/kde/umbrello.desktop
+debian/tmp/usr/share/apps/umbrello/tips
+debian/tmp/usr/share/apps/umbrello/umbrelloui.rc
+debian/tmp/usr/share/apps/umbrello/headings/heading.adb
+debian/tmp/usr/share/apps/umbrello/headings/heading.ads
+debian/tmp/usr/share/apps/umbrello/headings/heading.as
+debian/tmp/usr/share/apps/umbrello/headings/heading.cpp
+debian/tmp/usr/share/apps/umbrello/headings/heading.cs
+debian/tmp/usr/share/apps/umbrello/headings/heading.h
+debian/tmp/usr/share/apps/umbrello/headings/heading.idl
+debian/tmp/usr/share/apps/umbrello/headings/heading.java
+debian/tmp/usr/share/apps/umbrello/headings/heading.js
+debian/tmp/usr/share/apps/umbrello/headings/heading.php
+debian/tmp/usr/share/apps/umbrello/headings/heading.pm
+debian/tmp/usr/share/apps/umbrello/headings/heading.py
+debian/tmp/usr/share/apps/umbrello/headings/heading.rb
+debian/tmp/usr/share/apps/umbrello/headings/heading.sql
+debian/tmp/usr/share/apps/umbrello/headings/heading.xsd
+debian/tmp/usr/share/apps/umbrello/pics
+debian/tmp/usr/share/doc/kde/HTML/en/umbrello/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/umbrello/common
+debian/tmp/usr/share/doc/kde/HTML/en/umbrello/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/umbrello/*.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/umbrello_*.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/umbrello.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/umbrello_*.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/umbrello.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/umbrellofile.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/umbrello.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/umbrellofile.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/umbrello.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/umbrellofile.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/umbrello.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/umbrellofile.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/umbrello.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/umbrellofile.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/umbrello.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz
+debian/tmp/usr/share/icons/hicolor/16x16/apps/umbrello.png
+debian/tmp/usr/share/icons/hicolor/16x16/mimetypes/umbrellofile.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/umbrello.png
+debian/tmp/usr/share/icons/hicolor/32x32/mimetypes/umbrellofile.png
+debian/tmp/usr/share/mimelnk/application/x-umbrello.desktop
+debian/icons/umbrello.xpm /usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdesdk/debian/umbrello.menu
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/umbrello.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/umbrello.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(umbrello):\
+  needs="x11"\
+  section="Apps/Programming"\
+  hints="KDE"\
+  title="Umbrello"\
+  longtitle="Umbrello (UML Modeller)"\
+  icon="/usr/share/pixmaps/umbrello.xpm"\
+  command="/usr/bin/umbrello"
+

Added: people/jriddell/KDE/3.5/kdesdk/debian/umbrello.override
===================================================================
--- people/jriddell/KDE/3.5/kdesdk/debian/umbrello.override	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdesdk/debian/umbrello.override	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,2 @@
+# this is not a script but a template, so it should not be executable
+umbrello: script-not-executable ./usr/share/apps/umbrello/headings/heading.py

Added: people/jriddell/KDE/3.5/kdetoys/debian/amor.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/amor.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/amor.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+AMOR for Debian
+---------------
+
+This application 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 kdetoys-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/amor.install
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/amor.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/amor.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+debian/tmp/usr/bin/amor
+debian/tmp/usr/include/kde/AmorIface.h
+debian/tmp/usr/share/apps/amor
+debian/tmp/usr/share/applications/kde/amor.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/amor/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/amor/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/amor/*.png
+debian/tmp/usr/share/doc/kde/HTML/en/amor/common
+debian/tmp/usr/share/icons/hicolor/16x16/apps/amor.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/amor.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/amor.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/amor.png
+
+debian/icons/amor.xpm	usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/amor.menu
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/amor.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/amor.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(amor):\
+	needs="x11"\
+	section="Games/Toys"\
+	hints="KDE"\
+	title="AMOR"\
+	longtitle="AMOR (Amusing Misuse of Resources)"\
+	icon="/usr/share/pixmaps/amor.xpm"\
+	command="/usr/bin/amor"
+

Added: people/jriddell/KDE/3.5/kdetoys/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,670 @@
+kdetoys (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
+
+kdetoys (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:29:12 +0000
+
+kdetoys (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+
+  * Ensure patches are not applies before upload
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 26 Nov 2005 16:38:57 +0000
+
+kdetoys (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Generate .pot files
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 22 Nov 2005 15:23:19 +0000
+
+kdetoys (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun, 13 Nov 2005 16:02:53 +0000
+
+kdetoys (4:3.5-rc1-1) alioth; urgency=low
+
+  * New upstream pre-release.
+
+  +++ Changes by Christopher Martin:
+
+  * Change doc-base section for all documentation to Games/Toys.
+    (Closes: #335068)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 11 Nov 2005 21:23:46 -0400
+
+kdetoys (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:12:55 -0400
+
+kdetoys (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Luk Claes:
+  
+  * Build with g++-3.4 on arm, m68k and hppa; kdetoys triggers the same gcc 4.0
+    ICE as arts does.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri,  2 Sep 2005 20:18:02 +0200
+
+kdetoys (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Luk Claes:
+
+  * Added me to uploaders
+  
+  * Updated FSF's address
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  1 Sep 2005 16:40:50 +0200
+
+kdetoys (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
+
+kdetoys (4:3.4.3-0ubuntu2) breezy; urgency=low
+
+  * Do not try to install missing man pages
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun,  9 Oct 2005 17:28:15 +0100
+
+kdetoys (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build with GCC 3.4 on hppa etc
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  7 Oct 2005 20:03:45 +0000
+
+kdetoys (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:25:41 +0000
+
+kdetoys (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 00:58:08 +0000
+
+kdetoys (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 26 May 2005 13:05:48 +0000
+
+kdetoys (4:3.4.0-0pre1) alioth; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Converted packaging to CDBS.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat,  5 Mar 2005 22:58:44 -0500 
+
+kdetoys (4:3.3.2-3) unstable; urgency=low
+
+  * Added the full text of the GFDL to debian/copyright, since all of the
+    docbook documentation is under this license.
+
+ -- Ben Burton <bab at debian.org>  Fri, 25 Mar 2005 19:07:39 +1100
+
+kdetoys (4:3.3.2-2) unstable; urgency=medium
+
+  * Changed kteatime to depend on kicker instead of just recommending it.
+  * Made it clearer that kteatime is a KDE systray applet that will probably
+    not work under non-KDE window managers / desktop environments.  This is
+    now explained in both the long package description and kteatime's
+    README.Debian.
+
+ -- Ben Burton <bab at debian.org>  Sun,  6 Feb 2005 17:51:59 +1100
+
+kdetoys (4:3.3.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab at debian.org>  Mon, 17 Jan 2005 08:53:18 +1100
+
+kdetoys (4:3.3.1-2) unstable; urgency=medium
+
+  * Build-conflicts with autoconf2.13, which does not play well with
+    Makefile.common (closes: #277629).
+
+ -- Ben Burton <bab at debian.org>  Thu, 28 Oct 2004 19:03:02 +1000
+
+kdetoys (4:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * KWorldClock applet unbroken (closes: #276891).  This required a further
+    update from BRANCH (mapwidget.cpp), since the fix was made after 3.3.1.
+
+ -- Ben Burton <bab at debian.org>  Thu, 21 Oct 2004 09:23:15 +1000
+
+kdetoys (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed incorrect kweather sunset time (closes: #243840).
+  * Mention in the docs that kworldclock can be used as a desktop background.
+
+ -- Ben Burton <bab at debian.org>  Sat, 16 Oct 2004 14:09:26 +1000
+
+kdetoys (4:3.2.3-3) unstable; urgency=low
+
+  * Patched kweather so that the correct timezone is used for "last updated"
+    when the network is down (closes: #254159).
+
+ -- Ben Burton <bab at debian.org>  Tue,  6 Jul 2004 22:54:39 +1000
+
+kdetoys (4:3.2.3-2) unstable; urgency=low
+
+  * Patched ktux so that it always uses the entire window / screen, not just
+    the top left corner (closes: #234850).
+
+ -- Ben Burton <bab at debian.org>  Tue,  6 Jul 2004 09:20:47 +1000
+
+kdetoys (4:3.2.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Don't abuse conflicts (use replaces instead where this is more proper).
+  * Suggests (konqueror | www-browser) for kdetoys-doc-html instead of
+    just www-browser.
+
+ -- Ben Burton <bab at debian.org>  Tue, 15 Jun 2004 08:38:18 +1000
+
+kdetoys (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
+
+kdetoys (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
+
+kdetoys (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 kdetoys metapackage.
+
+ -- Ben Burton <bab at debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
+
+kdetoys (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.
+  * Binary package kaphorism no longer exists.
+
+ -- Ben Burton <bab at debian.org>  Sat, 31 Jan 2004 12:08:48 +1100
+
+kdetoys (4:3.1.5-2) unstable; urgency=low
+
+  * Revert unintentional maintainer change that appeared in 4:3.1.5-1.
+
+ -- Ben Burton <bab at debian.org>  Sun, 18 Jan 2004 21:48:10 +1100
+
+kdetoys (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
+
+kdetoys (4:3.1.4-3) unstable; urgency=low
+
+  * Backported kteatime tooltip fix from HEAD (closes: #202206).
+
+ -- Ben Burton <bab at debian.org>  Wed, 15 Oct 2003 11:45:08 +1000
+
+kdetoys (4:3.1.4-2) unstable; urgency=low
+
+  * Updated amor description and man page to note that it works with window
+    managers other than kwin (closes: #213488).
+
+ -- Ben Burton <bab at debian.org>  Mon, 13 Oct 2003 00:55:42 +1000
+
+kdetoys (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab at debian.org>  Mon, 29 Sep 2003 15:08:53 +1000
+
+kdetoys (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Split debian menu titles into title/longtitle.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab at debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
+
+kdetoys (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Debian menu pixmaps no longer use a restricted colour map.
+  * Man page overhaul.
+
+ -- Ben Burton <bab at debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
+
+kdetoys (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed alpha compile flags.
+  * Time display for kworldclock fixed (closes: #185787).
+
+ -- Ben Burton <bab at debian.org>  Sat, 22 Mar 2003 16:18:51 +1100
+
+kdetoys (4:3.1.0-2) unstable; urgency=low
+
+  * First KDE3 upload to debian!
+  * KTeaTime now supports custom tasks (closes: #141942).
+  * Fixed kscore manpage directory (closes: #156881).
+
+ -- Ben Burton <bab at debian.org>  Sun,  2 Feb 2003 19:40:16 +1100
+
+kdetoys (4:3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab at debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
+
+kdetoys (4: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
+
+kdetoys (4: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
+
+kdetoys (4: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
+
+kdetoys (4:3.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Thu,  4 Jul 2002 19:36:49 +1000
+
+kdetoys (4:3.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Tue, 14 May 2002 00:09:38 +1000
+
+kdetoys (4:2.2.2-4) unstable; urgency=low
+
+  * Fixed HTML documentation conflicts.
+
+ -- Ben Burton <benb at acm.org>  Tue,  2 Apr 2002 00:26:51 +1000
+
+kdetoys (4:2.2.2-3) unstable; urgency=low
+
+  * Incorporated new KDE_2_2_BRANCH patches.
+
+ -- Ben Burton <benb at acm.org>  Sat, 23 Feb 2002 16:42:17 +1100
+
+kdetoys (4:2.2.2-2) unstable; urgency=low
+
+  * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447).
+
+ -- Ben Burton <benb at acm.org>  Sun,  9 Dec 2001 09:07:02 -0600
+
+kdetoys (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Wed,  7 Nov 2001 10:49:53 -0600
+
+kdetoys (4:2.2.1-4) unstable; urgency=low
+
+  * Uses automake again to solve new alpha problems.
+  * Removed redundant uic from build-depends.
+
+ -- Ben Burton <benb at acm.org>  Tue,  6 Nov 2001 23:51:27 -0600
+
+kdetoys (4:2.2.1-3) unstable; urgency=low
+
+  * Builds with automake 1.5.
+  * kdetoys-doc-html now conflicts with old kdetoys binaries that provided
+    their own HTML docs (closes: Bug#115104).
+  * Installs .pl.1 man pages in the correct locations (requires newer
+    debhelper).
+
+ -- Ben Burton <benb at acm.org>  Thu, 11 Oct 2001 15:31:32 -0500
+
+kdetoys (4:2.2.1-2) unstable; urgency=low
+
+  * Updated parameters for alpha build (closes: Bug#113126).
+
+ -- Ben Burton <benb at acm.org>  Sat, 22 Sep 2001 12:00:37 -0500
+
+kdetoys (4: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
+
+kdetoys (4:2.2.0-final-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added package kdetoys-doc-html.
+  * Added suggests: konqueror to packages including docbook documentation.
+  * Build-Depends: requires newer kdelibs-dev for working meinproc; added uic.
+  * Linking /usr/share/apps/kworldwatch to /usr/share/apps/kworldclock.
+  * Ensures .bz2 files are not being compressed.
+  * 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
+
+kdetoys (4:2.2-beta1-3) unstable; urgency=low
+
+  * Rebuilt with newer kdelibs (closes: #107001).
+
+ -- Ben Burton <benb at acm.org>  Tue, 31 Jul 2001 01:17:51 +1000
+
+kdetoys (4:2.2-beta1-2) unstable; urgency=low
+
+  * Builds on alpha.
+
+ -- Ben Burton <benb at acm.org>  Sun, 29 Jul 2001 00:20:23 +1000
+
+kdetoys (4:2.2-beta1-1) unstable; urgency=low
+
+  * New upstream version (closes: #88610, #99059, #99060).
+  * Adopted by Ben Burton <benb at acm.org> (closes: #89596).
+  * Added package fifteenapplet.
+  * Renamed package kworldwatch to kworldclock.
+  * Removed redundancies in build-depends.
+  * Changed Depends: kdebase to Recommends: kdebase for panel and systray
+    applets.
+  * Updated descriptions (closes: #93817, #93818, #93820, #93821).
+  * Added man pages.
+  * Added pixmaps for debian menu items.
+  * General overhaul of debian/.
+
+ -- Ben Burton <benb at acm.org>  Sat, 23 Jun 2001 12:32:11 -0500
+
+kdetoys (4:2.1.1-2.1) unstable; urgency=low
+ 
+  * NMU
+  * Fixing build-depends
+  * Update config.* files for hppa/ia64 archs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 28 Apr 2001 03:34:00 -0700
+ 
+kdetoys (4:2.1.1-2) unstable; urgency=low
+ 
+  * NMU
+  * Update menu entries with new kde menu tag
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 09 Apr 2001 02:40:00 -0700
+ 
+kdetoys (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 02:31:00 -0700
+ 
+kdetoys (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Mar 2001 02:31:00 -0700
+
+kdetoys (4:2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Upping standards version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdetoys (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
+
+kdetoys (4:2.1-20010106-1) unstable; urgency=low
+ 
+  * New upstream cvs version
+  * build-depends and depends updates
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
+
+kdetoys (4:2.1-20010101-1) unstable; urgency=low
+ 
+  * New upstream cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 01 Jan 2001 15:00:00 -0700
+
+kdetoys (4:2.1-20001221-1) unstable; urgency=low
+ 
+  * New upstream cvs version
+  * Adding in missing conflicts for kdetoys
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 21 Dec 2000 02:44:00 -0700
+
+kdetoys (4:2.0-final-7) unstable; urgency=low
+ 
+  * Fixing problem with eyesapplet's so link (Closes: #77709)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 22 Nov 2000 05:10:00 -0700
+
+kdetoys (4:2.0-final-6) unstable; urgency=low
+ 
+  * More dependency cleanup
+  * rebuild rules script
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 21 Nov 2000 07:44:00 -0700
+
+kdetoys (4:2.0-final-5) unstable; urgency=low
+ 
+  * Upstream documentation updates
+  * More dependency cleanup
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 18 Nov 2000 04:20:00 -0700
+
+kdetoys (4:2.0-final-4) unstable; urgency=low
+ 
+  * more upstream fixes
+  * adding in menu hints
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
+
+kdetoys (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 23:00:00 -0700
+                                                                                
+kdetoys (4:2.0-final-2) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
+
+kdetoys (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
+
+kdetoys (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
+                                                                                
+kdetoys (4:2.0-20001006-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 06 Oct 2000 22:00:00 -0700
+                                                                                
+kdetoys (4:2.0-20001005-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Compiling against non-versioned kdelibs again
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
+                                                                                
+kdetoys (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
+                                                                                
+kdetoys (4:2.0-20000925-2) unstable; urgency=low
+
+  * More upstream fixes
+  * Clean build against new libc package
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 26 Sep 2000 22:30:00 -0700
+
+kdetoys (4:2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Build-Depends fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdetoys (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Breaking down into individual packages
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
+
+kdetoys (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing odd description (Closes: #71542)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Sep 2000 22:00:00 -0700      
+
+kdetoys (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
+
+kdetoys (4:2.0-20000901-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Merging package fixes with upstream cvs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Sep 2000 17:00:00 -0700
+                                                                               
+kdetoys (4:2.0-20000825-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
+                                                                                
+kdetoys (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 17:00:00 -0700
+
+kdetoys (4:2.0-20000524-1.0) experimental; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 24 May 2000 04:15:00 -0700
+                                                                                
+kdetoys-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 21 May 2000 18:15:00 -0700
+
+kdetoys-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 12 May 2000 22:00:00 -0700
+
+kdetoys-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+ 
+  * new cvs version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 08 Mar 2000 22:00:00 -0700
+
+kdetoys-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+
+  * new cvs version
+  * Adding in build-depends
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
+
+kdetoys-cvs (4:2.0-19991001-1) experimental; urgency=low
+
+  * new version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Oct 1999 14:30:31 -0400
+
+kdetoys-cvs (4:2.0-19990822-1) experimental; urgency=low
+
+  * new version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 22 Aug 1999 08:52:31 -0400
+
+kdetoys-cvs (4:2.0-19990626) experimental; urgency=low
+
+  * new version 
+  * install into /opt/kde
+
+ -- Stephan Kulow <coolo at kde.org>  Sat, 26 Jun 1999 18:52:31 +0200
+
+kdetoys-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * migrating out of /opt to /
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 24 May 1999 07:22:51 -0400
+
+kdetoys (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo at kde.org>  Wed, 17 Feb 1999 19:09:43 +0100
+
+kdetoys (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
+
+Local variables:
+mode: debian-changelog
+End:

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,187 @@
+Source: kdetoys
+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), debhelper (>= 4.2.30), autotools-dev, kdelibs4-dev (>= 4:3.5.1), gawk, gettext, sharutils
+Standards-Version: 3.6.2
+
+Package: kdetoys
+Architecture: all
+Section: kde
+Depends: amor (>= ${Source-Version}), eyesapplet (>= ${Source-Version}), fifteenapplet (>= ${Source-Version}), kmoon (>= ${Source-Version}), kodo (>= ${Source-Version}), kteatime (>= ${Source-Version}), ktux (>= ${Source-Version}), kweather (>= ${Source-Version}), kworldclock (>= ${Source-Version})
+Suggests: kdetoys-doc-html (>= ${Source-Version})
+Description: toys 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 toys and fun extras provided
+ with the official release of KDE.
+
+Package: kdetoys-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdetoys
+Replaces: amor (<< 4:2.2.0-0), kmoon (<< 4:2.2.0-0), kodo (<< 4:2.2.0-0), kteatime (<< 4:2.2.0-0), kweather (<< 4:3.0.0-0), kworldclock (<< 4:2.2.0-0)
+Description: KDE toys 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 toys 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/amor/. Documentation is provided for most
+ KDE toys packages.
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.
+
+Package: amor
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Recommends: kwin
+Suggests: khelpcenter
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Description: a KDE creature for your desktop
+ AMOR stands for Amusing Misuse Of Resources. It provides several different
+ characters who prance around your X screen doing tricks and giving you tips.
+ .
+ Note that AMOR will only work with some window managers. Both KWin (the
+ KDE window manager) and Metacity (a GTK2 window manager) are supported.
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.
+
+Package: eyesapplet
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kicker
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Description: eyes applet for KDE
+ An applet for the KDE panel containing a pair of eyes that follow your mouse
+ around the screen.
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.
+
+Package: fifteenapplet
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kicker
+Description: fifteen pieces puzzle for KDE
+ An applet for the KDE panel that lets you play the Fifteen Pieces
+ sliding block puzzle. You have to order 15 pieces in a 4x4 square by
+ moving them around.
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.
+
+Package: kmoon
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kicker
+Suggests: khelpcenter
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Description: moon phase indicator for KDE
+ An applet for the KDE panel that displays the current phase of the moon.
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.
+
+Package: kodo
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Description: mouse odometer for KDE
+ KOdometer measures your desktop mileage. It tracks the movement of your mouse
+ pointer across your desktop and renders it in inches/feet/miles! It can
+ do cm/metres/km too. Its most exciting feature is the tripometer, and its
+ utter uselessness.
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.
+
+Package: kteatime
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, kicker
+Suggests: khelpcenter
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Description: KDE utility for making a fine cup of tea
+ KTeaTime is a handy timer for steeping tea. No longer will you have to
+ guess at how long it takes for your tea to be ready. Simply select the
+ type of tea you have, and it will alert you when the tea is ready to
+ drink.
+ .
+ KTeaTime sits in the KDE system tray.
+ .
+ Please note that KTeaTime is written explicitly for KDE. If you are
+ using a non-KDE window manager or desktop environment then it is quite
+ possible that KTeaTime will not work on your system.
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.
+
+Package: ktux
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Suggests: kwin
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
+Description: Tux screensaver for KDE
+ A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.
+
+Package: kweather
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Recommends: kicker
+Suggests: khelpcenter
+Description: weather display applet for KDE
+ An applet for the KDE panel that displays your area's current weather.
+ Information shown includes the temperature, wind speed, air pressure
+ and more. By pressing a button a full weather report can be obtained.
+ .
+ KWeather also provides a weather service that can track multiple weather
+ stations and provide this information to other applications, including
+ Konqueror's sidebar and Kontact's summary page.
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.
+
+Package: kworldclock
+Architecture: any
+Section: games
+Depends: ${shlibs:Depends}
+Suggests: kdeartwork-misc, kicker, kdesktop, khelpcenter
+Conflicts: task-kdetoys, kworldwatch (<= 4:2.2-beta1-1)
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys, kworldwatch (<= 4:2.2-beta1-1)
+Provides: kworldwatch
+Description: earth watcher for KDE
+ Displays where in the world it is light and dark depending on time, as
+ well as offering the time in all of the major cities of the world.
+ This can be run standalone, as an applet in the KDE panel or as a
+ desktop background.
+ .
+ Additional kworldclock themes are available in the kdeartwork-misc package.
+ .
+ This package is part of KDE, and a component of the KDE toys module.
+ See the 'kde' and 'kdetoys' packages for more information.

Added: people/jriddell/KDE/3.5/kdetoys/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,527 @@
+This package was debianized by Andreas Jellinghaus <aj at dungeon.inka.de> on
+Sun,  7 Feb 1999 12:12:58 +0100.
+It was brought up to date by Ivan E. Moore II <rkrusty at debian.org> on
+Mon, 24 May 1999 07:22:51 -0400.
+It was brought up to date by Ben Burton <bab at debian.org> on
+Sat, 23 Jun 2001 12:32:11 -0500.
+
+It was downloaded via CVS from cvs.kde.org.
+
+Upstream Authors:
+
+  AMOR: Martin R. Jones <mjones at kde.org> and
+      Gerardo Puga <gpuga at gioia.ing.unlp.edu.ar>
+  Eyes Applet: Matthias Elter <elter at kde.org> and
+      Jerome Tollet <tollet at magic.fr>
+  Fifteen Pieces Applet: Matthias Elter <elter at kde.org>
+  KMoon: Stephan Kulow <coolo at kde.org>,
+      M G berberich <berberic at fmi.uni-passau.de>,
+      Christopher Osburn <chris at speakeasy.org>
+      and Tim Beauchamp <timb at googol.com>
+  KOdometer: Armen Nakashian <armen at tourismo.com> and
+      Mark H. Granoff/mhg <granoff at keptin.lkg.dec.com>
+  KTeaTime: Matthias Hoelzer-Kluepfel <hoelzer at kde.org> and
+      Martin Willers <willers at xm-arts.de>
+  KTux: Martin R. Jones <mjones at kde.org> and Carlos Rego
+  KWeather: Ian Reinhart Geiser <geiseri at kde.org>,
+      Nadeem Hasan <nhasan at kde.org> and Tobias Koenig <tokoe at kde.org>
+  KWorldClock: Matthias Hoelzer-Kluepfel <hoelzer at kde.org> and others
+
+Copyright:
+
+  All components of this package are released under the GNU General
+  Public License, with the exceptions shown below.
+
+  On Debian GNU/Linux systems, the complete texts of the GNU General
+  Public License (GPL) and the GNU Library General Public License (LGPL)
+  can be found in the files `/usr/share/common-licenses/GPL' and
+  `/usr/share/common-licenses/LGPL'.
+
+  --------------------
+
+  Fifteen Pieces Applet:
+
+  Copyright (c) 2001 Matthias Elter <elter at kde.org>
+
+  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.
+
+  --------------------
+
+  KOdometer:
+
+  Released under the GNU General Public License, with the following
+  addition note:
+
+    Mouspedometa
+         Based on the original Xodometer VMS/Motif sources.
+
+    Written by Armen Nakashian
+               Compaq Computer Corporation
+               Houston TX
+               22 May 1998
+
+    If you make improvements or enhancements to Mouspedometa, please send
+    them back to the author at any of the following addresses:    
+
+                 armen at nakashian.com
+
+    Thanks to Mark Granoff for writing the original Xodometer, and
+    the whole KDE team for making such a nice environment to write
+    programs in.
+
+    This software is provided as is with no warranty of any kind,
+    expressed or implied. Neither Digital Equipment Corporation nor
+    Armen Nakashian will be held accountable for your use of this
+    software.
+
+  --------------------
+
+  KWeather:
+
+  Primarily under the GPL (GNU General Public License), but some sources
+  are under the LGPL (GNU Library General Public License).
+
+  --------------------
+
+  KWorldClock:
+
+  GPL (GNU General Public License) with the following exception:
+
+  Sun clock.  X11 version by John Mackin.
+
+  This program was derived from, and is still in part identical with, the
+  Suntools Sun clock program whose author's comment appears immediately
+  below.  Please preserve both notices.
+
+  The X11R3/4 version of this program was written by John Mackin, at the
+  Basser Department of Computer Science, University of Sydney, Sydney,
+  New South Wales, Australia; <john at cs.su.oz.AU>.  This program, like
+  the one it was derived from, is in the public domain: `Love is the
+  law, love under will.'
+
+  --------------------
+
+  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/kdetoys/debian/eyesapplet.install
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/eyesapplet.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/eyesapplet.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/kde3/eyes_panelapplet.la
+debian/tmp/usr/lib/kde3/eyes_panelapplet.so
+debian/tmp/usr/share/apps/kicker/applets/eyesapplet.desktop

Added: people/jriddell/KDE/3.5/kdetoys/debian/fifteenapplet.install
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/fifteenapplet.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/fifteenapplet.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/kde3/fifteen_panelapplet.la
+debian/tmp/usr/lib/kde3/fifteen_panelapplet.so
+debian/tmp/usr/share/apps/kicker/applets/kfifteenapplet.desktop

Added: people/jriddell/KDE/3.5/kdetoys/debian/icons/amor.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/icons/amor.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/icons/amor.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *amor[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #0A0100",
+"X  c #0C0C0D",
+"o  c #120000",
+"O  c #1E0000",
+"+  c #101010",
+"@  c #1F1F24",
+"#  c #2D0100",
+"$  c #250400",
+"%  c #340200",
+"&  c #3F0000",
+"*  c #350E00",
+"=  c #341600",
+"-  c #222222",
+";  c #232331",
+":  c #3B3B3D",
+">  c #3D3D53",
+",  c #393947",
+"<  c #470000",
+"1  c #4B0000",
+"2  c #4A0B00",
+"3  c #530000",
+"4  c #5B0000",
+"5  c #5B2700",
+"6  c #670800",
+"7  c #6B0000",
+"8  c #770000",
+"9  c #7B0000",
+"0  c #741A00",
+"q  c #787419",
+"w  c #68682A",
+"e  c #4C4C49",
+"r  c #505042",
+"t  c #595949",
+"y  c #585856",
+"u  c #5E5E5D",
+"i  c #5D5D62",
+"p  c #595970",
+"a  c #69694B",
+"s  c #787849",
+"d  c #77775B",
+"f  c #686869",
+"g  c #626260",
+"h  c #606071",
+"j  c #6B6B76",
+"k  c #767664",
+"l  c #79796D",
+"z  c #787874",
+"x  c #797987",
+"c  c #860000",
+"v  c #8A0000",
+"b  c #860900",
+"n  c #831C00",
+"m  c #971000",
+"M  c #842300",
+"N  c #982700",
+"B  c #A10000",
+"V  c #AA0000",
+"C  c #A41000",
+"Z  c #A31C00",
+"A  c #B90500",
+"S  c #BF1000",
+"D  c #B31B00",
+"F  c #AB2500",
+"G  c #857F3C",
+"H  c #817D40",
+"J  c #D31D00",
+"K  c #C72200",
+"L  c #C92C00",
+"P  c #CA2800",
+"I  c #D12A00",
+"U  c #DD2E00",
+"Y  c #D63000",
+"T  c #E82800",
+"R  c #E32600",
+"E  c #E73000",
+"W  c #E93400",
+"Q  c #EA3B00",
+"!  c #E43B00",
+"~  c #F73C00",
+"^  c #C65400",
+"/  c #E64400",
+"(  c #EC4200",
+")  c #EC4800",
+"_  c #EF5800",
+"`  c #EB5100",
+"'  c #F14500",
+"]  c #F24A00",
+"[  c #F94700",
+"{  c #F55400",
+"}  c #F35B00",
+"|  c #FA5B00",
+" . c #F36100",
+".. c #FC6400",
+"X. c #FE6B00",
+"o. c #F46C00",
+"O. c #FA7200",
+"+. c #FA7C00",
+"@. c #F27600",
+"#. c #8E8519",
+"$. c #969611",
+"%. c #96960C",
+"&. c #98982A",
+"*. c #A09D25",
+"=. c #AEAE0D",
+"-. c #BFAD00",
+";. c #B4B403",
+":. c #81814A",
+">. c #8A8A4D",
+",. c #888857",
+"<. c #83835A",
+"1. c #8C8C6C",
+"2. c #878779",
+"3. c #B6B65B",
+"4. c #FD8B00",
+"5. c #FD8400",
+"6. c #FE8512",
+"7. c #F79000",
+"8. c #F69D05",
+"9. c #FE8421",
+"0. c #FE9A39",
+"q. c orange",
+"w. c #FFAA00",
+"e. c #FEA409",
+"r. c #FCA113",
+"t. c #FAA319",
+"y. c #FEB500",
+"u. c #FEBB00",
+"i. c #F8B70D",
+"p. c #FEB313",
+"a. c #FFBC1D",
+"s. c #FEA223",
+"d. c #FEB622",
+"f. c #FE9945",
+"g. c #EEA651",
+"h. c #F7AE44",
+"j. c #CDCD00",
+"k. c #D4D400",
+"l. c #D9D703",
+"z. c #DFDF1F",
+"x. c #FEC200",
+"c. c #FECC00",
+"v. c #FEC90C",
+"b. c #FFC40D",
+"n. c #FFCD14",
+"m. c #FED400",
+"M. c #FEDB00",
+"N. c #FFD11B",
+"B. c #FDC82D",
+"V. c #FDC938",
+"C. c #FFD422",
+"Z. c #FDDB24",
+"A. c #FFD62C",
+"S. c #E2E200",
+"D. c #EBEB00",
+"F. c #EDE000",
+"G. c #FEE400",
+"H. c #FEEB00",
+"J. c #FFE50C",
+"K. c #FEE519",
+"L. c #FFF301",
+"P. c #FEFE00",
+"I. c #FFFF0C",
+"U. c #F7F714",
+"Y. c #FFFE14",
+"T. c #FFFF19",
+"R. c #FFE52A",
+"E. c #FFFF23",
+"W. c #FED241",
+"Q. c #FDDE5C",
+"!. c #FEC467",
+"~. c #FFDE61",
+"^. c #FBC678",
+"/. c #FFE44C",
+"(. c #F0F055",
+"). c #FFFF52",
+"_. c #FEE363",
+"`. c #FFE077",
+"'. c #FEE873",
+"]. c #FFFF66",
+"[. c #FFFF7B",
+"{. c #868684",
+"}. c #8F8F93",
+"|. c #858595",
+" X c #9F9FAF",
+".X c #9697A6",
+"XX c #BDBD8C",
+"oX c #A4A4B6",
+"OX c #AEAEB1",
+"+X c #BABAC1",
+"@X c #BDBDCB",
+"#X c #BEBFD6",
+"$X c #E5B584",
+"%X c #D0D083",
+"&X c #DEC4B5",
+"*X c #D8C2BD",
+"=X c #DEDEA6",
+"-X c #DFDFB2",
+";X c #E8C197",
+":X c #FFD189",
+">X c #E4CABD",
+",X c #E0C5B8",
+"<X c #F9D7B9",
+"1X c #FFFF86",
+"2X c #FFFF8B",
+"3X c #FFFD94",
+"4X c #E9E995",
+"5X c #FEFEA4",
+"6X c #FFFBAD",
+"7X c #F1F2AC",
+"8X c #FFFFB4",
+"9X c #FFFFBE",
+"0X c #F5F5B8",
+"qX c #CBCBCE",
+"wX c #C7C7DD",
+"eX c #C8C8DD",
+"rX c #C2C2D2",
+"tX c #D3CDD6",
+"yX c #CDD7F2",
+"uX c #DBDBE5",
+"iX c #DBDDEB",
+"pX c #D4D8E7",
+"aX c #D3DBF2",
+"sX c #DFDFF3",
+"dX c #DDE1EF",
+"fX c #DCE2F4",
+"gX c #E7CFC2",
+"hX c #E9D2C3",
+"jX c #EED7C9",
+"kX c #EBDCD4",
+"lX c #EBDFDB",
+"zX c #F2DCCF",
+"xX c #F4DFD1",
+"cX c #FEE2C5",
+"vX c #F9E6D8",
+"bX c #F7F7CA",
+"nX c #FFFDC3",
+"mX c #F8F8CB",
+"MX c #FFFED3",
+"NX c #FFFFDA",
+"BX c #E3E3EA",
+"VX c #E8E8ED",
+"CX c #E1E3F1",
+"ZX c #E5E9F5",
+"AX c #EBECF2",
+"SX c #EAEEF8",
+"DX c #EDF1FC",
+"FX c #FCECE3",
+"GX c #FFFFE5",
+"HX c #FFFFE9",
+"JX c #F2F2F5",
+"KX c #F3F4FB",
+"LX c #F5F8FE",
+"PX c #FFFFF3",
+"IX c #FEFEFE",
+"UX c #F8F4F4",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYX....| |  ...} | ] ' ' YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXX.| X.4.p.W._.'.'.Q.V.8.o.' ( YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXX.X.e./.6XHXIXIXIXIXIXIXGX3XB. at .Q Q YXYXYXYXYXYXYX",
+"YXYXYXYXYXYX..6.Q.nXIXIXPXPXPXPXPXPXPXPXIXPX2Xi.) E YXYXYXYXYXYX",
+"YXYXYXYXX...0.6XHXPXHXGXHXGXGXGXGXGXGXGXGXHXPXnXZ.` E YXYXYXYXYX",
+"YXYXYXYX..f.MXGXMXmXNXMXMXMXMXMXMXMXMXMXMXNXbXGXnXK.] Z YXYXYXYX",
+"YXYXYX..6.mXMXXXr e d 0XnX9X9X9X9X9X9XnX=Xa e t -X5Xv.L % YXYXYX",
+"YXYXX.X.`.8X%Xe @XuX|.a 5X5X5X5X5X5X5X4Xt oXBX Xr 7X).4.m YXYXYX",
+"YXYX| s.[.1Xs rXIXJXKX|.3.3X1X1X1X2X2X>.oXDXJXIX.X*.Y.M./ # YXYX",
+"YXX...R.).(.k IXKXVXBXwXH ].].].].].(.k sXiXAXIXsXq L.H.4.b YXYX",
+"YX| 5.I.E.z.{.IXJX X{.wX<.U.T.T.T.Y.l.}. at X{.+XLXDXs G.G.u.K . YX",
+"YX| y.P.P.S.2.IXqXg y x 1.D.P.P.P.P.j.}.i g f VXKX&.G.M.m.) % YX",
+"YX| c.P.P.P.s IXOX+ X , ,.P.P.P.P.P.l.z @ + - VXsX#.H.M.M. .4 YX",
+"YX| M.P.P.P.%.eXVX+   > &.P.P.P.P.P.P.s ;   : IX.X-.G.m.m.O.8 YX",
+"YX .G.P.P.P.D.a CXOXh u k.P.P.P.P.P.P.=.p j uX#Xq G.M.m.c.+.9 YX",
+"YX .M.P.P.P.P.k.w 2.d ;.P.P.P.P.P.P.P.P.$.l l q F.G.m.c.c.o.9 YX",
+"YX{ m.P.P.P.P.P.I.k.D.P.P.P.P.P.P.P.P.P.P.S.l.L.H.M.m.c.x. .7 YX",
+"YX] u.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.L.M.M.c.u.x./ < YX",
+"YX' 7.P.P.P.P.K.A.C.C.C.N.N.n.n.n.n.v.b.x.x.y.y.c.m.x.x.w.J O YX",
+"YX] } L.P.P.P.Z.<XFXvXvXxXzXjXjXhXgXgX>X&X&X*Xg.u.c.x.x.5.B   YX",
+"YXYX( u.P.P.P.N.cXIXLXLXKXDXSXZXZXdXdXiXiXpXyXg.x.x.u.y.Q 3 YXYX",
+"YXYX/  .P.P.P.L.:XIXUXJXJXAXAXVXBXBXuXuXpXpXtXt.x.u.y.4.A . YXYX",
+"YXYXYXQ 8.P.P.P.V.FXIXKXJXAXAXVXBXBXuXuXpXaX$Xw.x.y.w.T 1   YXYX",
+"YXYXYXQ ~ x.P.P.H.!.JXLXJXAXVXVXBXdXdXuXaX&Xr.u.y.y.] c   YXYXYX",
+"YXYXYXYXn ! c.P.P.J.!.vXLXDXAXZXVXBXfXiX;Xr.y.u.y.{ B . YXYXYXYX",
+"YXYXYXYXYX2 I w.P.P.G.B.^.<XkXlXkXhX;Xh.w.y.u.q.] B o YXYXYXYXYX",
+"YXYXYXYXYXYX$ D X.c.L.H.M.b.a.d.a.p.y.y.x.y.5.R c   YXYXYXYXYXYX",
+"YXYXYXYXYXYXYX. 6 P o.w.c.M.M.M.c.c.x.q.O.E V &   YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXo 4 C I / _ } _ ) U S v &     YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYX  o % 1 4 4 < # .   YXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdetoys/debian/icons/kodo.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/icons/kodo.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/icons/kodo.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,283 @@
+/* XPM */
+static char *kodo[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 245 2",
+"   c #000000",
+".  c #010101",
+"X  c #020202",
+"o  c #030303",
+"O  c #040404",
+"+  c #050505",
+"@  c #080808",
+"#  c #090909",
+"$  c #0A0A0A",
+"%  c #0B0B0B",
+"&  c #0C0C0C",
+"*  c #0D0D0D",
+"=  c #0E0E0E",
+"-  c #0F0F0F",
+";  c #101010",
+":  c #121212",
+">  c #131313",
+",  c #141414",
+"<  c #151515",
+"1  c #161616",
+"2  c #171717",
+"3  c #181818",
+"4  c #191919",
+"5  c #1A1A1A",
+"6  c #1B1B1B",
+"7  c #1C1C1C",
+"8  c #1D1D1D",
+"9  c #1E1E1E",
+"0  c #1F1F1F",
+"q  c #202020",
+"w  c #212121",
+"e  c #222222",
+"r  c #232323",
+"t  c #242424",
+"y  c #252525",
+"u  c #262626",
+"i  c #272727",
+"p  c #282828",
+"a  c #292929",
+"s  c #2A2A2A",
+"d  c #2B2B2B",
+"f  c #2D2D2D",
+"g  c #2E2E2E",
+"h  c #2F2F2F",
+"j  c #303030",
+"k  c #313131",
+"l  c #323332",
+"z  c #333232",
+"x  c #333333",
+"c  c #343434",
+"v  c #353535",
+"b  c #363636",
+"n  c #373737",
+"m  c #383737",
+"M  c #383838",
+"N  c #393939",
+"B  c #3A3A3A",
+"V  c #3B3B3B",
+"C  c #3C3B3B",
+"Z  c #3C3C3C",
+"A  c #3D3D3D",
+"S  c #3E3E3E",
+"D  c #3F3F3E",
+"F  c #404040",
+"G  c #414141",
+"H  c #424242",
+"J  c #434343",
+"K  c #444444",
+"L  c #454545",
+"P  c #464646",
+"I  c #474747",
+"U  c #484848",
+"Y  c #494848",
+"T  c #494949",
+"R  c #4A4A4A",
+"E  c #4B4B4B",
+"W  c #4C4C4C",
+"Q  c #4D4D4D",
+"!  c #4E4E4E",
+"~  c #4E4F4E",
+"^  c #4F4F4F",
+"/  c #50504F",
+"(  c #505050",
+")  c #515050",
+"_  c #515151",
+"`  c #525252",
+"'  c #535353",
+"]  c #545454",
+"[  c #545554",
+"{  c #555555",
+"}  c #555655",
+"|  c #565555",
+" . c #575757",
+".. c #585858",
+"X. c #595858",
+"o. c #595959",
+"O. c #5A5A5A",
+"+. c #5B5A5A",
+"@. c #5B5B5B",
+"#. c #5C5C5C",
+"$. c #5C5D5D",
+"%. c #5D5D5D",
+"&. c #5E5E5E",
+"*. c #5F5E5E",
+"=. c #5F5F5F",
+"-. c #606060",
+";. c #616161",
+":. c #626161",
+">. c #636363",
+",. c #646363",
+"<. c #646464",
+"1. c #656565",
+"2. c #676767",
+"3. c #686868",
+"4. c #6A6A6A",
+"5. c #6B6A6A",
+"6. c #6C6C6C",
+"7. c #6E6E6E",
+"8. c #6F6E6E",
+"9. c #6F6F6F",
+"0. c #707070",
+"q. c #717171",
+"w. c #727272",
+"e. c #737373",
+"r. c #737473",
+"t. c #747373",
+"y. c #747474",
+"u. c #747575",
+"i. c #757575",
+"p. c #767575",
+"a. c #767676",
+"s. c #777777",
+"d. c #787777",
+"f. c #787878",
+"g. c #797979",
+"h. c #7A7A7A",
+"j. c #7B7B7B",
+"k. c #7C7C7C",
+"l. c #7D7D7D",
+"z. c #7E7E7E",
+"x. c #7F7E7E",
+"c. c #7F7F7F",
+"v. c #808080",
+"b. c #818181",
+"n. c #838282",
+"m. c #838383",
+"M. c #848484",
+"N. c #858484",
+"B. c #858585",
+"V. c #878686",
+"C. c #878787",
+"Z. c #888888",
+"A. c #8A8888",
+"S. c #8A8A8A",
+"D. c #8B8B8B",
+"F. c #8C8C8C",
+"G. c #8D8D8D",
+"H. c #8E8D8D",
+"J. c #8E8E8E",
+"K. c #8E8F8E",
+"L. c #8F8F8F",
+"P. c #909190",
+"I. c #919090",
+"U. c #919191",
+"Y. c #929191",
+"T. c #929292",
+"R. c #939393",
+"E. c #949393",
+"W. c #959595",
+"Q. c #969696",
+"!. c #979797",
+"~. c #989898",
+"^. c #999999",
+"/. c #999A99",
+"(. c #9A9A9A",
+"). c #9C9B9B",
+"_. c #9C9C9C",
+"`. c #9D9D9D",
+"'. c #9E9E9E",
+"]. c #9F9F9F",
+"[. c #A0A0A0",
+"{. c #A1A1A1",
+"}. c #A6A6A6",
+"|. c #A7A7A7",
+" X c #A9A9A9",
+".X c #ACACAC",
+"XX c #AEAEAE",
+"oX c #AFAFAF",
+"OX c #B0B0B0",
+"+X c #B1B1B1",
+"@X c #B2B2B2",
+"#X c #B3B3B3",
+"$X c #B4B4B4",
+"%X c #B5B4B4",
+"&X c #B5B5B5",
+"*X c #B6B6B6",
+"=X c #B7B7B7",
+"-X c #B8B8B8",
+";X c #BABABA",
+":X c #BABBBB",
+">X c #BBBBBB",
+",X c #BCBCBC",
+"<X c #BDBCBC",
+"1X c #BDBDBD",
+"2X c #BEBEBE",
+"3X c #BFBFBF",
+"4X c #C0C0C0",
+"5X c #C1C1C1",
+"6X c #C2C2C2",
+"7X c #C5C5C5",
+"8X c #C6C6C6",
+"9X c #C7C7C7",
+"0X c #C8C8C8",
+"qX c #C9C9C9",
+"wX c #CAC9C9",
+"eX c #CCCCCC",
+"rX c #CCCDCD",
+"tX c #CFCFCF",
+"yX c #D1D1D1",
+"uX c #D3D3D3",
+"iX c #D4D4D4",
+"pX c #D5D4D4",
+"aX c #D5D5D5",
+"sX c #D7D6D6",
+"dX c #D7D7D7",
+"fX c #D8D8D8",
+"gX c #DBDBDB",
+"hX c #DFDFDF",
+"jX c #E0E0E0",
+"kX c #E1E1E1",
+"lX c #E2E2E2",
+"zX c #E5E5E5",
+"xX c #E8E8E8",
+"cX c #EAE9E9",
+"vX c #EDEDED",
+"bX c #EEEEEE",
+"nX c gray94",
+"mX c #F2F2F2",
+"MX c #FAFAFA",
+"NX c #FBFBFB",
+"BX c #FCFCFC",
+"VX c #FDFDFD",
+"CX c #FEFEFE",
+"ZX c gray100",
+"AX c None",
+/* pixels */
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX",
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX",
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX",
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX",
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX",
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX8XMX",
+"AXZXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXbXI bX",
+"AXMX8Xe.e.j.j.e.t.c.C.K.U.U.W.t.l.e.e.e.e.e.j.j.e.e.j.e.e.tX8 bX",
+"AXMX at X: I C.S.` q g e.~.'.W./ : i ; - - : - > w ~ M.v.c % 2X4 bX",
+"AXMX&XS @X~.W.{.7.S e.D.W.lX,.3 S k h g g i y e.{.U.U.{.N 3X4 bX",
+"AXMX2X .C.3.3.XXS.T 3.t.h.fXe.y >.e.s.e.9.%.F  X at X3.3.tXe.9X6 bX",
+"AXMX2X~ 2.!.uX;X#.S O.t.6X~.:.p ,.a.e.e.e.=.J e.&XiXiXbXM.rX8 bX",
+"AXMX2XF ` ,.v.&Xj.c F {.uX%.I 7 ` ` ~ ` E J k ] e.M.E.iXe.9X4 bX",
+"AXMX2X=.2X=.O. at Xv.d N 4X!.c k 1 F N ( @.S h d K. X .,.9X~ 3X8 bX",
+"AXMX&Xy U.lXcX'.u w 8 *X2.1 1 % c w ~ 4Xd 6 6 T XXlXzXe.4 2X6 bX",
+"AXMX2XN I ` ` T k h C I S N m 8 ] K K ( F N d S E ` ` I d 3X7 bX",
+"AXMX#X      O     % +           -           + @ X X X O   >X4 bX",
+"AXMX&X- w ` %.g & 8 4 7 S 4 : + k - % - = % 3 C ^ | ] ~ 5 2X7 bX",
+"AXMX;XV {.gXgXoXF d S ,.sX| m : F x d d h d u N.tXuXhXe.x 6XS mX",
+"AXMX3Xl.gXj.7.3XK.F  .#XbXd.2.r @.,.=.%.*.` m ( | =.8XK.g ].oXMX",
+"AXMX8XL.tXe.e. at XU.O.j.v.lXE.K.k 9.S.C.N.n.9.T 6.c.'.-Xx.x *.& bX",
+"AXMX3Xe.8X` | }.C.F ~ ,.fX3.` 8 ~ ~ ` | T F k I t.wXC.` x 6X7 bX",
+"AXMX2X=.rX%. . at Xl.k N ` uX .C 1 H C I ` C h u C ~.6X .c y 3X4 bX",
+"AXMX&XN >X&XXX2X%.r y k rXI r & c w H L.d 5 8 g !.W.d q 1 4X7 bX",
+"AXMX;Xd ,.W.W.e.x y d d j.N d > x y N j.d w r g =.=.d y 8 4X4 bX",
+"AXMXtX~.'.'.'.].~.~.'.).'.).'.U.'.).'.'.'.~.~.%.-.].'.'.!.iX7 bX",
+"ZXrX( ^ ( ( ` ^ ^ ( ( ( ~ ^ ( ( ^ ^ ( ^ ^ ^ K.a.d / / ^ / ^ % bX",
+"ZXzX$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$XtXiX$X$X$X$X&X#X&XMX",
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX",
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX",
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX",
+"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX"
+};

Added: people/jriddell/KDE/3.5/kdetoys/debian/icons/kteatime.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/icons/kteatime.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/icons/kteatime.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,260 @@
+/* XPM */
+static char *kteatime[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 222 2",
+"   c #000000",
+".  c #090403",
+"X  c #0E0E0E",
+"o  c #140905",
+"O  c #1E0F09",
+"+  c #1D1109",
+"@  c gray8",
+"#  c #22120A",
+"$  c #2D190C",
+"%  c #351D0C",
+"&  c #381F0E",
+"*  c #301C10",
+"=  c #28211D",
+"-  c #3A220D",
+";  c #382112",
+":  c #2A2A2A",
+">  c gray19",
+",  c #492A0F",
+"<  c #412810",
+"1  c #492A13",
+"2  c #56320F",
+"3  c #58310C",
+"4  c #553213",
+"5  c #54311C",
+"6  c #593511",
+"7  c #6D3A1B",
+"8  c #713E1C",
+"9  c #633B22",
+"0  c #6D3D23",
+"q  c #713E21",
+"w  c #6B4415",
+"e  c #73401C",
+"r  c #704916",
+"t  c #7B4816",
+"y  c #7E4D1F",
+"u  c #6F4229",
+"i  c #734325",
+"p  c #784527",
+"a  c #7A4728",
+"s  c #784825",
+"d  c #7A492A",
+"f  c #7E5223",
+"g  c #584C45",
+"h  c DimGray",
+"j  c #776E6C",
+"k  c #7A6D66",
+"l  c #7B7674",
+"z  c #83501D",
+"x  c #824C2A",
+"c  c #815020",
+"v  c #81572C",
+"b  c #8E5C22",
+"n  c #8F601B",
+"m  c #95641D",
+"M  c #8E602E",
+"N  c #91622E",
+"B  c #9A6B2E",
+"V  c #976A34",
+"C  c #9D713B",
+"Z  c #A06D28",
+"A  c #A4722B",
+"S  c #AA7523",
+"D  c #AD7825",
+"F  c #A0753E",
+"G  c #805D47",
+"H  c #826552",
+"J  c #876A58",
+"K  c #8E7557",
+"L  c #88766A",
+"P  c #897C74",
+"I  c #A67641",
+"U  c #A3754B",
+"Y  c #A37B44",
+"T  c #AA7C5A",
+"R  c #CE0100",
+"E  c #D4160B",
+"W  c #D51A00",
+"Q  c #D21B12",
+"!  c #DD3F00",
+"~  c #D72220",
+"^  c #D65607",
+"/  c #D74030",
+"(  c #E45D00",
+")  c #E2542F",
+"_  c #EA7600",
+"`  c #E76E23",
+"'  c #E25242",
+"]  c #ED7A4E",
+"[  c #BC852E",
+"{  c #B8883B",
+"}  c #8F816C",
+"|  c #90826D",
+" . c #948773",
+".. c #AA8149",
+"X. c #B38B4E",
+"o. c #B08853",
+"O. c #BD9246",
+"+. c #BD9757",
+"@. c #AE9366",
+"#. c #C79037",
+"$. c #C99339",
+"%. c #CE993F",
+"&. c #DA9E34",
+"*. c #EC8303",
+"=. c #EE811F",
+"-. c #EE8438",
+";. c #E2A33C",
+":. c #E9AA3C",
+">. c #D29D44",
+",. c #D19E4F",
+"<. c #D59855",
+"1. c #CAA65B",
+"2. c #CDA95E",
+"3. c #D4A147",
+"4. c #D1A95A",
+"5. c #D8A453",
+"6. c #D9A95A",
+"7. c #CCA266",
+"8. c #CCA860",
+"9. c #CAA872",
+"0. c #D7AD66",
+"q. c #D3B36A",
+"w. c #D8B76C",
+"e. c #D6B772",
+"r. c #DBBA71",
+"t. c #DCB87B",
+"y. c #EA8A56",
+"u. c #E89D5B",
+"i. c #F39641",
+"p. c #F59552",
+"a. c #E28066",
+"s. c #F19F61",
+"d. c #E4A94C",
+"f. c #EFB941",
+"g. c #EEB759",
+"h. c #F9AB50",
+"j. c #F9B651",
+"k. c #FCBD55",
+"l. c #ECAF7C",
+"z. c #EEB57A",
+"x. c #EBBC74",
+"c. c #F2A869",
+"v. c #F0BD64",
+"b. c #F7BB76",
+"n. c #F0BE7E",
+"m. c #F5C24B",
+"M. c #F3C45F",
+"N. c #FBC052",
+"B. c #ECC47E",
+"V. c #EECA78",
+"C. c #F4C76F",
+"Z. c #848484",
+"A. c #8B8885",
+"S. c #8B8B8C",
+"D. c #8F9091",
+"F. c #929292",
+"G. c #949798",
+"H. c #96999B",
+"J. c #9B9B9B",
+"K. c #9C9FA0",
+"L. c #A49B83",
+"P. c #AEA889",
+"I. c #A3A3A3",
+"U. c #A6A7A9",
+"Y. c #ABACAC",
+"T. c #B5B5B5",
+"R. c #BBBBBB",
+"E. c #DCBF89",
+"W. c #ECAE85",
+"Q. c #ECAA8C",
+"!. c #EEB993",
+"~. c #DFC28A",
+"^. c #DFC390",
+"/. c #EBC48B",
+"(. c #E5C490",
+"). c #F6CD81",
+"_. c #F2C889",
+"`. c #F7CF9A",
+"'. c #F8D38B",
+"]. c #F4D29A",
+"[. c #F6D89C",
+"{. c #FFDE95",
+"}. c #FAD898",
+"|. c #E3CDA0",
+" X c #ECD5A0",
+".X c #EEDFA7",
+"XX c #E3D8B4",
+"oX c #E5DABD",
+"OX c #F2CFA7",
+"+X c #F6D5A2",
+"@X c #F4DAA3",
+"#X c #F1DEAC",
+"$X c #FBDEA2",
+"%X c #F4DBB0",
+"&X c #F4E1AE",
+"*X c #FCE3AA",
+"=X c #F5E4BB",
+"-X c #FCE6B9",
+";X c #FCEBBD",
+":X c #FEF3B9",
+">X c #FFF9BA",
+",X c #C2C2C2",
+"<X c #C9C9C9",
+"1X c #E6DEC0",
+"2X c #E8E1C2",
+"3X c #F3E9C2",
+"4X c #F9EDC9",
+"5X c #F9EBD1",
+"6X c #F5F1CF",
+"7X c #FFF3CB",
+"8X c #F5F1D1",
+"9X c #FCF4D2",
+"0X c #FDFAD3",
+"qX c #FEFCDD",
+"wX c #FCF7E6",
+"eX c #FDF5ED",
+"rX c #FEFEE3",
+"tX c #FFFFEB",
+"yX c #FCF5FB",
+"uX c #FFFEF3",
+"iX c #FFFFFE",
+"pX c None",
+/* pixels */
+"pXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpXpXpXpXpXpXpX<X<X<XpXpXpXpXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpX,X,XR.pXpXpXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXT.T.T.pXpXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpXpXpXpXpXpXpXY.Y.Y.Y.Y.Y.pXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpXpXpXpXpXI.I.I.I.I.I.U.I.pXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpXpXpXJ.J.J.J.J.J.J.J.J.pXpXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpXpXpXF.F.F.F.D.F.G.H.pXpXpXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpXpXpXS.S.A.S.S.pXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpX0 u j l l l l k 7 7 0 pXpXpXpXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpX7 7 y M C .. at . .| | K Y C N y e 7 0 pXpXpXpXpXpXpXpX",
+"pXpXpXpX7 z X.E. X at X[.[.}.E.L.L.P..X>X:X&X~.1.z 0 pXpXpXpXpXpXpX",
+"pXpXpX0 B #X9X/.d.;.:.f.m.m.5.<.u.s.c.b.{.>XqX;X{ $ pXpXpXpXpXpX",
+"pXpXpX7 8.uX/.^ ` i.h.k.N.j.h.p.] ' ~ R E ) ].wXV.2   pXpXpXpXpX",
+"pXpXpX7 1.tX5XQ.y.-.=.*.*._ ( ! W R R Q / a.%X3Xr.3 o e 7 i pXpX",
+"pXpXpX7 1.tXqXrXqX4X%X]._.B.z.l.W.!.OX=X0XqX9XoXe.I T T U p 0 pX",
+"pXpXpX7 1.tXqXqXrXtXuXuXuXuXuXuXuXuXuXtXrXqX6XXXoXeXyXyXeXo.* pX",
+"pXpXpX7 1.tXqXrXrXrXtXtXuXuXuXuXuXtXtXrXrXqX6XXXoXeXuXuXuXE.1 pX",
+"pXpXpX7 1.rXqXrXrXtXtXuXuXuXuXuXuXuXtXrXrXrX6XoX^.(.9.E.5X(.4 pX",
+"pXpXpX7 1.rXqXrXtXtXuXuXuXuXiXuXuXuXtXtXrXrX6X1Xe.t f 0.+X7.& pX",
+"pXpXpX7 1.rXqXtXtXtXuXuXuXiXiXuXuXuXuXrXrXqX8X1Xq.A 6./.n.v . pX",
+"pXpXpX7 1.rXrXrXrXtXuXuXuXiXiXiXiXuXtXtXtXqX8X1Xe.d.x.V.V O pXpX",
+"pXpXpX7 1.tXqXrXtXtXtXuXuXiXiXuXuXuXuXrXtXwX6XoXt.d.<.f O pXpXpX",
+"pXpXpX7 1.tXqXrXrXtXtXuXuXuXuXuXuXuXtXtXrXqX6XoXr.Z 1 . pXpXpXpX",
+"pXpXpX7 1.rXqXqXrXtXtXtXuXuXuXuXuXuXtXrXrXqX8X1Xw.2   pXpXpXpXpX",
+"pXpXpX7 2.tXqXrXrXtXtXtXtXtXuXtXtXtXtXrXqXqX8X1Xr.2   pXpXpXpXpX",
+"pXpXpXi O.0XtXqXqXrXrXtXtXtXtXtXtXtXrXrXqXqX8X2X4.,   pXpXpXpXpX",
+"pXpXpX# w C.-XqXrXtXtXtXtXtXtXtXtXrXtXtXtXqX=XC.m o   pXpXpXpXpX",
+"pXpXpX  # m &.g.V.$X;X7X9XqXqXqX0X7X4X*X'.v.;.D ;     pXpXpXpXpX",
+"pXpXpX    . - w n S [ #.%.>.>.>.>.#.#.D m r ; o     pXpXpXpXpXpX",
+"pXpXpXpXpXpXpX  . . # $ % - - - % $ O o .     pXpXpXpXpXpXpXpXpX",
+"pXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpXpX"
+};

Added: people/jriddell/KDE/3.5/kdetoys/debian/icons/ktux.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/icons/ktux.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/icons/ktux.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,50 @@
+/* XPM */
+static char *ktux[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 12 1",
+"  c black",
+". c gray19",
+"X c #585858",
+"o c #FFA858",
+"O c #808080",
+"+ c #A0A0A0",
+"@ c #FFDCA8",
+"# c #C3C3C3",
+"$ c gainsboro",
+"% c #FFFFC0",
+"& c gray100",
+"* c None",
+/* pixels */
+"********************************",
+"***************   **************",
+"************** #&# *************",
+"************** $&$ *************",
+"*******   ***. ### .***  .******",
+"****** $&# X O$&&&$O X #&$ *****",
+"***** +$$++$&#OXXXO#&$$+$$+ ****",
+"***** X#+$&+XXOO+OOX.+&$+#X ****",
+"***** XX#$OXOoooo at oo+XO$#XX ****",
+"******  $OX+oo at o@o@@o+XO$  *****",
+"****** $+O+oo at o@@@@%@@+X+$ *****",
+"**X   O$O+oo@@@X.X@@%@o+O#O   X*",
+"** $&$+$Ooo at o@X.+.X@@%@oO$+$&$ *",
+"* #$$#+$Oo@@%@O#*#O@%@%oO&+#&$# ",
+"* +$$$+$+oo%@%@O.O@%&%@o+$+$$$+ ",
+"* .OO+X#$Oo@%@%@@@&&%%@+#$X+OO. ",
+"** XXX.O##Oo@%%%&&&%%@O+&+.XXX *",
+"***     +$+Oo@%%%&%@@O+$#     **",
+"****** OO#$+O+o@@@o++$&#OO *****",
+"***** X#+O#$&$O+++O$&$#O+#O ****",
+"*****.$&$+OO#$$&&&$$#+O+$&$ ****",
+"**** $$&&$O.XO+$$$+OX.O$$&$$.***",
+"**** +$$+OX ..OOOOO.. XO+$$+ ***",
+"**** X+OOX **.#$$$#.** XOO+X ***",
+"***** XX  *** O$&&O ***  XX ****",
+"******  ***** O$&$O *****  *****",
+"************** +++ *************",
+"************** XXX *************",
+"***************   **************",
+"********************************",
+"********************************",
+"********************************"
+};

Added: people/jriddell/KDE/3.5/kdetoys/debian/icons/kworldclock.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/icons/kworldclock.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/icons/kworldclock.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kworldclock[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #00010A",
+"X  c #000311",
+"o  c #00031A",
+"O  c #000928",
+"+  c #000831",
+"@  c #00134B",
+"#  c #001849",
+"$  c #041C5A",
+"%  c #031D63",
+"&  c #001A6D",
+"*  c #0B225B",
+"=  c #052666",
+"-  c #062E75",
+";  c #01346A",
+":  c #013367",
+">  c #053972",
+",  c #003B78",
+"<  c #093E79",
+"1  c #0F3775",
+"2  c #15316F",
+"3  c #173679",
+"4  c #0D427B",
+"5  c #1B447B",
+"6  c #13457B",
+"7  c #22437D",
+"8  c #0017BE",
+"9  c #002992",
+"0  c #003A98",
+"q  c #1C3F89",
+"w  c #163C93",
+"e  c #0127A2",
+"r  c #0031A5",
+"t  c #0039AA",
+"y  c #113CAF",
+"u  c #103DDE",
+"i  c #0E2ECB",
+"p  c #0B4281",
+"a  c #0C5098",
+"s  c #124982",
+"d  c #11498C",
+"f  c #194489",
+"g  c #144D93",
+"h  c #124B99",
+"j  c #174497",
+"k  c #17518F",
+"l  c #18539D",
+"z  c #1B589C",
+"x  c #1A5498",
+"c  c #0143B4",
+"v  c #004DB9",
+"b  c #0049B7",
+"n  c #0751BB",
+"m  c #164EA6",
+"M  c #124EB9",
+"N  c #1A56A4",
+"B  c #1D59A5",
+"V  c #1C5AAE",
+"C  c #254182",
+"Z  c #2E4A8C",
+"A  c #2C559F",
+"S  c #304E91",
+"D  c #315984",
+"F  c #264B9A",
+"G  c #2344B4",
+"H  c #2658A7",
+"J  c #235ABB",
+"K  c #295CBE",
+"L  c #285CB2",
+"P  c #355CAB",
+"I  c #2662AB",
+"U  c #2866B8",
+"Y  c #316DAD",
+"T  c #3569B9",
+"R  c #3873B8",
+"E  c #1F61C2",
+"W  c #214DDA",
+"Q  c #2D5DD6",
+"!  c #2A54D4",
+"~  c #345FD0",
+"^  c #256CCA",
+"/  c #3066C4",
+"(  c #3E64C7",
+")  c #3B68C7",
+"_  c #336FD6",
+"`  c #3676C7",
+"'  c #387DD3",
+"]  c #2770E9",
+"[  c #2777F1",
+"{  c #3065E8",
+"}  c #3279EC",
+"|  c #3975E6",
+" . c #307CF0",
+".. c #4C759F",
+"X. c #527699",
+"o. c #4C6FBB",
+"O. c #4873BA",
+"+. c #5B79BD",
+"@. c #456BC0",
+"#. c #4478C5",
+"$. c #467AD6",
+"%. c #457DDB",
+"&. c #447FE4",
+"*. c #3C80C8",
+"=. c #3983D0",
+"-. c #3F84EE",
+";. c #4481BD",
+":. c #6D88A8",
+">. c #6A83B5",
+",. c #4886C7",
+"<. c #4B87D2",
+"1. c #598BCD",
+"2. c #568ECE",
+"3. c #5689D6",
+"4. c #5C94DB",
+"5. c #5A9BDC",
+"6. c #5397DF",
+"7. c #4986E5",
+"8. c #478BF2",
+"9. c #5992E3",
+"0. c #5B98E8",
+"q. c #5896F2",
+"w. c #568EE8",
+"e. c #5EA4E6",
+"r. c #5BAEFE",
+"t. c #56A7F0",
+"y. c #5DB0FF",
+"u. c #628ED5",
+"i. c #6194DB",
+"p. c #649EDC",
+"a. c #699CDC",
+"s. c #6695D4",
+"d. c #7694C4",
+"f. c #7D98D8",
+"g. c #6883C2",
+"h. c #6597E4",
+"j. c #629CF3",
+"k. c #769AE3",
+"l. c #74A2DE",
+"z. c #65A2E5",
+"x. c #65A7EA",
+"c. c #6AACEB",
+"v. c #69A7E7",
+"b. c #6DA5F5",
+"n. c #62AAF2",
+"m. c #62B2FF",
+"M. c #6AB5FD",
+"N. c #6DB8FF",
+"B. c #73A9E5",
+"V. c #7CABE4",
+"C. c #7EAAEB",
+"Z. c #76A5E6",
+"A. c #79ADF5",
+"S. c #71A6F3",
+"D. c #75B0EC",
+"F. c #7AB3EB",
+"G. c #75BBFE",
+"H. c #79BDFE",
+"J. c #78B5F1",
+"K. c #7DC0FE",
+"L. c #928F9A",
+"P. c #85A1BE",
+"I. c #A7A3AD",
+"U. c #ACACBA",
+"Y. c #B2B2BF",
+"T. c #8C9FD2",
+"R. c #969FC6",
+"E. c #8CA0DA",
+"W. c #87AFD6",
+"Q. c #98A9CA",
+"!. c #9DAAD8",
+"~. c #9AB2CA",
+"^. c #82A8E5",
+"/. c #82B3EB",
+"(. c #8BB2EA",
+"). c #88B7E8",
+"_. c #85BAF3",
+"`. c #8AB9F1",
+"'. c #94ADE4",
+"]. c #96BAEB",
+"[. c #91BEFB",
+"{. c #A0ACD8",
+"}. c #A0B2D5",
+"|. c #A2BCD6",
+" X c #ACB4D9",
+".X c #ABB3D8",
+"XX c #BEBECB",
+"oX c #B7B6C2",
+"OX c #B4B9DA",
+"+X c #BABCDB",
+"@X c #B9B6D4",
+"#X c #ACBEE6",
+"$X c #A5B8E7",
+"%X c #84C3FE",
+"&X c #89C6FF",
+"*X c #8DC8FE",
+"=X c #93CBFF",
+"-X c #9AC4F4",
+";X c #9ACEFD",
+":X c #9CC9F7",
+">X c #9DD0FF",
+",X c #ABC3DB",
+"<X c #AAC3EC",
+"1X c #A1C3F5",
+"2X c #AAC5F1",
+"3X c #A7CAF5",
+"4X c #A3D3FF",
+"5X c #AAD5FD",
+"6X c #AED8FF",
+"7X c #ABD0F6",
+"8X c #B1CBE5",
+"9X c #B9C8EC",
+"0X c #B1C6EB",
+"qX c #B9CCF1",
+"wX c #BAD4ED",
+"eX c #B4D1F2",
+"rX c #B3DBFE",
+"tX c #BAD4F1",
+"yX c #B9DDFE",
+"uX c #B5D7FA",
+"iX c #BDE0FE",
+"pX c #CFB6BE",
+"aX c #D2A3A8",
+"sX c #EBBBBF",
+"dX c #CBBDD2",
+"fX c #C1C1CB",
+"gX c #C4C4D2",
+"hX c #C6C6DA",
+"jX c #CBCBD3",
+"kX c #CACADC",
+"lX c #C6C9DB",
+"zX c #D8D5DB",
+"xX c #CCCDE1",
+"cX c #C3D7EB",
+"vX c #C9DFF5",
+"bX c #DEDEE3",
+"nX c #C2E3FE",
+"mX c #CAE8FF",
+"MX c #C9E3FA",
+"NX c #DBE0EB",
+"BX c #D4E5F7",
+"VX c #E7CDD0",
+"CX c #F8C4C5",
+"ZX c #FCD2D2",
+"AX c #F3DADD",
+"SX c #E4E4EA",
+"DX c #E9E9EE",
+"FX c #ECE7EB",
+"GX c #E3EEFA",
+"HX c #EDEDF1",
+"JX c #E4F3FE",
+"KX c #F1F1F4",
+"LX c #F6F6F8",
+"PX c #FDF2F2",
+"IX c #FCFCFD",
+"UX c #F2F8FD",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXv ^ 4.l.^.).).V.l.3.n c YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXt M <.(.qXtX0X#X<X0XtX7Xl.O.* YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXK 3.2X<X!. at XxXgXkXkX X!.eX].o.3 YXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXy 3.-X'.OXjXDXKXSXHXHXSXgX.X'.).O./ / J t r YXYXYXYXYXYXYXYX",
+"YXe @.`.E.xXDXHXLXIXIXLXIXLXHXFXOX^.C.}.tX].4.J r t YXYXYXYXYXYX",
+"YXG h.Z.R.bXHXIXIXIXIXIXIXIXLXKXSXE.A.f.NXUXJXiXi.K e YXYXYXYXYX",
+"YX( h.f.dXU.,XHXIXIXIXIXIXIXIXIXSXlXi.k.}.GXGXGXnX/.T r YXYXYXYX",
+"YX( 8.$XDXSXjXY.jXKXIXPXPXLXKXFXKXSXT.8.d.BXBXBXBXuX_.#.9 YXYXYX",
+"YX~ } hXHXLXIXDXfXoXjXaXpXXXY.jXKXSX!. .+.vXMXMXvXvX).c.L & YXYX",
+"YXQ ] dXbXIXIXIXIXzXI.L.XXbXHXLXUXzXQ.] o.wXwXwXwXwXwX5.z.F   YX",
+"YXQ } hXHXIXIXIXIXCXVXbXKXIXIXIXUXSX{.} o.wXwX8X8X8X8XW.=.$.+ YX",
+"YXQ 8.#XDXLXIXIXZXCXIXIXIXIXIXIXLXSXT. .>.cX,X,X,X,X>.z a x.j X ",
+"YX! 8.T.kXDXUXZXCXIXIXIXIXIXIXIXSXhXk.7.:.P.~.~.d...s , < O.#.@ ",
+"YXi &.C. at XDXAXCXPXIXIXIXIXIXLXKXSX{.S. at .:.:.:.7 6 : ; ; : s a.3 ",
+"YX8 W j.'.dXsXFXLXLXIXLXIXKXHXSX at X(.7.f 6 4 4 > k 6 < p ; ; a.C ",
+"YXYXi { S.$X at XjXDXHXSXDXHXSXgXOX$Xw.F < 4 < < < p k I Y Y z p.D ",
+"YXYXYXu | b.<X+X+XkXfXhXhX+X+X1Xq.$.Y q p p p p p d *.,.e.*.l.Z ",
+"YXYXYXYX' / _ A.2XqX9X9XqX-XA.&.9.G.5.g d d d d l 6.m.,.Y p._.Z ",
+"YXYXYXYX' O.h m E ) $.$.%.&.7.t.M.N.e.z g g k d *.M.n.c.D.-X%X7 ",
+"YXYXYXYX' 2.h l l l I t.y.y.y.y.m.y.t.I l l B ` N.G.5.R ;.F.l.2 ",
+"YXYXYXYX^ a.N N B T <.M.m.y.y.y.r.y.y.` N N U 6.K.%Xz.B B 2.s.* ",
+"YXYXYXYXv 5.` V ,.K.K.G.G.N.N.N.M.N.N.n.V U x.K.K.D.V.U U ).A O ",
+"YXYXYXYXb ^ V.U D.=X%X%XK.K.K.G.G.G.G.H.x.J.%X&X_.v.;XV.a./.$   ",
+"YXYXYXYXYXb 5.4.B.;X=X=X*X&X&X%X%X%X&X&X&X=X=X;X;X>X6XrX7XP . YX",
+"YXYXYXYXYXv ^ F.a.;X4X;X;X;X=X=X=X=X=X=X;X;X;X4X5X6XrXiXs.*   YX",
+"YXYXYXYXYXYX0 U :XrXrX6X4X4X4X4X4X4X4X4X4X5X6XrXyXiXnXV.= . YXYX",
+"YXYXYXYXYXYXYX- R :XiXyXrXrXrX6X6X6X6XrXrXrXrXvXnXmXV.q X   YXYX",
+"YXYXYXYXYXYXYXYX# m V.uXiX3X7X6XrXyXyXiXnXnXmXmX7X1.% . YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXO g #._.A.j.q.j.b.q.b.[.rXyXV.A * .   YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXX - I 1.4.j.h.0.0.<.#.j @     YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX. O = 1 5 7 7 3 * # X   YXYXYXYXYXYXYXYX"
+};

Added: 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.amor	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.amor	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdetoys-doc-html-amor
+Title: AMOR Handbook
+Author: Karl Garrison <karl at indy.rr.com>
+Abstract: AMOR is a small animation which sits on top of your active window.
+Section: Games/Toys
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/amor/index.html
+Files: /usr/share/doc/kde/HTML/en/amor/*.html
+

Added: 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.kmoon	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdetoys-doc-html-kmoon
+Title: KMoon Handbook
+Author: Pam Roberts <pamroberts at blueyonde.co.uk>
+Abstract: KMoon is an applet that shows the current phase of the moon.
+Section: Games/Toys
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kmoon/index.html
+Files: /usr/share/doc/kde/HTML/en/kmoon/*.html
+

Added: 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.kodo	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kodo	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdetoys-doc-html-kodo
+Title: KOdometer Handbook
+Author: Armen Nakashian <armen at tourismo.com>
+Abstract: KOdometer is a little gadget to measure your desktop mileage.
+Section: Games/Toys
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kodo/index.html
+Files: /usr/share/doc/kde/HTML/en/kodo/*.html
+

Added: 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.kteatime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdetoys-doc-html-kteatime
+Title: KTeaTime Handbook
+Author: Michael Korman <michael.korman at uconn.edu>
+Abstract: This Handbook describes KTeaTime, the KDE Tea Cooker.
+Section: Games/Toys
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kteatime/index.html
+Files: /usr/share/doc/kde/HTML/en/kteatime/*.html
+

Added: 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.kweather	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kweather	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdetoys-doc-html-kweather
+Title: KWeather Handbook
+Abstract: KWeather is an application that can display your area's current
+ weather.  It provides a panel applet as well as a weather service that
+ can supply information to other applications.
+Section: Games/Toys
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kweather/index.html
+Files: /usr/share/doc/kde/HTML/en/kweather/*.html
+

Added: people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Document: kdetoys-doc-html-kworldclock
+Title: KWorldClock Handbook
+Author: Brad Hards
+Abstract: KWorldClock is an application that shows which parts of the world
+ are currently experiencing daylight, and which parts are currently in night.
+ It also shows the current time in a range of cities around the world.
+Section: Games/Toys
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kworldclock/index.html
+Files: /usr/share/doc/kde/HTML/en/kworldclock/*.html
+

Added: people/jriddell/KDE/3.5/kdetoys/debian/kdetoys.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kdetoys.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kdetoys.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+KDE Toys for Debian
+-------------------
+
+Package kdetoys is a metapackage that depends on the full set of toys
+provided with the official release of KDE.
+
+Each application 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 kdetoys-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

Added: people/jriddell/KDE/3.5/kdetoys/debian/kmoon.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kmoon.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kmoon.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KMoon for Debian
+----------------
+
+This application 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 kdetoys-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 31 Jan 2004 12:08:48 +1100

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/kmoon.install
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kmoon.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kmoon.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+debian/tmp/usr/lib/kde3/kmoon_panelapplet.la
+debian/tmp/usr/lib/kde3/kmoon_panelapplet.so
+debian/tmp/usr/share/apps/kicker/applets/kmoonapplet.desktop
+debian/tmp/usr/share/apps/kmoon
+debian/tmp/usr/share/doc/kde/HTML/en/kmoon/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kmoon/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kmoon/*.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmoon/carlosmail
+debian/tmp/usr/share/doc/kde/HTML/en/kmoon/common
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmoon.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmoon.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kmoon.png

Added: people/jriddell/KDE/3.5/kdetoys/debian/kodo.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kodo.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kodo.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KOdometer for Debian
+--------------------
+
+This application 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 kdetoys-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Mon, 12 May 2003 12:29:39 +1000

Added: people/jriddell/KDE/3.5/kdetoys/debian/kodo.install
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kodo.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kodo.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+debian/tmp/usr/bin/kodo
+debian/tmp/usr/share/applications/kde/kodo.desktop
+debian/tmp/usr/share/apps/kodo/numbers.png
+debian/tmp/usr/share/doc/kde/HTML/en/kodo/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kodo/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kodo/*.png
+debian/tmp/usr/share/doc/kde/HTML/en/kodo/common
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kodo.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kodo.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kodo.png
+
+debian/icons/kodo.xpm	usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/kodo.menu
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kodo.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kodo.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kodo):\
+	needs="x11"\
+	section="Games/Toys"\
+	hints="KDE"\
+	title="KOdometer"\
+	longtitle="KOdometer (Measure Your Desktop Mileage)"\
+	icon="/usr/share/pixmaps/kodo.xpm"\
+	command="/usr/bin/kodo"
+

Added: people/jriddell/KDE/3.5/kdetoys/debian/kteatime.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kteatime.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kteatime.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+KTeaTime for Debian
+-------------------
+
+Non-KDE Users:
+
+  Please note that KTeaTime is written explicitly for KDE.  If you are
+  using a non-KDE window manager or desktop environment then it is quite
+  possible that KTeaTime will not work on your system.
+
+HTML Documentation:
+
+  This application 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 kdetoys-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sun,  6 Feb 2005 17:51:59 +1100

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/kteatime.install
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kteatime.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kteatime.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+debian/tmp/usr/bin/kteatime
+debian/tmp/usr/share/applications/kde/kteatime.desktop
+debian/tmp/usr/share/apps/kteatime
+debian/tmp/usr/share/doc/kde/HTML/en/kteatime/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kteatime/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kteatime/*.png
+debian/tmp/usr/share/doc/kde/HTML/en/kteatime/common
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kteatime.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kteatime.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kteatime.png
+
+debian/icons/kteatime.xpm	usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/kteatime.menu
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kteatime.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kteatime.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+?package(kteatime):\
+	needs="x11"\
+	section="Games/Toys"\
+	hints="KDE"\
+	title="KTeaTime"\
+	longtitle="KTeaTime (Tea Cooker)"\
+	icon="/usr/share/pixmaps/kteatime.xpm"\
+	command="/usr/bin/kteatime"
+

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/ktux.install
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/ktux.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/ktux.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+debian/tmp/usr/bin/ktux
+debian/tmp/usr/share/apps/ktux
+debian/tmp/usr/share/applnk/System/ScreenSavers/ktux.desktop
+debian/tmp/usr/share/icons/hicolor/32x32/apps/ktux.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/ktux.png
+
+debian/icons/ktux.xpm	usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/ktux.menu
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/ktux.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/ktux.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(ktux):\
+	needs="x11"\
+	section="Screen/Lock"\
+	hints="KDE"\
+	title="KTux"\
+	icon="/usr/share/pixmaps/ktux.xpm"\
+	command="/usr/bin/ktux -root"
+

Added: people/jriddell/KDE/3.5/kdetoys/debian/kweather.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kweather.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kweather.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KWeather for Debian
+-------------------
+
+This application 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 kdetoys-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 31 Jan 2004 12:08:48 +1100

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/kweather.install
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kweather.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kweather.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,26 @@
+debian/tmp/usr/bin/kweatherservice
+debian/tmp/usr/bin/kweatherreport
+debian/tmp/usr/lib/libkdeinit_kweatherreport.so
+debian/tmp/usr/lib/libkdeinit_kweatherreport.la
+debian/tmp/usr/lib/kde3/kcm_weather.so
+debian/tmp/usr/lib/kde3/kcm_weather.la
+debian/tmp/usr/lib/kde3/kcm_weatherservice.so
+debian/tmp/usr/lib/kde3/kcm_weatherservice.la
+debian/tmp/usr/lib/kde3/kweatherreport.so
+debian/tmp/usr/lib/kde3/kweatherreport.la
+debian/tmp/usr/lib/kde3/weather_panelapplet.la
+debian/tmp/usr/lib/kde3/weather_panelapplet.so
+debian/tmp/usr/share/apps/kicker/applets/kweather.desktop
+debian/tmp/usr/share/apps/kweather
+debian/tmp/usr/share/apps/kweatherservice/stations.dat
+debian/tmp/usr/share/apps/kweatherservice/weather_stations.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kweather/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kweather/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kweather/*.png
+debian/tmp/usr/share/doc/kde/HTML/en/kweather/common
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kweather.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kweather.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kweather.png
+debian/tmp/usr/share/services/kweatherservice.desktop
+debian/tmp/usr/share/services/kcmweather.desktop
+debian/tmp/usr/share/services/kcmweatherservice.desktop

Added: people/jriddell/KDE/3.5/kdetoys/debian/kweather.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kweather.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kweather.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+kweather: no-shlibs-control-file usr/lib/libkdeinit_kweatherreport.so

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+KWorldClock for Debian
+----------------------
+
+This application 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 kdetoys-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Sat, 16 Oct 2004 14:09:26 +1000

Added: people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.install
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+debian/tmp/usr/bin/kworldclock
+debian/tmp/usr/lib/kde3/ww_panelapplet.la
+debian/tmp/usr/lib/kde3/ww_panelapplet.so
+debian/tmp/usr/share/applications/kde/kworldclock.desktop
+debian/tmp/usr/share/apps/kdesktop/programs/kdeworld.desktop
+debian/tmp/usr/share/apps/kicker/applets/kwwapplet.desktop
+debian/tmp/usr/share/apps/kworldclock
+debian/tmp/usr/share/doc/kde/HTML/en/kworldclock/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kworldclock/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kworldclock/*.png
+debian/tmp/usr/share/doc/kde/HTML/en/kworldclock/common
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kworldclock.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kworldclock.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kworldclock.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kworldclock.png
+
+debian/icons/kworldclock.xpm	usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.menu
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kworldclock):\
+	needs="x11"\
+	section="Games/Toys"\
+	hints="KDE"\
+	title="KWorldClock"\
+	icon="/usr/share/pixmaps/kworldclock.xpm"\
+	command="/usr/bin/kworldclock"
+

Added: people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.postinst
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.postinst	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.postinst	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+# Link /usr/share/apps/kworldwatch to /usr/share/apps/kworldclock.
+if [ "$1" = "configure" ]; then
+	if [ -d /usr/share/apps -a ! -e /usr/share/apps/kworldwatch -a -d /usr/share/apps/kworldclock ]; then
+		ln -sf kworldclock /usr/share/apps/kworldwatch
+	fi
+fi
+
+#DEBHELPER#
+exit 0

Added: people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.prerm
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.prerm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/kworldclock.prerm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+# Remove the link /usr/share/apps/kworldwatch.
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/share/apps/kworldwatch ]; then
+	rm -f /usr/share/apps/kworldwatch
+fi
+
+#DEBHELPER#
+exit 0

Added: people/jriddell/KDE/3.5/kdetoys/debian/man/amor.1
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/man/amor.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/man/amor.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 AMOR 1 "October 16, 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
+amor \- a KDE creature for your desktop
+.SH SYNOPSIS
+.B amor
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBAMOR\fP (Amusing Misuse Of Resources) provides several different
+characters who prance around your X screen doing tricks and
+giving you tips.
+.PP
+Note AMOR will only work with some window managers.  Both KWin (the KDE
+window manager) and Metacity (a GTK2 window manager) are supported.
+.PP
+This program is part of the official KDE toys module.
+.SH OPTIONS
+For a full summary of options, run \fIamor \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/amor/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/amor/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/amor/\fP.
+.SH AUTHOR
+AMOR was written by Martin R. Jones <mjones at kde.org> and
+Gerardo Puga <gpuga at gioia.ing.unlp.edu.ar>.
+.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/kdetoys/debian/man/kodo.1
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/man/kodo.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/man/kodo.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,48 @@
+.\"                                      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 KODO 1 "October 16, 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
+kodo \- mouse odometer for KDE
+.SH SYNOPSIS
+.B kodo
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKOdometer\fP measures your desktop mileage. It tracks the movement of
+your mouse pointer across your desktop and renders it in
+inches/feet/miles!  It can do cm/metres/km too.  Its most exciting
+feature is the tripometer, and its utter uselessness.
+.PP
+This program is part of the official KDE toys module.
+.SH OPTIONS
+For a full summary of options, run \fIkodo \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kodo/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kodo/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kodo/\fP.
+.SH AUTHOR
+KOdometer was written by Armen Nakashian <armen at tourismo.com> and
+Mark H. Granoff/mhg <granoff at keptin.lkg.dec.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/kdetoys/debian/man/kteatime.1
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/man/kteatime.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/man/kteatime.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 KTEATIME 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
+kteatime \- KDE utility for making a fine cup of tea
+.SH SYNOPSIS
+.B kteatime
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKTeaTime\fP is a handy timer for steeping tea.  No longer will you have to
+guess at how long it takes for your tea to be ready.  Simply select the
+type of tea you have, and it will alert you when the tea is ready to drink.
+.PP
+KTeaTime sits in the KDE system tray.
+.PP
+This program is part of the official KDE toys module.
+.SH OPTIONS
+For a full summary of options, run \fIkteatime \-\-help\fP.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kteatime/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kteatime/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kteatime/\fP.
+.SH AUTHOR
+KTeaTime was written by Matthias Hoelzer-Kluepfel <hoelzer at kde.org> and
+Martin Willers <willers at xm-arts.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/kdetoys/debian/man/ktux.1
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/man/ktux.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/man/ktux.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 KTUX 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
+ktux \- Tux screen saver for KDE
+.SH SYNOPSIS
+.B ktux
+.RI "[ " generic-options " ]"
+[ \fB\-\-setup\fP | \fB\-\-window-id\fP \fIwid\fP | \fB\-\-root\fP |
+\fB\-\-demo\fP ]
+.SH DESCRIPTION
+\fBKTux\fP is a neat Tux screen saver for the K Desktop Environment (KDE).
+.PP
+This program is part of the official KDE toys module.
+.SH OPTIONS
+Below are the ktux-specific options.
+For a full summary of options, run \fIktux \-\-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
+KTux was written by Martin R. Jones <mjones at kde.org> and Carlos Rego.
+.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/kdetoys/debian/man/kweatherreport.1
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/man/kweatherreport.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/man/kweatherreport.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,56 @@
+.\"                                      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 KWEATHERREPORT 1 "October 16, 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
+kweatherreport \- ask KWeatherService to display a weather report
+.SH SYNOPSIS
+.B kweatherreport
+.RI "[ " generic-options " ] " location
+.SH DESCRIPTION
+\fBkweatherreport\fP is a small program that asks KWeatherService to display
+a weather report.  Information shown includes the temperature, wind speed,
+air pressure and more.
+.PP
+\fBKWeatherService\fP is a DCOP service that can track multiple weather
+stations to provide weather data.  There is no need to start
+KWeatherService separately; kweatherreport will start the service
+itself if needed.
+.PP
+This program is part of the official KDE toys module.
+.SH OPTIONS
+Below are the kweather-specific options.
+For a full summary of options, run \fIkweatherreport \-\-help\fP.
+.TP
+.I location
+The METAR location code for the weather station to display.
+.SH SEE ALSO
+.BR kweatherservice (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL \fIhelp:/kweather/\fP
+directly into konqueror or you can run `\fIkhelpcenter help:/kweather/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kweather/\fP.
+.SH AUTHOR
+KWeather was written by Ian Reinhart Geiser <geiseri at kde.org>,
+Nadeem Hasan <nhasan at kde.org> and Tobias Koenig <tokoe 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/kdetoys/debian/man/kweatherservice.1
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/man/kweatherservice.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/man/kweatherservice.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 KWEATHERSERVICE 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
+kweatherservice \- a DCOP service to provide weather data
+.SH SYNOPSIS
+.B kweatherservice
+.RI "[ " generic-options " ]"
+.SH DESCRIPTION
+\fBKWeatherService\fP is a DCOP service that can track multiple weather
+stations and provide this weather data to other applications.  It is
+used by the \fBKWeather\fP applet for the KDE panel, by the
+\fBkweatherreport\fP application and by weather plugins for other
+applications such as \fBKonqueror\fP and \fBKontact\fP.
+.PP
+This program is for KWeather's internal use and should not be
+run directly.  To obtain a weather report, use the KWeather panel applet or
+run kweatherreport instead.
+.PP
+This program is part of the official KDE toys module.
+.SH OPTIONS
+For a full summary of options, run \fIkweatherservice \-\-help\fP.
+.SH SEE ALSO
+.BR kweatherreport (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL \fIhelp:/kweather/\fP
+directly into konqueror or you can run `\fIkhelpcenter help:/kweather/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kweather/\fP.
+.SH AUTHOR
+KWeather was written by Ian Reinhart Geiser <geiseri at kde.org>,
+Nadeem Hasan <nhasan at kde.org> and Tobias Koenig <tokoe 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/kdetoys/debian/man/kworldclock.1
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/man/kworldclock.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/man/kworldclock.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,70 @@
+.\"                                      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 KWORLDCLOCK 1 "October 16, 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
+kworldclock \- earth watcher for KDE
+.SH SYNOPSIS
+.B kworldclock
+.RI "[ " generic-options " ]"
+[ \fB\-\-dump\fP
+[ \fB\-\-theme\fP \fIfile\fP ]
+[ \fB\-o\fP \fIfile\fP ]
+[ \fB\-\-size\fP\ \fIW\fP\fBx\fP\fIH\fP ]]
+.PP
+.B kworldclock \-\-themes
+.SH DESCRIPTION
+\fBKWorldClock\fP displays where in the world it is light and dark
+depending on time, as well as offering the time in all of the major
+cities of the world.  This can be run standalone, as an applet in the
+KDE panel or as a desktop background.
+.PP
+This program is part of the official KDE toys module.
+.SH OPTIONS
+Below are the kworldclock-specific options.
+For a full summary of options, run \fIkworldclock \-\-help\fP.
+.TP
+\fB\-\-dump\fP
+Write out a file containing the actual map.
+.TP
+\fB\-\-theme\fP \fIfile\fP
+The name of the theme to use for a map dump (default: depths).
+.TP
+\fB\-\-themes\fP
+Display a list of all available themes.
+.TP
+\fB\-o\fP \fIfile\fP
+The name of the file to write to for a map dump (default: dump.ppm).
+.TP
+\fB\-\-size\fP\ \fIW\fP\fBx\fP\fIH\fP
+The size of the map to dump.
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kworldclock/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kworldclock/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdetoys-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kworldclock/\fP.
+.SH AUTHOR
+KWorldClock was written by Matthias Hoelzer-Kluepfel <hoelzer 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/kdetoys/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/patches/common/07_disable-visibility.diff
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/patches/common/07_disable-visibility.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/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/kdetoys/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdetoys/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdetoys/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+#! /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_INSTALL_CHANGELOGS_kodo := kodo/ChangeLog
+DEB_INSTALL_CHANGELOGS_kteatime := kteatime/ChangeLog


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

Added: people/jriddell/KDE/3.5/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+no bulid-dep on tpctl (universe)

Added: people/jriddell/KDE/3.5/kdeutils/debian/ark.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/ark.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/ark.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,37 @@
+debian/tmp/usr/bin/ark
+debian/tmp/usr/lib/kde3/ark.la
+debian/tmp/usr/lib/kde3/ark.so
+debian/tmp/usr/lib/kde3/libarkpart.la
+debian/tmp/usr/lib/kde3/libarkpart.so
+debian/tmp/usr/lib/libkdeinit_ark.so
+debian/tmp/usr/share/applications/kde/ark.desktop
+debian/tmp/usr/share/apps/ark/ark_part.rc
+debian/tmp/usr/share/apps/ark/ark_part_readonly.rc
+debian/tmp/usr/share/apps/ark/arkui.rc
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_adddir.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_addfile.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_delete.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_extract.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_view.png
+debian/tmp/usr/share/config.kcfg/ark.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/ark/common
+debian/tmp/usr/share/doc/kde/HTML/en/ark/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/ark/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/ark/man-ark.1.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/ark.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/ark.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/ark.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/ark.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/ark.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/ark.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/ark.svgz
+debian/tmp/usr/share/services/ark_part.desktop
+
+debian/icons/ark.xpm		/usr/share/pixmaps
+debian/icons/ark-16.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeutils/debian/ark.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/ark.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/ark.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+ark: no-shlibs-control-file usr/lib/libkdeinit_ark.so
+ark: postinst-must-call-ldconfig usr/lib/libkdeinit_ark.so
+ark: postrm-should-call-ldconfig usr/lib/libkdeinit_ark.so

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/ark.mime
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/ark.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/ark.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+application/x-archive;	ark -caption "Archiver" %s;	nametemplate=%s.a;	test=test "$DISPLAY" != "";	priority=7
+application/x-bzip;	ark -caption "Archiver" %s;	nametemplate=%s.bz;	test=test "$DISPLAY" != "";	priority=7
+application/x-gzip;	ark -caption "Archiver" %s;	nametemplate=%s.gz;	test=test "$DISPLAY" != "";	priority=7
+application/x-lha;	ark -caption "Archiver" %s;	nametemplate=%s.lha;	test=test "$DISPLAY" != "";	priority=7
+application/x-lzop;	ark -caption "Archiver" %s;	nametemplate=%s.lzo;	test=test "$DISPLAY" != "";	priority=7
+application/x-rar;	ark -caption "Archiver" %s;	nametemplate=%s.rar;	test=test "$DISPLAY" != "";	priority=7
+application/x-tar;	ark -caption "Archiver" %s;	nametemplate=%s.tar;	test=test "$DISPLAY" != "";	priority=7
+application/x-tarz;	ark -caption "Archiver" %s;	nametemplate=%s.tar.Z;	test=test "$DISPLAY" != "";	priority=7
+application/x-tbz;	ark -caption "Archiver" %s;	nametemplate=%s.tbz;	test=test "$DISPLAY" != "";	priority=7
+application/x-tgz;	ark -caption "Archiver" %s;	nametemplate=%s.tgz;	test=test "$DISPLAY" != "";	priority=7
+application/x-tzo;	ark -caption "Archiver" %s;	nametemplate=%s.tzo;	test=test "$DISPLAY" != "";	priority=7
+application/x-zip;	ark -caption "Archiver" %s;	nametemplate=%s.zip;	test=test "$DISPLAY" != "";	priority=7
+application/x-zoo;	ark -caption "Archiver" %s;	nametemplate=%s.zoo;	test=test "$DISPLAY" != "";	priority=7
+application/gzip;	ark -caption "Archiver" %s;	nametemplate=%s.gz;	test=test "$DISPLAY" != "";	priority=7
+application/zip;	ark -caption "Archiver" %s;	nametemplate=%s.zip;	test=test "$DISPLAY" != "";	priority=7

Added: people/jriddell/KDE/3.5/kdeutils/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,1040 @@
+kdeutils (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Build-dep on libsnmp5-dev | libsnmp9-dev for backports
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 14:26:07 +0000
+
+kdeutils (4:3.5.0-0ubuntu4) dapper; urgency=low
+
+  * Add kubuntu_08_kwallermanager_menu_tidy.diff to 
+    remove KWallet from menu (can be launched from systray)
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jan 2006 15:20:43 +0000
+
+kdeutils (4:3.5.0-0ubuntu3) dapper; urgency=low
+
+  * Rebuild because libXft.la is gone
+
+ -- Stephan Hermann <sh at sourcecode.de>  Sat, 14 Jan 2006 15:52:30 +0100
+
+kdeutils (4:3.5.0-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_07_tidy_messages.diff to rm generated 
+    tips.cpp file
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu,  8 Dec 2005 03:02:34 +0000
+
+kdeutils (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:29:24 +0000
+
+kdeutils (4:3.5-rc2-0ubuntu2) dapper; urgency=low
+
+  * Build-dep on libsnmp9-dev not libsnmp5-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 26 Nov 2005 17:41:10 +0000
+
+kdeutils (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:51:19 +0000
+
+kdeutils (4:3.5-rc1-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Nov 2005 01:18:32 +0000
+
+kdeutils (4:3.5-rc1-1) alioth; urgency=low
+
+  * New upstream pre-release.
+
+  +++ Changes by Christopher Martin:
+
+  * New package: superkaramba. It is no longer an independent source package,
+    but has been merged in KDE.
+
+  * Also add a kdeutils-doc package, containing the superkaramba and kcalc
+    API documentation.
+
+  * Improve ark's description by referring to it as a _graphical_ archiving
+    tool. (Closes: #335839)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Nov 2005 08:38:48 -0500
+
+kdeutils (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch which fixes kfloppy formatting with udev, though auto-detection
+    remains broken. This is an adapted version of the patch submitted by
+    Edward J. Sharnock. (Closes: #329588, #278909, #264924)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Oct 2005 09:50:15 -0400
+
+kdeutils (4:3.4.2-3) unstable; urgency=low
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Build-Depend on libsnmp9-dev instead of libsnmp5-dev. (Closes: #328210)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 14 Sep 2005 11:59:43 +0200
+
+kdeutils (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Luk Claes:
+
+  * Build with g++-3.4 on arm, m68k and hppa; kdeutils triggers the same gcc 4.0
+    ICE as arts does.
+  
+  * Update FSF's address
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 10 Sep 2005 21:31:16 +0000
+
+kdeutils (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Pierre Habouzit:
+
+  * Change kdessh depends: ssh becomes (open)ssh-client. (Closes: #315045)
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch to disable klaptopdaemon's warning concerning
+    klaptop_acpi_helper's checksum when using the provided dialog to make
+    it SUID, since this warning always erroneously states that the
+    checksum has changed since installation.
+    (Closes: #247864).
+
+  +++ Changes by Luk Claes:
+
+  * Add me to uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun,  3 Jul 2005 21:25:30 +0200
+
+kdeutils (4:3.4.3-0ubuntu2) dapper; urgency=low
+
+  * Add missing build-depends
+
+ -- LaMont Jones <lamont at ubuntu.com>  Tue,  1 Nov 2005 14:49:18 -0700
+
+kdeutils (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build with GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  7 Oct 2005 19:57:56 +0000
+
+kdeutils (4:3.4.2-0ubuntu3) breezy; urgency=low
+
+  * Fix kubuntu_04_use_pmi.diff, call suspend on suspend not hibernate
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed,  5 Oct 2005 01:31:31 +0100
+
+kdeutils (4:3.4.2-0ubuntu2) breezy; urgency=low
+
+  * Add kubuntu_03_klaptopdaemon_35.diff make klaptopdaemon use scripts 
+    instead of /proc directly
+  * Add kubuntu_04_use_pmi.diff make klaptop_acpi_helper use /usr/sbin/pmi
+  * Add kubuntu_05_disable_nonsense_security_check.diff from SuSE, 
+    stop broken warning that binary doesn't match checksum
+  * Install klaptop_acpi_helper setuid root so it can be used by default
+  * Add kubuntu_06_lock_on_hibernate.diff reduce options to only lock on hibernate
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 29 Sep 2005 17:11:22 +0100
+
+kdeutils (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:26:03 +0000
+
+kdeutils (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+  * Add all packages back to meta-package
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 01:00:54 +0000
+
+kdeutils (4:3.4.1-0pre1ubuntu2) breezy; urgency=low
+
+  * Remove powerpc kmilo module from kmilo.install.powerpc until
+    pbbuttonsd-dev is in main
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 26 May 2005 18:18:31 +0000
+
+kdeutils (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+
+  * Sync with Debian, remove build-dep on pbbuttonsd-dev and tpctl
+    until they are in main
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 26 May 2005 13:29:29 +0000
+
+kdeutils (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
+
+kdeutils (4:3.4.0-0pre1) alioth; urgency=low
+
+  * New upstream release.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+    - klaptopdaemon won't trigger a suspend at startup. (Closes: #301362)
+
+  * Converted packaging to CDBS.
+
+  +++ Changes by Pierre Habouzit :
+
+  * [ark.mime] add handlers for application/(g)zip (closes: #297263).
+
+  * [debian/control] upgrade packages descriptions.
+
+  * New kdeutils-doc-html package, containing doc-base registered HTML versions
+    of application handbooks, for users without Konqueror or KHelpCenter.
+
+  +++ 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.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon,  4 Apr 2005 16:41:47 +0200
+
+kdeutils (4:3.3.2-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Change kgpg's section to kde. (Closes: #292399)
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Backport patch to make kgpg display the correct fingerprint for a key even
+    if '--fingerprint' is specified in the configuration file. Formerly, always
+    the last fingerprint was displayed. (Closes: #251342)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 Mar 2005 17:49:31 +0100
+
+kdeutils (4:3.3.2-1) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update.
+
+  * Fix debian/copyright to refer to License rather than to Copyright
+    when discussing KDE's licenses.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 26 Jan 2005 17:23:10 +0100
+
+kdeutils (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release:
+    - khexedit sorts numerically the 'Occurrence' and 'Percentage' columns in
+      the Statistics window. (Closes: #260929)
+  * KDE_3_3_BRANCH update.
+  * Remove build-dependency on automake1.9.
+  * Strengthen Suggests to Recommends on compression utilties found in
+    main. Also add Recommends on bzip2.
+  * Add patch fixing kfloppy + udev. (Closes: #273890)
+  * Add kcharselect manpage from Karolina Lindqvist. (Closes: #192570)
+  * Updated kmilo and ksim package descriptions. (Closes: #250094, #235347)
+
+ -- Christopher Martin <chrsmrtn at freeshell.org>  Thu, 16 Dec 2004 15:26:40 -0500
+
+kdeutils (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+  * Added kdessh Depends on ssh. (Closes: #271875)
+  * Added Build-Depends libxtst-dev. (Closes: #276835)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon,  8 Nov 2004 14:30:00 -0600
+
+kdeutils (4:3.3.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat, 14 Aug 2004 23:00:00 -0500
+
+kdeutils (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * Added kgpg Depends: gnupg. (Closes: #252132)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed,  4 Aug 2004 01:00:00 -0500
+
+kdeutils (4:3.2.2-2) unstable; urgency=high
+
+  * KDE_3_2_BRANCH pbuttonsd fix. (Closes: #245820)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon, 26 Apr 2004 21:00:00 -0500
+
+kdeutils (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added Build-Depends: pbbuttonsd-dev [powerpc]. (Closes: #242291)
+  * debian/*.menu: remove the obsolete kderemove tag.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 16 Apr 2004 20:00:00 -0500
+
+kdeutils (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added ark/kedit mime nametemplate support. (Closes: #235217)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat,  6 Mar 2004 18:00:00 -0600
+
+kdeutils (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 20 Feb 2004 04:00:00 -0600
+
+kdeutils (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+  * Apple Powerbook buttons are not supported due to pbbuttons missing from sid.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 30 Jan 2004 14:00:00 -0600
+
+kdeutils (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added libtool arm patch.
+  * libkregexpeditor renamed to kregexpeditor. (Closes: #210330)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed, 14 Jan 2004 03:00:00 -0600
+
+kdeutils (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>  Sat, 18 Oct 2003 04:00:00 -0500
+
+kdeutils (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon,  4 Aug 2003 00:00:00 -0500
+
+kdeutils (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update ark Suggests to arj (Closes: #188409)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sun, 25 May 2003 13:00:00 -0500
+
+kdeutils (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add 'chmod +x configure' to rules. (Closes: #181358)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed, 12 Mar 2003 12:00:00 -0600
+
+kdeutils (4:3.1.0-1) unstable; urgency=low
+
+  * New upstream.
+  * Redo debian dir.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 04 Feb 2003 22:00:00 -0600
+
+kdeutils (4:2.2.2-9.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>  Sat, 18 Jan 2003 20:27:49 +0100
+
+kdeutils (4:2.2.2-9.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>  Mon,  6 Jan 2003 21:04:20 +0100
+
+kdeutils (4:2.2.2-9) unstable; urgency=low
+
+  * Change Maintainer to Chris.
+  * Fix PowerPC problems.
+
+ -- Daniel Stone <daniel at sfarc.net>  Wed, 27 Feb 2002 22:22:08 +1100
+
+kdeutils (4:2.2.2-8) unstable; urgency=low
+
+  * Oh, I so desperately enjoy fixing these grave-severity s390
+    char-isn't-always-signed-you-dickhead bugs.
+  * klaptopdaemon/portable.cpp:
+    - See above. (closes: #127003)
+
+ -- Daniel Stone <daniel at sfarc.net>  Sun, 30 Dec 2001 07:56:15 -0500
+
+kdeutils (4:2.2.2-7) unstable; urgency=low
+
+  * Build against a post-Stone Age version of libstdc++. (closes: #125868)
+
+ -- Daniel Stone <daniel at sfarc.net>  Thu, 20 Dec 2001 14:10:19 +1100
+
+kdeutils (4:2.2.2-6) unstable; urgency=low
+
+  * New maintainer. (closes: #114104) 
+  * debian/{ark,kab,karm,kcalc,kcharselect,kdepasswd,kdf,kedit,kfind,kfloppy,
+    khexedit,kjots,kljettool,klpq,klprfax,knotes,kpm,kpmdocked,ktimer,kwikdisk}
+    .sgml, debian/*.manpages, debian/rules, debian/control:
+    - New manpages. I am _so_ over writing these now.
+  * Fix typos. (closes: #124417, #124839)
+
+ -- Daniel Stone <daniel at sfarc.net>  Fri, 30 Nov 2001 21:59:49 +1100
+
+kdeutils (4:2.2.2-5) unstable; urgency=low
+
+  * Fix autobuild
+  * This is why I should test it on alpha before uploading...
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 30 Nov 2001 01:12:00 -0700
+
+kdeutils (4:2.2.2-4) unstable; urgency=low
+
+  * Sync with upstream
+  * Update documentation for freeze
+  * cleanup build process even more
+  * Update build-deps/deps/etc...
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 29 Nov 2001 04:30:00 -0700
+
+kdeutils (4:2.2.2-3) unstable; urgency=low
+
+  * Fix Flags for alpha
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 28 Nov 2001 00:15:00 -0700
+
+kdeutils (4:2.2.2-2) unstable; urgency=low
+
+  * Autobuild fix for alpha
+  * Hey!  let's put the headers in the right place!  Can't believe I missed
+    this before..this must have been broken for quite some time.
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 27 Nov 2001 01:56:00 -0700
+
+kdeutils (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version
+  
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 07 Nov 2001 23:05:00 -0700
+
+kdeutils (4:2.2.1-1.4) unstable; urgency=low
+
+  * This *should* fix the autobuild problems for alpha
+  * Cleanup overrides
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 12 Oct 2001 23:05:00 -0700
+
+kdeutils (4:2.2.1-1.3) unstable; urgency=low
+
+  * Don't search for auto* as it hoses things
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 08 Oct 2001 19:36:00 -0700
+
+kdeutils (4:2.2.1-1.2) unstable; urgency=low
+
+  * Fix configure (Closes: #114580)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 05 Oct 2001 14:51:00 -0700
+
+kdeutils (4:2.2.1-1.1) unstable; urgency=low
+
+  * Don't use automake since it's hosed
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 03 Oct 2001 14:51:00 -0700
+
+kdeutils (4:2.2.1-1) unstable; urgency=low
+ 
+  * New upstream version 2.2.1
+  * Change maintainer
+  * Lintian fixes
+  * Fix description (Closes: #109118)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 07 Sep 2001 14:51:00 -0700
+
+kdeutils (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
+
+kdeutils (4:2.2.0-0.1beta1-1) unstable; urgency=low
+ 
+  * Sync with upstream
+  * More gcc3 fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 26 Jul 2001 20:22:00 -0700
+
+kdeutils (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * Sync with upstream
+  * More alpha fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 07 Jul 2001 03:44:00 -0700
+
+kdeutils (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:37:00 -0700
+
+kdeutils (4:2.2.0-0beta1-1) unstable; urgency=low
+ 
+  * Sync with upstream
+  * Fix ktimer description (Closes: #102939)
+  * Fix mips build
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 30 Jun 2001 20:30:00 -0700
+
+kdeutils (4:2.2-cvs20010622-1) unstable; urgency=low
+ 
+  * New upstream cvs pull
+  * 2.2 beta 1
+  * Adding in Enhances
+  * New package: klprfax (Closes: #100507)
+  * Fixes these problems:
+         %CPU field problem (Closes: #85272)
+         bad translation in df causes kdf to crash (Closes: 94011)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
+
+kdeutils (4:2.1.1-2) unstable; urgency=low
+ 
+  * Update menu bits to include new kde menu remval tag
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 08 Apr 2001 17:48:00 -0700
+
+kdeutils (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 15:13:00 -0700
+
+kdeutils (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Mar 2001 15:13:00 -0700
+
+kdeutils (4:2.1.0-2) unstable; urgency=low
+ 
+  * Fix kfloppy by switching from fdformat to superformat...it now at least
+    formats. 
+  * Some other upstream updates as well
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 12 Mar 2001 15:13:00 -0700
+
+kdeutils (4:2.1.0-1) unstable; urgency=low
+ 
+  * New upstream CVS pull
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 08 Mar 2001 02:03:00 -0700
+
+kdeutils (4:2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Upping standards version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdeutils (4:2.1-beta2-0128-1) unstable; urgency=low
+ 
+  * kdf re-added
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 29 Jan 2001 10:46:00 -0700
+
+kdeutils (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
+
+kdeutils (4:2.1-20010115-1) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
+
+kdeutils (4:2.1-20010106-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Updating/fixing depends and build-depends
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 06 Jan 2001 23:30:00 -0700
+
+kdeutils (4:2.1-20010101-1) unstable; urgency=low
+ 
+  * More upstream fixes
+        
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 01 Jan 2001 17:11:00 -0700
+	 
+kdeutils (4:2.1-20001218-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Removing extra mime files (Closes: #79887)
+  * Adding in new menu hints (Closes: #80030, #80021, #80068))
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Dec 2000 09:55:00 -0700
+
+kdeutils (4:2.1-20001216-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in missing conflicts for kdeutils
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 16 Dec 2000 23:55:00 -0700
+
+kdeutils (4:2.1-20001213-1) unstable; urgency=low
+ 
+  * New upstream beta version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 13 Dec 2000 18:00:00 -0700
+
+kdeutils (4:2.0-final-7) unstable; urgency=low
+ 
+  * Fixing package confliction (Closes: #77670)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 21 Nov 2000 17:00:00 -0700
+
+kdeutils (4:2.0-final-6) unstable; urgency=low
+ 
+  * more upstream fixes
+  * build-depends cleanup
+  * adding in lintian overrides
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 21 Nov 2000 07:30:00 -0700
+
+kdeutils (4:2.0-final-5) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 18 Nov 2000 06:30:00 -0700
+
+kdeutils (4:2.0-final-4) unstable; urgency=low
+ 
+  * more upstream fixes
+  * adding in menu hints
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
+
+kdeutils (4:2.0-final-3) unstable; urgency=low
+ 
+  * more upstream fixes
+  * mime entry fixes (again)
+  * build against new xlibs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
+                                                                                
+kdeutils (4:2.0-final-2) unstable; urgency=low
+ 
+  * more upstream fixes
+  * mime entry fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
+                                                                                
+kdeutils (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
+                                                                                
+kdeutils (4:2.0-20001016-0) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
+
+kdeutils (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
+                                                                                
+kdeutils (4:2.0-20001006-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 06 Oct 2000 15:00:00 -0700
+                                                                                
+kdeutils (4:2.0-20001005-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Compiling against non-versioned kdelibs again
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
+                                                                                
+kdeutils (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
+                                                                                
+kdeutils (4:2.0-20000925-2) unstable; urgency=low
+
+  * More upstream fixes
+  * Clean build against new libc
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 26 Sep 2000 23:30:00 -0700
+
+kdeutils (4:2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Build-Depends fixes
+  * Fixing kdf-kdessh file mixup (Closes: #72413)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdeutils (4:2.0-20000920-2) unstable; urgency=low
+ 
+  * Removing kdessh and setting proper depends for ark
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 21 Sep 2000 17:30:00 -0700
+
+kdeutils (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
+
+kdeutils (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Sep 2000 23:00:00 -0700      
+
+kdeutils (4:2.0-20000912-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing old confliction/dependency loop
+  * Breaking up packages
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 12 Sep 2000 23:00:00 -0700
+
+kdeutils (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
+
+kdeutils (4:2.0-20000907-2) unstable; urgency=low
+ 
+  * Removing -dev package since it's empty...arggg
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 08 Sep 2000 01:00:00 -0700
+
+kdeutils (4:2.0-20000907-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More package work
+  * Merging package changes with upstream cvs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 07 Sep 2000 04:30:00 -0700
+                                                                               
+kdeutils (4:2.0-20000825-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
+                                                                                
+kdeutils (4:2.0-20000820-1.0) experimental; urgency=low
+ 
+  * new beta version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 20 Aug 2000 09:45:00 -0700
+                                                                                
+kdeutils-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+ 
+  * new CVS version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 21 May 2000 18:15:00 -0700
+                                                                                
+kdeutils-cvs (4:2.0-20000512-1.1) experimental; urgency=low
+ 
+  * new CVS version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 12 May 2000 22:00:00 -0700
+
+kdeutils-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+ 
+  * new CVS version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 08 Mar 2000 22:00:00 -0700
+
+kdeutils-cvs (4:2.0-20000306-1.0) experimental; urgency=low
+
+  * new CVS version
+  * Adding in build-depends
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 06 Mar 2000 22:00:00 -0700
+
+kdeutils-cvs (4:2.0-19991117-1.0) experimental; urgency=low
+
+  * new CVS version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 17 Nov 1999 10:45:00 -0400
+
+kdeutils-cvs (4:2.0-19991008-1) experimental; urgency=low
+
+  * new CVS version
+  * Fixing up dependencies
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 08 Oct 1999 12:45:00 -0400
+
+kdeutils-cvs (4:2.0-19990825-1) experimental; urgency=low
+
+  * new version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 25 Aug 1999 08:00:48 -0400
+
+kdeutils-cvs (4:2.0-19990626-1) experimental; urgency=low
+
+  * new version
+
+ -- Stephan Kulow <coolo at kde.org>  Sat, 26 Jun 1999 20:39:48 +0200
+
+kdeutils-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * migrating from /opt to /
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 24 May 1999 07:22:51 -0400
+
+kdeutils (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo at kde.org>  Wed, 17 Feb 1999 19:09:43 +0100
+
+kdeutils (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:44 +0100
+
+kdeutils (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:59 +0100
+
+kdeutils (2:980710-1.0-1) unstable; urgency=low
+
+  * new upstream version 1.0
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 12 Jul 1998 10:12:20 +0200
+
+kdeutils (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 19 Apr 1998 15:24:47 +0200
+
+kdeutils (2:980312-6) frozen; urgency=low
+
+  * new frozen compile with latest fixed kdelibs. This time from CVS
+
+ -- Stephan Kulow <coolo at kde.org>  Fri,  3 Apr 1998 15:10:54 +0200
+
+kdeutils (2:980312-5) frozen; urgency=low
+
+  * don't compile kcalc with long double
+
+ -- Stephan Kulow <coolo at kde.org>  Thu, 26 Mar 1998 14:35:59 +0100
+
+kdeutils (2:980312-4) frozen; urgency=low
+
+  * new compile cycle with qt-1.33 and libstdc++-2.8
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 24 Mar 1998 20:49:33 +0100
+
+kdeutils (2:980312-3) unstable; urgency=low
+
+  * changed the maintainer field. I have missed this one ;(
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 15 Mar 1998 20:51:08 +0100
+
+kdeutils (2:980312-2) unstable; urgency=low
+
+  * fixed typo in the Description
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 15 Mar 1998 20:05:47 +0100
+
+kdeutils (2:980312-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo at kde.org>  Thu, 12 Mar 1998 23:27:36 +0100
+
+kdeutils (980227-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo at kde.org>  Fri, 27 Feb 1998 22:03:42 +0100
+
+kdeutils (1:Beta2-2.1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Fri,  5 Dec 1997 21:16:47 +0100
+
+kdeutils (1:Beta2-2) unstable; urgency=low
+
+  * removed virtual package names.
+  * fixed kcalc (compiling with long double breaks somewhere).
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sat, 29 Nov 1997 14:37:17 +0100
+
+kdeutils (1:Beta2-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun, 23 Nov 1997 16:02:18 +0100
+
+kdeutils (1:Beta1.2-2) unstable; urgency=low
+
+  * added /usr/bin/editor divertion
+  * now remove inst-apps file.
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun,  9 Nov 1997 17:44:32 +0100
+
+kdeutils (1:Beta1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Mon, 27 Oct 1997 11:23:49 +0100
+
+kdeutils (1:Beta1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Mon, 20 Oct 1997 12:32:06 +0200
+
+kdeutils (971019-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Mon, 13 Oct 1997 08:29:18 +0200
+
+kdeutils (971013-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Mon, 13 Oct 1997 08:29:18 +0200
+
+kdeutils (971009-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Thu,  9 Oct 1997 10:57:54 +0200
+
+kdeutils (971008-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Wed,  8 Oct 1997 10:14:01 +0200
+
+kdeutils (971006-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj at debian.org>  Tue,  7 Oct 1997 12:51:04 +0200
+
+kdeutils (971006-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Mon,  6 Oct 1997 09:30:04 +0200
+
+kdeutils (971005-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun,  5 Oct 1997 17:38:07 +0200
+
+kdeutils (971002-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj at debian.org>  Fri,  3 Oct 1997 10:38:16 +0200
+
+kdeutils (971002-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Thu,  2 Oct 1997 08:57:52 +0200
+
+kdeutils (970930-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Tue, 30 Sep 1997 11:59:53 +0200
+
+kdeutils (970929-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Mon, 29 Sep 1997 09:45:28 +0200
+
+kdeutils (970926-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Fri, 26 Sep 1997 08:12:07 +0200
+
+kdeutils (970925-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Thu, 25 Sep 1997 08:09:30 +0200
+
+kdeutils (970922-3) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj at debian.org>  Wed, 24 Sep 1997 11:46:00 +0200
+
+kdeutils (970922-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj at debian.org>  Tue, 23 Sep 1997 09:47:14 +0200
+
+kdeutils (970922-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Mon, 22 Sep 1997 09:49:29 +0200
+
+kdeutils (970921-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun, 21 Sep 1997 13:58:12 +0200
+
+kdeutils (970920-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sat, 20 Sep 1997 17:48:42 +0200

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,321 @@
+Source: kdeutils
+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), debhelper (>= 4.2.30), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.1), kdebase-dev (>= 4:3.5.1), libkonq4-dev (>= 4:3.5.1), libgmp3-dev, libsnmp5-dev | libsnmp9-dev, libxpm-dev, python-dev, xmms-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
+Standards-Version: 3.6.2
+
+Package: kdeutils
+Section: kde
+Architecture: all
+Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}), kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version}), superkaramba (>= ${Source-Version})
+Suggests: kdeutils-doc-html (>= ${Source-Version})
+Description: general purpose utilities from the official KDE release
+ KDE (the K Desktop Environment) is a powerful Open Source graphical
+ 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 general purpose utilities 
+ provided with the official release of KDE.
+
+Package: kdeutils-doc
+Section: doc
+Architecture: all
+Description: developer documentation for the KDE utilities module
+ This package contains documentation for the KDE utilities module, of
+ use more for developers creating applications than regular users.
+ .
+ This package is part of KDE, and a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kdeutils-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdebase
+Description: KDE utilities 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 utilities 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/ark/. Documentation is provided for most
+ KDE utilities packages.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kdeutils-dev
+Section: utils
+Architecture: any
+Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version}), kdelibs4-dev (>= 4:3.5-rc1)
+Description: development files for the KDE utilities module
+ This package contains development files needed to compile kdeutils
+ applications.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: ark
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: arj, ncompress, unzip, zip, zoo, bzip2
+Suggests: khelpcenter, rar
+Replaces: kdebase-data (<< 4:3.3.91)
+Description: graphical archiving tool for KDE
+ Ark is a graphical program for managing various archive formats within the
+ KDE environment. Archives can be viewed, extracted, created and modified
+ from within Ark.
+ .
+ The program can handle various formats such as tar, gzip, bzip2, zip, rar and
+ lha (if appropriate command-line programs are installed).
+ .
+ Ark can work closely with Konqueror in the KDE environment to handle archives,
+ if you install the Konqueror Integration plugin available in the konq-plugins
+ package.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kcalc
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase-data (<< 4:3.3.91)
+Description: calculator for KDE
+ KCalc is KDE's scientific calculator.
+ .
+ It provides:
+  * trigonometric functions, logic operations, and statistical calculations
+  * easy cut and paste of numbers from/into its display
+  * a results-stack which lets you conveniently recall previous results
+  * configurable precision, and number of digits after the period
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kcharselect
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: character selector for KDE
+ A character set selector for KDE.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kdelirc
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: infrared control for KDE
+ This is a frontend for the LIRC suite to use infrared devices with KDE.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kdessh
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, openssh-client | ssh-client
+Description: ssh frontend for KDE
+ This package contains KDE's frontend for ssh.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kdf
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: disk space utility for KDE
+ KDiskFree displays the available file devices (hard drive partitions, floppy
+ and CD drives, etc.) along with information on their capacity, free space, type
+ and mount point. It also allows you to mount and unmount drives and view them
+ in a file manager.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kedit
+Section: editors
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: basic text editor for KDE
+ A simple text editor for KDE.
+ .
+ It can be used with Konqueror for text and configuration file browsing.
+ KEdit also serves well for creating small plain text documents. KEdit's
+ functionality will intentionally remain rather limited to ensure a
+ reasonably fast start.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kfloppy
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, dosfstools
+Suggests: khelpcenter
+Description: floppy formatter for KDE
+ Kfloppy is a utility that provides a straightforward graphical means
+ to format 3.5" and 5.25" floppy disks.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kgpg
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, gnupg
+Suggests: khelpcenter
+Description: GnuPG frontend for KDE
+ Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file
+ encryption, file decryption and key management.
+ .
+ Features:
+   * an editor mode for easily and quickly encrypting or decrypting a file
+     or message which is typed, copied, pasted or dragged into the editor,
+     or which is double-clicked in the file manager
+   * Konqueror integration for encrypting or decrypting files
+   * a panel applet for encrypting / decrypting files or the clipboard
+     contents, etc.
+   * key management functions (generation, import, export, deletion and
+     signing)
+   * decrypting clipboard contents, including integration with Klipper
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: khexedit
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: KDE hex editor
+ KHexEdit is an editor for the raw data of binary files.  It includes
+ find/replace functions, bookmarks, many configuration options, drag and drop
+ support and other powerful features.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kjots
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: note taking utility for KDE
+ Kjots is a small note taker program. Name and idea are taken from the jots
+ program included in the tkgoodstuff package.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: klaptopdaemon
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: battery monitoring and management for laptops using KDE
+ This package contains utilities to monitor batteries and configure
+ power management, for laptops, from within KDE.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kmilo
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description:  laptop special keys support for KDE
+ KMilo lets you use the special keys on some keyboards and laptops.
+ .
+ Usually this includes volume keys and other features. Currently, KMilo
+ comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
+ with special keys.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kregexpeditor
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: graphical regular expression editor plugin for KDE
+ This package contains a graphical regular expression editor plugin for use
+ with KDE. It let you draw your regular expression in an unambiguous way.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: ksim
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: system information monitor for KDE
+ KSim is a system monitor app which has its own plugin system with support
+ for GKrellm skins. It allows users to follow uptime, memory usage, network
+ connections, power, etc.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: ktimer
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: timer utility for KDE
+ This is a timer application for KDE. It allows you to execute commands after
+ a certain amount of time. It supports looping commands as well as delayed
+ command execution.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: kwalletmanager
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: wallet manager for KDE
+ This program keeps various wallets for any kind of data that the user can
+ store encrypted with passwords and can also serve as a password manager that
+ keeps a master password to all wallets.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.
+
+Package: superkaramba
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: karamba
+Suggests: khelpcenter
+Description: a program based on karamba improving the eyecandy of KDE
+ SuperKaramba is a tool based on karamba that allows anyone to easily create
+ and run little interactive widgets on a KDE desktop. Widgets are defined in a
+ simple text file and can be augmented with Python code to make them
+ interactive.
+ .
+ Here are just some examples of the things that can be done:
+ .
+  * Display system information such as CPU Usage, MP3 playing, etc.
+  * Create cool custom toolbars that work any way imaginable.
+  * Create little games or virtual pets that live on your desktop.
+  * Display information from the internet, such as weather and headlines.
+ .
+ This package is part of KDE, as a component of the KDE utilities module.
+ See the 'kde' and 'kdeutils' packages for more information.

Added: people/jriddell/KDE/3.5/kdeutils/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,455 @@
+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: Matthias Elter <elter at kde.org> and many others.
+
+
+License:
+
+Artistic
+--------
+kdepasswd, kdessh
+
+BSD
+---
+charselectapplet
+---
+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.
+---
+
+GPL
+---
+ark, kcalc, kcharselect, kdf, kedit, kfloppy, khexedit, kjots,
+klaptopdaemon, kljettool, klpq, klprfax, kregexpeditor, ktimer
+
+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/kdeutils/debian/icons/ark-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/ark-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/ark-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,217 @@
+/* XPM */
+static char *ark-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 195 2",
+"   c black",
+".  c #000100",
+"X  c #000300",
+"o  c #030201",
+"O  c #000700",
+"+  c #050000",
+"@  c #090501",
+"#  c #0A0602",
+"$  c #0B0702",
+"%  c #0C0704",
+"&  c #001200",
+"*  c #140A02",
+"=  c #160B06",
+"-  c #1E0F03",
+";  c #1D0E06",
+":  c #1B1005",
+">  c #1E1100",
+",  c #002500",
+"<  c #002F00",
+"1  c #221205",
+"2  c #2F1E04",
+"3  c #331D07",
+"4  c #3A2311",
+"5  c #3A2512",
+"6  c #3E2910",
+"7  c #024900",
+"8  c #40290E",
+"9  c #482E0E",
+"0  c #412610",
+"q  c #533711",
+"w  c #593B13",
+"e  c #5D3D1F",
+"r  c #583D22",
+"t  c #774E19",
+"y  c #654523",
+"u  c #6E4825",
+"i  c #7B572A",
+"p  c #008700",
+"a  c #009F00",
+"s  c #149D02",
+"d  c #00A000",
+"f  c #00A100",
+"g  c #02AE00",
+"h  c #00B000",
+"j  c #00B700",
+"k  c #04B400",
+"l  c #0ABE00",
+"z  c #10AB03",
+"x  c #269B06",
+"c  c #2F9B09",
+"v  c #38B70E",
+"b  c #00C400",
+"n  c #00C500",
+"m  c #00C600",
+"M  c #00CA00",
+"N  c #00CF00",
+"B  c #0EC800",
+"V  c #00D900",
+"C  c #00DC00",
+"Z  c #00DD00",
+"A  c #0CDE0C",
+"S  c #11CA00",
+"D  c #06E004",
+"F  c #00EF00",
+"G  c #00F100",
+"H  c #18E615",
+"J  c #1AFF1E",
+"K  c #1CFF1E",
+"L  c #1EFF1E",
+"P  c #34DE22",
+"I  c #4F9C20",
+"U  c #509B29",
+"Y  c #4CB20C",
+"T  c #56A01A",
+"R  c #769817",
+"E  c #7D9419",
+"W  c #74AA3A",
+"Q  c #43C522",
+"!  c #55C137",
+"~  c #56CE56",
+"^  c #60D650",
+"/  c #77C94F",
+"(  c #69EB6B",
+")  c #75E365",
+"_  c #895D34",
+"`  c #886A2A",
+"'  c #9D6C3C",
+"]  c #A37024",
+"[  c #A6753B",
+"{  c #BA7D25",
+"}  c #BC7F26",
+"|  c #8D9A1C",
+" . c #85B016",
+".. c #81A331",
+"X. c #84A232",
+"o. c #A9941F",
+"O. c #BE811E",
+"+. c #AE844C",
+"@. c #A38157",
+"#. c #BA8947",
+"$. c #B58851",
+"%. c #ACB454",
+"&. c #C98725",
+"*. c #CD8829",
+"=. c #CF8B2B",
+"-. c #C28635",
+";. c #CB8F36",
+":. c #D18F2A",
+">. c #D79227",
+",. c #D7952C",
+"<. c #DF922C",
+"1. c #D49836",
+"2. c #D99834",
+"3. c #E6912D",
+"4. c #E49937",
+"5. c #EB9E38",
+"6. c #F48D30",
+"7. c #ECA328",
+"8. c #E3A23C",
+"9. c #F3AF3B",
+"0. c #F7B03F",
+"q. c #FBBC3E",
+"w. c #FDBD3D",
+"e. c #C79349",
+"r. c #C99245",
+"t. c #CC9740",
+"y. c #CD9B48",
+"u. c #D59841",
+"i. c #D09848",
+"p. c #D19E59",
+"a. c #CEA051",
+"s. c #DEA442",
+"d. c #DAA24C",
+"f. c #D2A156",
+"g. c #D6A150",
+"h. c #D5A860",
+"j. c #D4AB6C",
+"k. c #E5AF54",
+"l. c #E6AF55",
+"z. c #E8A654",
+"x. c #EFB344",
+"c. c #EBB558",
+"v. c #EAB45D",
+"b. c #EDB65C",
+"n. c #F6BA4E",
+"m. c #F5BC4B",
+"M. c #F0BA57",
+"N. c #E1B46B",
+"B. c #EEB661",
+"V. c #F1BC64",
+"C. c #FFC746",
+"Z. c #F6C053",
+"A. c #F5C054",
+"S. c #F6C25E",
+"D. c #FFCC5F",
+"F. c #FECE5E",
+"G. c #FFD55E",
+"H. c #EFC572",
+"J. c #FBCE6A",
+"K. c #FCCC6E",
+"L. c #F6C975",
+"P. c #FFCD75",
+"I. c #FFD266",
+"U. c #FFD06F",
+"Y. c #FFD36D",
+"T. c #FFD469",
+"R. c #F4D171",
+"E. c #FFD672",
+"W. c #FCD378",
+"Q. c #FED87D",
+"!. c #FFDA7D",
+"~. c #9AFF9C",
+"^. c #A1EE92",
+"/. c #A6F098",
+"(. c #A8F39A",
+"). c #A0FFA2",
+"_. c #A3FFA5",
+"`. c #E7C789",
+"'. c #EDDE8D",
+"]. c #E5D09F",
+"[. c #F9D184",
+"{. c #FADD9C",
+"}. c #EBDCB2",
+"|. c #FFE183",
+" X c #FFE187",
+".X c #FFE28F",
+"XX c #FFE291",
+"oX c #FFE094",
+"OX c #FFE396",
+"+X c #FFE397",
+"@X c #FFE29E",
+"#X c #FFEDA8",
+"$X c #FFECB2",
+"%X c #FFF1B3",
+"&X c None",
+/* pixels */
+"&X&X&X&XB ) /.^./.^ , &X&X&X&X&X",
+"&X&X&X&Xj ( ).~._.~ & &X&X&X&X&X",
+"&X&X&X&X| H L L L P ` * &X&X&X&X",
+"&X&Xx z v D F F F A Q s 7 &X&X&X",
+"&X5.H.! N Z V V V Z M / +.- &X&X",
+"&X] P.L.T j b b b h W @X+X#.; &X",
+":.t.8.0.Z.I d h d ..z.B.V.i @ . ",
+"2 a.{.M.D.R.U p X.E.K.r.[ r 4 . ",
+"&X> y.[.c.W.'.%.M.b.h.].}. at .0 . ",
+"&X&XO.9.v.d.l.4.u.N.`.j.y o . . ",
+"&X&X,.w.x.s.;.-.i.g.1.7.8 . &X&X",
+"&X&X2.D.T.E.!.J.A.n.C.w.6 . &X&X",
+"&X&Xt l. XoX+X!.Y.I.G.n.5 . &X&X",
+"&X&X&X9 f.#X%X.X|.K.e.r % . &X&X",
+"&X&X&X&X3 $.$XoXp.u = . . . &X&X",
+"&X&X&X&X&X1 ' _ - . . . &X&X&X&X"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/ark.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/ark.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/ark.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,279 @@
+/* XPM */
+static char *ark[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 241 2",
+"   c black",
+".  c #20130A",
+"X  c #301C10",
+"o  c #382210",
+"O  c #007700",
+"+  c #007B00",
+"@  c #107C06",
+"#  c #492B18",
+"$  c #533516",
+"%  c #543319",
+"&  c #5D371C",
+"*  c #613920",
+"=  c #683D22",
+"-  c #64401A",
+";  c #6B4021",
+":  c #704224",
+">  c #754822",
+",  c #784725",
+"<  c #7C4C24",
+"1  c #7D4C29",
+"2  c #018300",
+"3  c #0E8803",
+"4  c #009400",
+"5  c #009E00",
+"6  c #0D9C03",
+"7  c #109308",
+"8  c #109A09",
+"9  c #00A500",
+"0  c #00A800",
+"q  c #0EA003",
+"w  c #00B300",
+"e  c #00BC00",
+"r  c #10A20A",
+"t  c #238208",
+"y  c #308512",
+"u  c #308A12",
+"i  c #308C1D",
+"p  c #309A1C",
+"a  c #30A220",
+"s  c #30AA23",
+"d  c #3CB020",
+"f  c #00C500",
+"g  c #00C900",
+"h  c #00D300",
+"j  c #00DE00",
+"k  c #1EDB1E",
+"l  c #00E200",
+"z  c #00E900",
+"x  c #00F400",
+"c  c #06FE06",
+"v  c #08FE08",
+"b  c #23D100",
+"n  c #3ADF3A",
+"m  c #29ED29",
+"M  c #37FF37",
+"N  c #39FF39",
+"B  c #5E9614",
+"V  c #5FA012",
+"C  c #6F9F16",
+"Z  c #7F9C19",
+"A  c #68A414",
+"S  c #74B641",
+"D  c #40D720",
+"F  c #4EDA30",
+"G  c #5DDD40",
+"H  c #56E256",
+"J  c #53EF53",
+"K  c #60C852",
+"L  c #6FFF6F",
+"P  c #74E672",
+"I  c #71FF71",
+"U  c #7DF17D",
+"Y  c #814F27",
+"T  c #855226",
+"R  c #87552D",
+"E  c #8B5626",
+"W  c #8D5A23",
+"Q  c #8E5C2F",
+"!  c #915D26",
+"~  c #935F31",
+"^  c #956121",
+"/  c #986325",
+"(  c #9A6329",
+")  c #9E6836",
+"_  c #996B3D",
+"`  c #A06728",
+"'  c #A56B27",
+"]  c #A46B2A",
+"[  c #A86F2E",
+"{  c #A26D33",
+"}  c #AE7424",
+"|  c #AB712B",
+" . c #B27724",
+".. c #B67C23",
+"X. c #B5792D",
+"o. c #BA7C2B",
+"O. c #B07631",
+"+. c #B57B32",
+"@. c #B1783F",
+"#. c #B97F35",
+"$. c #AE7D43",
+"%. c #AB7D4A",
+"&. c #90981D",
+"*. c #BF8225",
+"=. c #BE802E",
+"-. c #BD8334",
+";. c #B99B2D",
+":. c #9FAF41",
+">. c #9FB249",
+",. c #9FB552",
+"<. c #9FB95A",
+"1. c #B7814B",
+"2. c #BA8541",
+"3. c #BC864B",
+"4. c #BD8944",
+"5. c #BB9242",
+"6. c #B6956B",
+"7. c #BFB743",
+"8. c #B0C262",
+"9. c #C68626",
+"0. c #C4832B",
+"q. c #CA872A",
+"w. c #CE8B2A",
+"e. c #C28430",
+"r. c #C3883B",
+"t. c #CC8E33",
+"y. c #D28D2A",
+"u. c #D5922A",
+"i. c #DD962B",
+"p. c #D99631",
+"a. c #DD9C35",
+"s. c #D89A39",
+"d. c #E09D34",
+"f. c #E7A12C",
+"g. c #ECA62C",
+"h. c #E4A032",
+"j. c #E4A23A",
+"k. c #E6A83D",
+"l. c #E9A633",
+"z. c #EAAA3B",
+"x. c #FCB62E",
+"c. c #FFB82E",
+"v. c #F3B33F",
+"b. c #F8B738",
+"n. c #FFBB34",
+"m. c #FEBC3A",
+"M. c #C08941",
+"N. c #CD954B",
+"B. c #CC9A4C",
+"V. c #D19D4E",
+"C. c #DD9F41",
+"Z. c #C49C61",
+"A. c #CFB954",
+"S. c #D5A648",
+"D. c #D9A14A",
+"F. c #D4A15E",
+"G. c #DCA352",
+"H. c #DEA954",
+"J. c #DBA95B",
+"K. c #DDAB61",
+"L. c #E2A649",
+"P. c #E4A844",
+"I. c #E4AA4C",
+"U. c #E0A65C",
+"Y. c #E8AE52",
+"T. c #E7B158",
+"R. c #EAB455",
+"E. c #EAB45A",
+"W. c #EDB854",
+"Q. c #EFBF59",
+"!. c #F7BC4A",
+"~. c #F5B953",
+"^. c #F5BB58",
+"/. c #E5B666",
+"(. c #ECB760",
+"). c #ECBB64",
+"_. c #E9BC70",
+"`. c #F0B76F",
+"'. c #F7BF60",
+"]. c #F0BF6A",
+"[. c #C7C469",
+"{. c #CFC76A",
+"}. c #CFD07A",
+"|. c #EFC15C",
+" X c #FFC144",
+".X c #FFC44B",
+"XX c #FFC651",
+"oX c #FBC658",
+"OX c #FFC855",
+"+X c #FFCA5B",
+"@X c #E6C776",
+"#X c #F3C060",
+"$X c #F1C269",
+"%X c #FDC564",
+"&X c #F9C368",
+"*X c #FECC63",
+"=X c #FFCA6A",
+"-X c #F2C573",
+";X c #F4CE7B",
+":X c #FECD71",
+">X c #FFD067",
+",X c #FED16B",
+"<X c #FFD473",
+"1X c #FED479",
+"2X c #FFD87D",
+"3X c #A7FFA7",
+"4X c #A8F2A7",
+"5X c #A9FFA9",
+"6X c #CEB282",
+"7X c #D4BD90",
+"8X c #E4C68C",
+"9X c #EECF90",
+"0X c #EFDC92",
+"qX c #F2CA80",
+"wX c #FFD584",
+"eX c #FFD68A",
+"rX c #FFDB83",
+"tX c #FEDB8B",
+"yX c #F7D792",
+"uX c #FADA95",
+"iX c #FFDF98",
+"pX c #FFE08E",
+"aX c #FFE294",
+"sX c #FFE29B",
+"dX c #EFE4A2",
+"fX c #FDE5A3",
+"gX c #F9E5AD",
+"hX c #FFE8A4",
+"jX c #FFEAAB",
+"kX c #F3E4B4",
+"lX c #FFEBB3",
+"zX c #F9EBBA",
+"xX c #FEF0BC",
+"cX c #FFF6C6",
+"vX c #FFF7CA",
+"bX c #FDF8CF",
+"nX c #F9F5D0",
+"mX c #FFFFDB",
+"MX c #E1FFE1",
+"NX c gray100",
+"BX c None",
+/* pixels */
+"BXBXBXBXBXBXBXBXBXBXb F G G G G G G G n b BXBXBXBXBXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXBXBXh 4XMXMXMXMXMXMXMXP 2   BXBXBXBXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXBXBXl 8.5X5X5X5X5X5X5XH +   BXBXBXBXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXBXBXg J I I I I I I I n O   BXBXBXBXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXBXBXw m M M M N N N N k &. .BXBXBXBXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXBXi.A z c c c c v v v h 8.y. .BXBXBXBXBXBXBXBXBX",
+"BXBXBXBXBX0 9 9 B A d l x x x x z x x g K S C 5 9 9 BXBXBXBXBXBX",
+"BXBXBXBXBXZ q w f f f l z z z z z z z j f f f 9 6     BXBXBXBXBX",
+"BXBXBXi.i.j.[.r g j j j l l j j j l l l j j e s 5.^ BXBXBXBXBXBX",
+"BXBXBXi.E.iXiX}.8 g h h g h h h h h h g g e a dXfX4.] BXBXBXBXBX",
+"BXBXBXi.j.wXwXwX{.7 e g g f g g g g g g w p 0XfXiXuX4./ BXBXBXBX",
+"BXBXBXBXu.^.:X=X'.;.3 w e e e e e e f 0 t @XeXeXeXeXeX4.! BXBXBX",
+"BXi.i.i.i.d.~.l.d.!.7.2 0 w w w w w 5 u S.o.].:X1X1XJ.( $   BXBX",
+"BXi.i./.I.i.i.v..X+X*X:.+ 5 0 0 0 4 y |.=XT.+.T.%XD.( $     BXBX",
+"BXBX*.d.lXbXI.z.+X+X*X<X>.+ 4 5 4 y |.*X=X:X].[ r.! $     BXBXBX",
+"BXBXBX9.h.gXcX/.z.*X,X<X2X,.+ 2 @ Q.%X=X=X:X:XM.[ ~ ! E E T BXBX",
+"BXBXBXBX..a.yXlXE.a.,X1XrXtX<.i A.%X*X=X:XB.] 6XnXmXmX6.T >   BX",
+"BXBXBXBXBXu.i.-XsXT.s.2XpXpXsXtX^.%X=XH.O.Z.kXvXvX7X_ < o     BX",
+"BXBXBXBXBXi.f.u.).eXE.t.;XtXW.i.i.C.#.3.9XgXjX8X%.T %       BXBX",
+"BXBXBXBXBXi.g.c.i.D.&XR.0.u.i.u.o.+._.eXeX;X2.( (       BXBXBXBX",
+"BXBXBXBXBXu.l.n.m.a.t.0.9.o.*.| V.=X=X&X3.( u.c.]   BXBXBXBXBXBX",
+"BXBXBXBXBXu.z. X.XXXOXoXW.S.B.-.-.` | ] t.b.n.c.`   BXBXBXBXBXBX",
+"BXBXBXBXBXw.k.OXOX*X*X,X,X<X2X>X+XOXXX.X.X Xm.m.(   BXBXBXBXBXBX",
+"BXBXBXBXBXq.P.*X*X,X<X<X2X2XpX>X*X+X+XOX.X.X.Xm.(   BXBXBXBXBXBX",
+"BXBXBXBXBX0.q.#X<X2X2XrXtXpXpX<X,X>X*X+X+XOX.X.X)   BXBXBXBXBXBX",
+"BXBXBXBXBXBX} =.$XrXpXaXaXsXpX2X2X<X,X*X*X+XOX~.Q   BXBXBXBXBXBX",
+"BXBXBXBXBXBXBX^ X./.aXhXjXjXsXpX2X2X<X<X*X*X2.1 *   BXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXW ] K.hXlXxXsXpXpXrX2X=XN.R = X     BXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXBXW ` F.lXvXjXaXpX<XG.~ : #       BXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXBXBX- ! 3.lXjXeXU.) , %       BXBXBXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXBXBXBX< E 1.`. at .1 &       BXBXBXBXBXBXBXBXBXBXBX",
+"BXBXBXBXBXBXBXBXBXBXBXBX> < T = .     BXBXBXBXBXBXBXBXBXBXBXBXBX"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kcalc-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kcalc-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kcalc-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,196 @@
+/* XPM */
+static char *kcalc-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 174 2",
+"   c #000000",
+".  c #000001",
+"X  c #010101",
+"o  c #010102",
+"O  c #010103",
+"+  c #020205",
+"@  c #030205",
+"#  c #020207",
+"$  c #030306",
+"%  c #040408",
+"&  c #040409",
+"*  c #070711",
+"=  c #090912",
+"-  c #0B0B11",
+";  c #0B0B15",
+":  c #0C0C18",
+">  c #0E0E18",
+",  c #18171D",
+"<  c #18181F",
+"1  c #121224",
+"2  c #141325",
+"3  c #151429",
+"4  c #15152B",
+"5  c #20203F",
+"6  c #36363E",
+"7  c #202040",
+"8  c #202041",
+"9  c #212142",
+"0  c #212242",
+"q  c #222241",
+"w  c #2F2F59",
+"e  c #38384C",
+"r  c #363651",
+"t  c #32315D",
+"y  c #393956",
+"u  c #353664",
+"i  c #3B3B6A",
+"p  c #3B3B6D",
+"a  c #3E3E71",
+"s  c #45467B",
+"d  c #4D4D76",
+"f  c #545368",
+"g  c #555470",
+"h  c #6E6E6C",
+"j  c #6F6F6E",
+"k  c #6F6F6F",
+"l  c #686779",
+"z  c #7D7D7D",
+"x  c #7F7F7F",
+"c  c #4E4E91",
+"v  c #50518E",
+"b  c #545597",
+"n  c #585994",
+"m  c #5A5B9A",
+"M  c #6F6E89",
+"N  c #676F9D",
+"B  c #6061A1",
+"V  c #6B6BA3",
+"C  c #6E6FAE",
+"Z  c #7777A2",
+"A  c #7072AF",
+"S  c #7275B3",
+"D  c #7174B8",
+"F  c #7B7DBD",
+"G  c #38B53D",
+"H  c #3DA747",
+"J  c #0AC40A",
+"K  c #1DC91C",
+"L  c #1CCA1C",
+"P  c #29C92A",
+"I  c #2FC332",
+"U  c #46CC49",
+"Y  c #4CCB4B",
+"T  c #42D642",
+"R  c #75C475",
+"E  c #74C47A",
+"W  c #71DA70",
+"Q  c #75DC75",
+"!  c #7F83C4",
+"~  c #7BC681",
+"^  c #DB4148",
+"/  c #D46875",
+"(  c #D87986",
+")  c #808080",
+"_  c #878788",
+"`  c #8A8A8B",
+"'  c #898BAB",
+"]  c #8585BD",
+"[  c #8E8FBD",
+"{  c #8898B7",
+"}  c #989CB2",
+"|  c #89B29B",
+" . c #85A5A3",
+".. c #99A7BA",
+"X. c #A5B7BD",
+"o. c #B4B4BD",
+"O. c #B7BDB2",
+"+. c #878BCA",
+"@. c #8D8DC2",
+"#. c #989DD6",
+"$. c #989DD7",
+"%. c #9FA2D5",
+"&. c #A4A5D2",
+"*. c #A3A7DB",
+"=. c #AFAFD5",
+"-. c #AEB0C9",
+";. c #A9AEE0",
+":. c #A9AEE1",
+">. c #ABB0E1",
+",. c #B0B3E0",
+"<. c #B3B8E6",
+"1. c #88CF8A",
+"2. c #89D393",
+"3. c #9CC2A9",
+"4. c #9FD9A0",
+"5. c #A1C9A8",
+"6. c #B4DFBD",
+"7. c #B3C8C4",
+"8. c #BFC1D5",
+"9. c #BCCDD1",
+"0. c #BFD8D4",
+"q. c #BBC0EA",
+"w. c #BCC1EB",
+"e. c #BEC2E9",
+"r. c #BEC3E9",
+"t. c #BCC2ED",
+"y. c #BEC5EF",
+"u. c #F28589",
+"i. c #C8B2CF",
+"p. c #C4BFDD",
+"a. c #C6D0D7",
+"s. c #D8C2D2",
+"d. c #C2C7EE",
+"f. c #C3C8EF",
+"g. c #C5C9EC",
+"h. c #C6CAED",
+"j. c #C7CCEE",
+"k. c #C8CDEE",
+"l. c #C9CDEE",
+"z. c #CBCFEF",
+"x. c #C2C8F0",
+"c. c #C5CAF0",
+"v. c #C6CBF0",
+"b. c #C7CCF0",
+"n. c #C7CDF0",
+"m. c #CDD0EC",
+"M. c #CCD2F5",
+"N. c #CED3F5",
+"B. c #CED4F4",
+"V. c #CED5F6",
+"C. c #D2C9E3",
+"Z. c #DAD5E9",
+"A. c #DAD9E4",
+"S. c #D0D5F3",
+"D. c #D2D5F0",
+"F. c #D1D6F4",
+"G. c #D3D8F3",
+"H. c #DADEF6",
+"J. c #DCDFF4",
+"K. c #DCDFF5",
+"L. c #D9DDF8",
+"P. c #D9DFF9",
+"I. c #D3E2E1",
+"U. c #DCE1F9",
+"Y. c #DDE1F9",
+"T. c #DFE3F9",
+"R. c #E1E1EF",
+"E. c #E1E3F7",
+"W. c #E3E7FA",
+"Q. c #E6EAFD",
+"!. c #E8E9FA",
+"~. c #E8EAFC",
+"^. c gray100",
+"/. c None",
+/* pixels */
+"/./././././.2 g [ @.r /././././.",
+"/././.  , f ' ..|  .g @ /./././.",
+"/._ 6 l } X.3.1.Y H N 2 /./././.",
+"/.Z.a.7.5.4.W K J G { t   /././.",
+"/.R.a.R Q T L I E O.p.n ; /././.",
+"/.o.-.E P Y 2.0.s.u.( ] 9 /././.",
+"/._ M 9.6.I.E.Q.i.^ / ,.s & /./.",
+"/./.e =.!.!.b.b.e.C.Z.f.S 3 /./.",
+"/./.- Z z.D.r.F.J.F.P.t.#.u   /.",
+"/././.y &.Y.J.D.L.e.f.l.e.m * /.",
+"/././.> V z.Y.d.d.f.B.H.f.! 8 /.",
+"/./././.i &.F.f.M.Y.b.y.*.D 9 j ",
+"/./././.4 C V.W.b.f.>.+.v 9 $ j ",
+"/./././.$ p :.B.<.#.B t :     k ",
+"/././././.9 F :.S p 1       /./.",
+"/././././.; c b 9 &     /./././."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kcalc.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kcalc.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kcalc.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,230 @@
+/* XPM */
+static char *kcalc[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 192 2",
+"   c black",
+".  c #17172C",
+"X  c #18182E",
+"o  c #20203C",
+"O  c #212140",
+"+  c #262648",
+"@  c #2F2F5A",
+"#  c #303059",
+"$  c #363668",
+"%  c #3D3D74",
+"&  c #0F7F10",
+"*  c #44447C",
+"=  c #454584",
+"-  c #484889",
+";  c #4D4D93",
+":  c #525286",
+">  c #52529B",
+",  c #5454A1",
+"<  c #5B5BA4",
+"1  c #5C5DA8",
+"2  c #656594",
+"3  c #747497",
+"4  c #6060A2",
+"5  c #6364AC",
+"6  c #6B6BA3",
+"7  c #6C6CAA",
+"8  c #6C6DB2",
+"9  c #7272A0",
+"0  c #7070AE",
+"q  c #7273B3",
+"w  c #7274B9",
+"e  c #7979B3",
+"r  c #7D7EB9",
+"t  c #088A08",
+"y  c #169416",
+"u  c #00B500",
+"i  c #00BE00",
+"p  c #2D8C31",
+"a  c #219221",
+"s  c #269C29",
+"d  c #2E9E31",
+"f  c #309430",
+"g  c #21AC21",
+"h  c #26BC26",
+"j  c #3FBF3F",
+"k  c #00C600",
+"l  c #07CA07",
+"z  c #0CCD0C",
+"x  c #16C316",
+"c  c #16CB16",
+"v  c #1FC61F",
+"b  c #1ACB1A",
+"n  c #12D012",
+"m  c #2AC02A",
+"M  c #22D422",
+"N  c #2BD42B",
+"B  c #33C033",
+"V  c #44AA45",
+"C  c #5DA65F",
+"Z  c #58AE58",
+"A  c #54B358",
+"S  c #5EA660",
+"D  c #6DAF6D",
+"F  c #6FAF70",
+"G  c #67B96C",
+"H  c #70A979",
+"J  c #77B17C",
+"K  c #7CB87C",
+"L  c #45D545",
+"P  c #4BD64B",
+"I  c #67D367",
+"U  c #6FDE6F",
+"Y  c #7BCA7E",
+"T  c #75DE75",
+"R  c #79E179",
+"E  c #B31F21",
+"W  c #AF3A40",
+"Q  c #D31818",
+"!  c #F40707",
+"~  c #FD0C0C",
+"^  c #FF2828",
+"/  c #D26062",
+"(  c #FE6262",
+")  c #B47180",
+"_  c #BA7180",
+"`  c #8384BB",
+"'  c #8989BF",
+"]  c #9292BC",
+"[  c #9C9CBD",
+"{  c #8CB898",
+"}  c #90BE9F",
+"|  c #BF838F",
+" . c #B68099",
+".. c #A4A4BE",
+"X. c #8285C4",
+"o. c #8689C5",
+"O. c #8D8DC1",
+"+. c #898DCB",
+"@. c #9393C4",
+"#. c #9B9CCB",
+"$. c #9A9DD2",
+"%. c #9DA1D4",
+"&. c #9DA2DA",
+"*. c #A3A3CC",
+"=. c #AAAACF",
+"-. c #A2A4D4",
+";. c #A2A6D9",
+":. c #A4A9DB",
+">. c #ABACD3",
+",. c #AAAEDC",
+"<. c #AEB1DC",
+"1. c #B3B3D5",
+"2. c #B2B4DB",
+"3. c #BABAD5",
+"4. c #BBBBDA",
+"5. c #A3AAE2",
+"6. c #A8AEE1",
+"7. c #AEB3E0",
+"8. c #AFB6E8",
+"9. c #B6BAE2",
+"0. c #B3BAE9",
+"q. c #B8BBE1",
+"w. c #B9BFEB",
+"e. c #B6BFF3",
+"r. c #92C29F",
+"t. c #90CC96",
+"y. c #8DE38D",
+"u. c #9EE99E",
+"i. c #AAC1BF",
+"p. c #A6D3AA",
+"a. c #B2D9B2",
+"s. c #A7E0A7",
+"d. c #A2EAA2",
+"f. c #BFE1BF",
+"g. c #AAC2C4",
+"h. c #BCC4D5",
+"j. c #B5D6C4",
+"k. c #BEDCCC",
+"l. c #BEC1E4",
+"z. c #BEC5F2",
+"x. c #D6A1AB",
+"c. c #D1B0BF",
+"v. c #FF9393",
+"b. c #EABEBE",
+"n. c #C1CFCF",
+"m. c #C2C2DE",
+"M. c #C7CEDB",
+"N. c #D0C5DF",
+"B. c #D5C9DF",
+"V. c #C3C5E3",
+"C. c #C1C5EB",
+"Z. c #C6CAEB",
+"A. c #CDCDE4",
+"S. c #C9CDEC",
+"D. c #C4CBF2",
+"F. c #C4CCF9",
+"G. c #C9CEF0",
+"H. c #CED1ED",
+"J. c #CCD1F2",
+"K. c #CBD4FE",
+"L. c #CFD8FF",
+"P. c #D0D0E5",
+"I. c #D3D4EC",
+"U. c #DBDCED",
+"Y. c #D1D6F3",
+"T. c #D0D7FC",
+"R. c #D4D9F5",
+"E. c #D3DAFE",
+"W. c #DADEF4",
+"Q. c #D8DFFF",
+"!. c #CAE8CA",
+"~. c #C3F1C3",
+"^. c #CAF3CA",
+"/. c #D2E3DF",
+"(. c #D3F5D3",
+"). c #D7E2EF",
+"_. c #DEE5E6",
+"`. c #DCE9E9",
+"'. c #DEE0F4",
+"]. c #DBE1FE",
+"[. c #FFCDCD",
+"{. c #E7EEEF",
+"}. c #E1E3F4",
+"|. c #E1E6FE",
+" X c #E5E9FD",
+".X c #EBEBF4",
+"XX c #E9EDFE",
+"oX c #EEF1FF",
+"OX c #F1F1F7",
+"+X c #F1F4FE",
+"@X c #FEFEFF",
+"#X c None",
+/* pixels */
+"#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X at .' ' ` 2   #X#X#X#X#X#X#X#X#X#X",
+"#X#X#X#X#X#X#X#X#X#X#X#X#X#X#. at .@.' #.r 6     #X#X#X#X#X#X#X#X#X",
+"#X#X#X#X#X#X#X#X#X#X#X#X*.#.#. at .>.i./.' 0     #X#X#X#X#X#X#X#X#X",
+"#X#X#X#X#X#X#X#X#X#X=.=.*.#.4.{ S Z & V.8 :     #X#X#X#X#X#X#X#X",
+"#X#X#X#X#X#X#X#X1.1.=.=.h.H S a.(.y.y r.q <     #X#X#X#X#X#X#X#X",
+"#X#X#X#X#Xm.4.4.1.4.M.J D f.(.T x i u p #.< @   #X#X#X#X#X#X#X#X",
+"#X#X#XA.M.m.4.m.n.S D !.^.u.v i i k z t g.< ;     #X#X#X#X#X#X#X",
+"#X#X#XA.V.P._.F K !.^.d.R x i k z M h p ).` , O   #X#X#X#X#X#X#X",
+"#X#X#XV.A. at Xf s.~.u.T P c k z M m d }  X Xq., =     #X#X#X#X#X#X",
+"#X#X#X3.4.OXa I U L b l z N h s r. Xc.| B.].5 >     #X#X#X#X#X#X",
+"#X#X#X..4.A.p.g c z n N B A j. XXXc.b.[./ B.$., %     #X#X#X#X#X",
+"#X#X#X  =.>.{.V c N j G k.XXW.V.J.x.v.( ! ) R., ;     #X#X#X#X#X",
+"#X#X#X#X[ =.I.p.Y t.`.oXXX X.X at X'. .^ ~ ~ _ ].o., o   #X#X#X#X#X",
+"#X#X#X#X  #.=.+X+X+X'.W.I.W.+X XL.-.W Q E N.].0., -     #X#X#X#X",
+"#X#X#X#X  ] @.I.+X X.X at X}.4.T.T.].-.].].J.l.J.Q.8 >     #X#X#X#X",
+"#X#X#X#X#X3 @.>.oX}.oX|.K.-.V.2.%.G.].Y.oX at XV.F.:., *     #X#X#X",
+"#X#X#X#X#X  ` ' }.}.J.Q.].%.].].R.J.E.W.oX].F.%.F.1 ;     #X#X#X",
+"#X#X#X#X#X#X3 ` <.XXS.2.*.J. XY..X at XV.Z.].T.Q.%.T.+., @   #X#X#X",
+"#X#X#X#X#X#X  e r ].XX X].V.J.'.+X XF.;.9.V.#.D.L.z., ;     #X#X",
+"#X#X#X#X#X#X#X7 q 4. X].}. at X}.<.].L.R.%.E.T.J.}.U.8.w ,     #X#X",
+"#X#X#X#X#X#X#X  7 e ].'.oXXXL.:.9.Z.#.D.T.T.U.+X X$.&., =     #X",
+"#X#X#X#X#X#X#X  4 1 V.].J.E.].7.].z.D.I.H.z.H.].T.w.e.5 >     #X",
+"#X#X#X#X#X#X#X#X* 1 X.].Z.2.<.<.E.Q.). at XoX;.D.D.].$.e.8 ,     #X",
+"#X#X#X#X#X#X#X#X  > , J.].].R.S.z.E.}.|.L.6.K.8.$.X.1 , -     #X",
+"#X#X#X#X#X#X#X#X#X- , $.].].'. at XXX,.z.T.].$.K.5.5 , > @       #X",
+"#X#X#X#X#X#X#X#X#X  > 1 Q.Q.}.XXT.%.K.<.:.$.w , , %           #X",
+"#X#X#X#X#X#X#X#X#X#X; , :.Q.J.E.].-.K.F.+., , - X           #X#X",
+"#X#X#X#X#X#X#X#X#X#X  > 8 T.z.2.>.6.&.1 , ; +           #X#X#X#X",
+"#X#X#X#X#X#X#X#X#X#X  > , 8.T.L.8.w , , $           #X#X#X#X#X#X",
+"#X#X#X#X#X#X#X#X#X#X#X% , o.F.X., , -           #X#X#X#X#X#X#X#X",
+"#X#X#X#X#X#X#X#X#X#X#X  > , 1 , ; .           #X#X#X#X#X#X#X#X#X",
+"#X#X#X#X#X#X#X#X#X#X#X#X; , > $           #X#X#X#X#X#X#X#X#X#X#X"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kcharselect-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kcharselect-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kcharselect-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,279 @@
+/* XPM */
+static char *kcharselect-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 257 2",
+"   c black",
+".  c #010101",
+"X  c #020202",
+"o  c gray1",
+"O  c #040404",
+"+  c gray2",
+"@  c #060606",
+"#  c #070707",
+"$  c gray3",
+"%  c #090909",
+"&  c gray4",
+"*  c #0B0B0B",
+"=  c #0C0C0C",
+"-  c gray5",
+";  c #0E0E0E",
+":  c gray6",
+">  c #101010",
+",  c #111111",
+"<  c gray7",
+"1  c #131313",
+"2  c gray8",
+"3  c #151515",
+"4  c #161616",
+"5  c gray9",
+"6  c #181818",
+"7  c #191919",
+"8  c gray10",
+"9  c #1B1B1B",
+"0  c gray11",
+"q  c #1D1D1D",
+"w  c #1E1E1E",
+"e  c gray12",
+"r  c #202020",
+"t  c gray13",
+"y  c #222222",
+"u  c #232323",
+"i  c gray14",
+"p  c #252525",
+"a  c gray15",
+"s  c #272727",
+"d  c #282828",
+"f  c gray16",
+"g  c #2A2A2A",
+"h  c gray17",
+"j  c #2C2C2C",
+"k  c #2D2D2D",
+"l  c gray18",
+"z  c #2F2F2F",
+"x  c gray19",
+"c  c #313131",
+"v  c #323232",
+"b  c gray20",
+"n  c #343434",
+"m  c #353535",
+"M  c gray21",
+"N  c #373737",
+"B  c gray22",
+"V  c #393939",
+"C  c #3A3A3A",
+"Z  c gray23",
+"A  c #3C3C3C",
+"S  c gray24",
+"D  c #3E3E3E",
+"F  c #3F3F3F",
+"G  c gray25",
+"H  c #414141",
+"J  c gray26",
+"K  c #434343",
+"L  c #444444",
+"P  c gray27",
+"I  c #464646",
+"U  c gray28",
+"Y  c #484848",
+"T  c #494949",
+"R  c gray29",
+"E  c #4B4B4B",
+"W  c #4C4C4C",
+"Q  c gray30",
+"!  c #4E4E4E",
+"~  c gray31",
+"^  c #505050",
+"/  c #515151",
+"(  c gray32",
+")  c #535353",
+"_  c gray33",
+"`  c #555555",
+"'  c #565656",
+"]  c gray34",
+"[  c #585858",
+"{  c gray35",
+"}  c #5A5A5A",
+"|  c #5B5B5B",
+" . c gray36",
+".. c #5D5D5D",
+"X. c gray37",
+"o. c #5F5F5F",
+"O. c #606060",
+"+. c gray38",
+"@. c #626262",
+"#. c gray39",
+"$. c #646464",
+"%. c #656565",
+"&. c gray40",
+"*. c #676767",
+"=. c #686868",
+"-. c DimGray",
+";. c #6A6A6A",
+":. c gray42",
+">. c #6C6C6C",
+",. c #6D6D6D",
+"<. c gray43",
+"1. c #6F6F6F",
+"2. c gray44",
+"3. c #717171",
+"4. c #727272",
+"5. c gray45",
+"6. c #747474",
+"7. c gray46",
+"8. c #767676",
+"9. c #777777",
+"0. c gray47",
+"q. c #797979",
+"w. c gray48",
+"e. c #7B7B7B",
+"r. c #7C7C7C",
+"t. c gray49",
+"y. c #7E7E7E",
+"u. c gray50",
+"i. c #808080",
+"p. c #818181",
+"a. c gray51",
+"s. c #838383",
+"d. c #848484",
+"f. c gray52",
+"g. c #868686",
+"h. c gray53",
+"j. c #888888",
+"k. c #898989",
+"l. c gray54",
+"z. c #8B8B8B",
+"x. c gray55",
+"c. c #8D8D8D",
+"v. c #8E8E8E",
+"b. c gray56",
+"n. c #909090",
+"m. c gray57",
+"M. c #929292",
+"N. c #939393",
+"B. c gray58",
+"V. c #959595",
+"C. c gray59",
+"Z. c #979797",
+"A. c #989898",
+"S. c gray60",
+"D. c #9A9A9A",
+"F. c #9B9B9B",
+"G. c gray61",
+"H. c #9D9D9D",
+"J. c gray62",
+"K. c #9F9F9F",
+"L. c #A0A0A0",
+"P. c gray63",
+"I. c #A2A2A2",
+"U. c gray64",
+"Y. c #A4A4A4",
+"T. c #A5A5A5",
+"R. c gray65",
+"E. c #A7A7A7",
+"W. c gray66",
+"Q. c #A9A9A9",
+"!. c #AAAAAA",
+"~. c gray67",
+"^. c #ACACAC",
+"/. c gray68",
+"(. c #AEAEAE",
+"). c #AFAFAF",
+"_. c gray69",
+"`. c #B1B1B1",
+"'. c #B2B2B2",
+"]. c gray70",
+"[. c #B4B4B4",
+"{. c gray71",
+"}. c #B6B6B6",
+"|. c #B7B7B7",
+" X c gray72",
+".X c #B9B9B9",
+"XX c gray73",
+"oX c #BBBBBB",
+"OX c #BCBCBC",
+"+X c gray74",
+"@X c gray",
+"#X c gray75",
+"$X c #C0C0C0",
+"%X c #C1C1C1",
+"&X c gray76",
+"*X c #C3C3C3",
+"=X c gray77",
+"-X c #C5C5C5",
+";X c #C6C6C6",
+":X c gray78",
+">X c #C8C8C8",
+",X c gray79",
+"<X c #CACACA",
+"1X c #CBCBCB",
+"2X c gray80",
+"3X c #CDCDCD",
+"4X c #CECECE",
+"5X c gray81",
+"6X c #D0D0D0",
+"7X c gray82",
+"8X c #D2D2D2",
+"9X c LightGray",
+"0X c gray83",
+"qX c #D5D5D5",
+"wX c gray84",
+"eX c #D7D7D7",
+"rX c #D8D8D8",
+"tX c gray85",
+"yX c #DADADA",
+"uX c gray86",
+"iX c gainsboro",
+"pX c #DDDDDD",
+"aX c gray87",
+"sX c #DFDFDF",
+"dX c gray88",
+"fX c #E1E1E1",
+"gX c #E2E2E2",
+"hX c gray89",
+"jX c #E4E4E4",
+"kX c gray90",
+"lX c #E6E6E6",
+"zX c #E7E7E7",
+"xX c gray91",
+"cX c #E9E9E9",
+"vX c #EAEAEA",
+"bX c gray92",
+"nX c #ECECEC",
+"mX c gray93",
+"MX c #EEEEEE",
+"NX c #EFEFEF",
+"BX c gray94",
+"VX c #F1F1F1",
+"CX c gray95",
+"ZX c #F3F3F3",
+"AX c #F4F4F4",
+"SX c gray96",
+"DX c #F6F6F6",
+"FX c gray97",
+"GX c #F8F8F8",
+"HX c #F9F9F9",
+"JX c gray98",
+"KX c #FBFBFB",
+"LX c gray99",
+"PX c #FDFDFD",
+"IX c #FEFEFE",
+"UX c gray100",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYX      YXYXYXYXYXYXYX",
+"YXYXYXYXYX  i.i.i.  YXYXYXYXYXYX",
+"YXYXYXYX  i.i.UXUXUX  YXYXYXYXYX",
+"YXYXYX  i.i.UXUX  UXUX  YXYXYXYX",
+"YXYX  i.i.UXUX  UXUXUXUX  YXYXYX",
+"YX  i.i.UXUX        UXUXUX  YXYX",
+"  UXUXUXUX  UX  UXUXUXUXUX$X  YX",
+"  i.i.UXUXUXUX  UXUXUXUX$X$X$X  ",
+"  i.i.i.UXUXUX  UXUXUX$X$X$X  YX",
+"YX  i.i.i.UXUXUXUXUX$X$X$X  YXYX",
+"YXYX  i.i.i.UXUXUX$X$X$X  YXYXYX",
+"YXYXYX  i.i.i.UX$X$X$X  YXYXYXYX",
+"YXYXYXYX  i.i.UX$X$X  YXYXYXYXYX",
+"YXYXYXYXYX  i.UX$X  YXYXYXYXYXYX",
+"YXYXYXYXYXYX  UX  YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYX  YXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kcharselect.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kcharselect.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kcharselect.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,178 @@
+/* XPM */
+static char *kcharselect[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 140 2",
+"   c black",
+".  c #010101",
+"X  c #020202",
+"o  c #030303",
+"O  c #040404",
+"+  c #050505",
+"@  c #060606",
+"#  c #070707",
+"$  c #0E0E0E",
+"%  c #0F0F0F",
+"&  c #111111",
+"*  c #131313",
+"=  c #141414",
+"-  c #454545",
+";  c #474747",
+":  c #494949",
+">  c #4B4B4B",
+",  c #4C4C4C",
+"<  c #4D4D4D",
+"1  c #4F4F4F",
+"2  c #505050",
+"3  c #515151",
+"4  c #525252",
+"5  c #545454",
+"6  c #5A5A5A",
+"7  c #5D5D5D",
+"8  c #5E5E5E",
+"9  c #5F5F5F",
+"0  c #616161",
+"q  c #626262",
+"w  c #636363",
+"e  c #646464",
+"r  c #666666",
+"t  c #676767",
+"y  c #6D6D6D",
+"u  c #6E6E6E",
+"i  c #6F6F6F",
+"p  c #707070",
+"a  c #717171",
+"s  c #727272",
+"d  c #737373",
+"f  c #747474",
+"g  c #8A8A8A",
+"h  c #8B8B8B",
+"j  c #8C8C8C",
+"k  c #8D8D8D",
+"l  c #8E8E8E",
+"z  c #8F8F8F",
+"x  c #909090",
+"c  c #919191",
+"v  c #929292",
+"b  c #939393",
+"n  c #949494",
+"m  c #959595",
+"M  c #969696",
+"N  c #979797",
+"B  c #989898",
+"V  c #999999",
+"C  c #9A9A9A",
+"Z  c #9B9B9B",
+"A  c #9C9C9C",
+"S  c #9D9D9D",
+"D  c #9E9E9E",
+"F  c #9F9F9F",
+"G  c #A0A0A0",
+"H  c #A1A1A1",
+"J  c #A2A2A2",
+"K  c #A3A3A3",
+"L  c #A5A5A5",
+"P  c #AEAEAE",
+"I  c #B0B0B0",
+"U  c #B1B1B1",
+"Y  c #B2B2B2",
+"T  c #B4B4B4",
+"R  c #B5B5B5",
+"E  c #B7B7B7",
+"W  c #B8B8B8",
+"Q  c #B9B9B9",
+"!  c #BABABA",
+"~  c #BBBBBB",
+"^  c #BCBCBC",
+"/  c #BDBDBD",
+"(  c #BEBEBE",
+")  c #BFBFBF",
+"_  c #C0C0C0",
+"`  c #C1C1C1",
+"'  c #C2C2C2",
+"]  c #C3C3C3",
+"[  c #C4C4C4",
+"{  c #C5C5C5",
+"}  c #C6C6C6",
+"|  c #C7C7C7",
+" . c #C8C8C8",
+".. c #C9C9C9",
+"X. c #CACACA",
+"o. c #CBCBCB",
+"O. c #CCCCCC",
+"+. c #CDCDCD",
+"@. c #CECECE",
+"#. c #D0D0D0",
+"$. c #D2D2D2",
+"%. c #D5D5D5",
+"&. c #D6D6D6",
+"*. c #D7D7D7",
+"=. c #D8D8D8",
+"-. c #D9D9D9",
+";. c #DADADA",
+":. c #DBDBDB",
+">. c #DCDCDC",
+",. c #DDDDDD",
+"<. c #DEDEDE",
+"1. c #DFDFDF",
+"2. c #E0E0E0",
+"3. c #E1E1E1",
+"4. c #E2E2E2",
+"5. c #E3E3E3",
+"6. c #E4E4E4",
+"7. c #E5E5E5",
+"8. c #E6E6E6",
+"9. c #E7E7E7",
+"0. c #E8E8E8",
+"q. c #E9E9E9",
+"w. c #EAEAEA",
+"e. c #EBEBEB",
+"r. c #ECECEC",
+"t. c #EDEDED",
+"y. c #EEEEEE",
+"u. c #EFEFEF",
+"i. c #F0F0F0",
+"p. c #F1F1F1",
+"a. c #F2F2F2",
+"s. c #F3F3F3",
+"d. c #F4F4F4",
+"f. c #F5F5F5",
+"g. c #F6F6F6",
+"h. c #F7F7F7",
+"j. c #F9F9F9",
+"k. c #FAFAFA",
+"l. c #FBFBFB",
+"z. c None",
+/* pixels */
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.O * = # z.z.z.z.z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.O a O...a O z.z.z.z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.z.z.O a <.4.4.4.a O z.z.z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.z.O a 4.7.7.7.7.4.a O z.z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.O a 4.7.9.<.<.9.7.7.a O z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.O f 4.9.t.%.V G <.9.9.7.f O z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.O a 4.9.9.:.G <.4._ 9.t.9.7.a O z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.O a 4.9.t.:.G <.u.k.t.t.t.t.t.7.f O z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.O a 4.9.9.:.L <.t.7.7.4.4.4.<.9.9.7.a O z.z.z.z.z.z.",
+"z.z.z.z.z.O a <.9.9.:.G <.s.:.G G G G G F ~ 9.9.7.a   z.z.z.z.z.",
+"z.z.z.z.O y <.7.9.%.G <.u.t.s.k.s.s.u.t.t.Y 4.9.7.4.a O z.z.z.z.",
+"z.z.z.  r :.4.7.%.G :.s.4.G u.7.4.4.<.<.<.4.9.9.7.7.<.y O z.z.z.",
+"z.z.O 1 L O.4.7.^ ^ u.s.s.Y 9.^ t.l.k.s.u.u.t.9.7.4.:...r O z.z.",
+"z.  4 F F G O.7.7...t.s.s.Y t.^ 9.k.s.u.u.u.t.9.7.:...O...t   z.",
+"z.% b G F V G @.9.9.u.t.u.Y 9.~ 9.k.s.s.u.t.9.7.:.......O.^ = z.",
+"z.% l F V V b F @.9.9.t.u.P 7.~ 9.s.s.u.t.t.9.<.[ _ [ ....~ * z.",
+"z.  1 V V V b v F @.9.t.t.:.u.4.t.u.u.u.t.9.:._ _ _ [ ..[ t   z.",
+"z.z.O 1 b b b v l b O.9.9.t.t.u.t.u.t.9.9.:.^ ~ ^ _ [ _ r O z.z.",
+"z.z.z.  1 b v l l l V @.9.9.t.9.t.9.t.9.<._ Y ~ ^ ^ ^ 0   z.z.z.",
+"z.z.z.z.O : l l l g l b O.9.7.9.7.9.7.:._ ~ ~ Y ~ ~ 0 O z.z.z.z.",
+"z.z.z.z.z.O ; g l l v v F O.7.7.7.7.<.[ ^ ~ ~ ~ Y 0   z.z.z.z.z.",
+"z.z.z.z.z.z.  ; l v v b b G O.4.4.:..._ _ ^ ^ Y 6 O z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.  : v b b V V G @.:...[ [ _ _ ^ 0   z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.O : b V V V F [ %.....[ [ _ 0 O z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.O 1 V F F G [ %.O.....[ 0 O z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.  1 V F G _ @.O.O...0 O z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.z.O 4 F G _ @.O...t O z.z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.z.z.O 4 L ^ @...r O z.z.z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.  4 Y ^ t O z.z.z.z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.O * = O z.z.z.z.z.z.z.z.z.z.z.z.z.z.",
+"z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z.z."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kdf-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kdf-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kdf-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,206 @@
+/* XPM */
+static char *kdf-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 184 2",
+"   c black",
+".  c #000001",
+"X  c #010000",
+"o  c #000200",
+"O  c #000201",
+"+  c #020000",
+"@  c #000006",
+"#  c #000600",
+"$  c #000801",
+"%  c #000B03",
+"&  c #000F00",
+"*  c #0E0000",
+"=  c #000111",
+"-  c #00021A",
+";  c #001100",
+":  c #001300",
+">  c #001804",
+",  c #21310A",
+"<  c #001748",
+"1  c #001C48",
+"2  c #001E48",
+"3  c #001C4C",
+"4  c #004904",
+"5  c #006701",
+"6  c #006009",
+"7  c #006E05",
+"8  c #007E10",
+"9  c #541201",
+"0  c #712003",
+"q  c #776B7D",
+"w  c #00539D",
+"e  c #00549F",
+"r  c #005EB5",
+"t  c #0067E4",
+"y  c #0075ED",
+"u  c #0079EF",
+"i  c #007BEF",
+"p  c #007DF0",
+"a  c #007EF0",
+"s  c #007FF0",
+"d  c #007EF5",
+"f  c #5E6C98",
+"g  c #75758F",
+"h  c #00881E",
+"j  c #009A0B",
+"k  c #009F15",
+"l  c #00AF00",
+"z  c #00AB0C",
+"x  c #00A914",
+"c  c #05B30D",
+"v  c #00B806",
+"b  c #00BD05",
+"n  c #00B809",
+"m  c #00BA0F",
+"M  c #00BC0F",
+"N  c #00B012",
+"B  c #00B212",
+"V  c #00B411",
+"C  c #00B710",
+"Z  c #01B415",
+"A  c #00AA3B",
+"S  c #04825D",
+"D  c #00C106",
+"F  c #00C10E",
+"G  c #00C70D",
+"H  c #00CA02",
+"J  c #00C905",
+"K  c #00CB0C",
+"L  c #00CD0B",
+"P  c #00CF0D",
+"I  c #00C514",
+"U  c #00D00B",
+"Y  c #00D40A",
+"T  c #00DF00",
+"R  c #00DE07",
+"E  c #00D908",
+"W  c #00D80B",
+"Q  c #00DC0B",
+"!  c #00DF08",
+"~  c #00DE0A",
+"^  c #00D324",
+"/  c #00E501",
+"(  c #00E606",
+")  c #00E308",
+"_  c #00E905",
+"`  c #00EC06",
+"'  c #00E809",
+"]  c #00F106",
+"[  c #00F503",
+"{  c #00FD00",
+"}  c #00FF02",
+"|  c #00FF03",
+" . c #00A292",
+".. c #00B087",
+"X. c #1881DB",
+"o. c #0088EC",
+"O. c #0081FE",
+"+. c #0087FE",
+"@. c #0088F1",
+"#. c #008EFE",
+"$. c #009EEB",
+"%. c #0098F1",
+"&. c #009DF8",
+"*. c #059FFF",
+"=. c #0DACEA",
+"-. c #00A4FF",
+";. c #00A6FF",
+":. c #00A7FF",
+">. c #00A8FF",
+",. c #01A8FF",
+"<. c #00AAFF",
+"1. c #00ADFF",
+"2. c #00AEFF",
+"3. c #00AFFF",
+"4. c #00B0FF",
+"5. c #02B2FF",
+"6. c #00B7F8",
+"7. c #00B5FF",
+"8. c #00B6FD",
+"9. c #00B7FF",
+"0. c #00B9FF",
+"q. c #00BAFF",
+"w. c #00BCFF",
+"e. c #00BDFF",
+"r. c #00BEFF",
+"t. c #22A5D7",
+"y. c #22A2E2",
+"u. c #00C2FF",
+"i. c #00C3FF",
+"p. c #00C5FF",
+"a. c #05C3FF",
+"s. c #00CEFE",
+"d. c #00CEFF",
+"f. c #00D0FF",
+"g. c #00D1FF",
+"h. c #00D2FF",
+"j. c #00D4FF",
+"k. c #00D5FF",
+"l. c #00DEFF",
+"z. c #00DFFF",
+"x. c #00E4FF",
+"c. c #00E9FF",
+"v. c #4D83B1",
+"b. c #921301",
+"n. c #AC3A09",
+"m. c #B75A13",
+"M. c #856B71",
+"N. c #CC2F04",
+"B. c #C77820",
+"V. c #E85C13",
+"C. c #F34F0D",
+"Z. c #FF4910",
+"A. c #F85200",
+"S. c #FF5200",
+"D. c #FD5400",
+"F. c #FA5E08",
+"G. c #FF5711",
+"H. c #F96006",
+"J. c #F46319",
+"K. c #FB651A",
+"L. c #FF6719",
+"P. c #FF651C",
+"I. c #FF6B12",
+"U. c #FB701D",
+"Y. c #FC731F",
+"T. c #FF771C",
+"R. c #FF6420",
+"E. c #FF7222",
+"W. c #FB7A25",
+"Q. c #FF7A29",
+"!. c #FF7B28",
+"~. c #FF7D28",
+"^. c #C68827",
+"/. c #FF8021",
+"(. c #FF8227",
+"). c #FE892D",
+"_. c #FE8B2C",
+"`. c #FF8330",
+"'. c #FF8A32",
+"]. c #FF9136",
+"[. c #FF9534",
+"{. c #FA913A",
+"}. c gray100",
+"|. c None",
+/* pixels */
+"|.|.|.|.|.|.t o.7.e @ |.|.|.|.|.",
+"|.|.|.|.u @.6.l.c.k.w = |.|.|.|.",
+"|.|.|.+.&.s.h.h.s.k.s.r - |.|.|.",
+"|.|.|.M.=.l.r.q.r.r.u.1.3   |.|.",
+"|.|.D.H.t.x.h.5.:.:.5.:.2   |.|.",
+"|.F./.{.y.k.h.a.*.:.7.5.2   |.|.",
+"|.).[.(.v.r.p.q.:.1.u.:.<   |.|.",
+"|.).].T.J.f :.7.5.1.$...h ; |.|.",
+"|.W.'.!.I.Y.g #.%. .^ { { z > |.",
+"|.Y.!.E.!.`.^.S A T / R ) ' j   ",
+"|.n.K.L.P.R.B.c b m B V C P n $ ",
+"|.  0 C.G.Z.m.Z K P x k C ~ b # ",
+"|.|.  9 N.b., I Y ( L B P ] J # ",
+"|.|.|.  *   % 8 ~ [ W F ) { l   ",
+"|.|.|.|.|.|.|.  6 ( ` W J 5 ;   ",
+"|.|.|.|.|.|.|.|.  4 v 7 :       "
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kdf.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kdf.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kdf.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,199 @@
+/* XPM */
+static char *kdf[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 161 2",
+"   c black",
+".  c #001E01",
+"X  c #1D0200",
+"o  c #003302",
+"O  c #200300",
+"+  c #005500",
+"@  c #006302",
+"#  c #00640F",
+"$  c #006C15",
+"%  c #007705",
+"&  c #007B0B",
+"*  c #007E10",
+"=  c #006B7A",
+"-  c #00777F",
+";  c #520900",
+":  c #5E0500",
+">  c #640800",
+",  c #7C1300",
+"<  c #0033B8",
+"1  c #0030C6",
+"2  c #00449F",
+"3  c #0043BD",
+"4  c #004BB9",
+"5  c #00669D",
+"6  c #204BB6",
+"7  c #3058BD",
+"8  c #004CCB",
+"9  c #0041D1",
+"0  c #0050CD",
+"q  c #0052D0",
+"w  c #1057D3",
+"e  c #005DE5",
+"r  c #0060DF",
+"t  c #006DDF",
+"y  c #106EDB",
+"u  c #0064E0",
+"i  c #006CE2",
+"p  c #006CEB",
+"a  c #0071EE",
+"s  c #0079E4",
+"d  c #007CEB",
+"f  c #0076F1",
+"g  c #00850F",
+"h  c #008C00",
+"j  c #008E15",
+"k  c #009701",
+"l  c #00940F",
+"z  c #009907",
+"x  c #009217",
+"c  c #00911A",
+"v  c #009B15",
+"b  c #00A204",
+"n  c #00AE0D",
+"m  c #00A414",
+"M  c #00AC13",
+"N  c #00AC1F",
+"B  c #00B707",
+"V  c #00B409",
+"C  c #00BA02",
+"Z  c #00BD0E",
+"A  c #00B411",
+"S  c #00B218",
+"D  c #00BA10",
+"F  c #00BB19",
+"G  c #00A920",
+"H  c #2E931D",
+"J  c #00994F",
+"K  c #00C20D",
+"L  c #00CB0B",
+"P  c #00C711",
+"I  c #00D405",
+"U  c #00D20A",
+"Y  c #00DC04",
+"T  c #00DA08",
+"R  c #00C033",
+"E  c #00D325",
+"W  c #00E406",
+"Q  c #00EB04",
+"!  c #00E118",
+"~  c #00F302",
+"^  c #00FA01",
+"/  c #409F21",
+"(  c #40A525",
+")  c #40AC29",
+"_  c #40A736",
+"`  c #0082EF",
+"'  c #0083F1",
+"]  c #008CF3",
+"[  c #0091F4",
+"{  c #009BF3",
+"}  c #009DFF",
+"|  c #00A4FF",
+" . c #00ABFE",
+".. c #00B3FE",
+"X. c #00BAFE",
+"o. c #26ACFF",
+"O. c #00C2FE",
+"+. c #00CAFE",
+"@. c #00D3FE",
+"#. c #00DBFE",
+"$. c #00E1FF",
+"%. c #831900",
+"&. c #9A1B01",
+"*. c #962200",
+"=. c #A01A02",
+"-. c #AE1D01",
+";. c #A92A00",
+":. c #BB2C03",
+">. c #B93503",
+",. c #9F6D6A",
+"<. c #BF664A",
+"1. c #CC3900",
+"2. c #CF3B08",
+"3. c #DC3308",
+"4. c #EE3606",
+"5. c #FF3F09",
+"6. c #D64103",
+"7. c #CF5C35",
+"8. c #E14A0D",
+"9. c #EE5B13",
+"0. c #FF440C",
+"q. c #FF4807",
+"w. c #FF4B0D",
+"e. c #FF4C10",
+"r. c #FE5600",
+"t. c #FF510D",
+"y. c #FE5E06",
+"u. c #FF5C0B",
+"i. c #FF5412",
+"p. c #FF5C14",
+"a. c #FF5A18",
+"s. c #FE630B",
+"d. c #F16315",
+"f. c #F5651A",
+"g. c #F56918",
+"h. c #FF6511",
+"j. c #FF641B",
+"k. c #FF6914",
+"l. c #FD6B1D",
+"z. c #FE731C",
+"x. c #FE791E",
+"c. c #FF6620",
+"v. c #FF6C22",
+"b. c #FF7323",
+"n. c #FF7729",
+"m. c #FF7B24",
+"M. c #FF7C2A",
+"N. c #CF6F45",
+"B. c #EF863F",
+"V. c #FF8227",
+"C. c #FF832C",
+"Z. c #FF8A2C",
+"A. c #FF8532",
+"S. c #FF8C33",
+"D. c #FF9334",
+"F. c #FF9338",
+"G. c #FF9836",
+"H. c #FF9B3A",
+"J. c #FFA040",
+"K. c gray100",
+"L. c None",
+/* pixels */
+"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.p p { p e L.L.L.L.L.L.L.L.L.L.L.L.",
+"L.L.L.L.L.L.L.L.L.L.L.L.L.a p { @.$.+.r 3 L.L.L.L.L.L.L.L.L.L.L.",
+"L.L.L.L.L.L.L.L.L.L.L.L.a ] O.$.$.$.$.#.t 3 L.L.L.L.L.L.L.L.L.L.",
+"L.L.L.L.L.L.L.L.L.L.f ' O.#.#.#.#.#.#.#. at .r 9 L.L.L.L.L.L.L.L.L.",
+"L.L.L.L.L.L.L.L.L.'  . at .@. at .@. at .@. at .@. at .@.+.s < L.L.L.L.L.L.L.L.",
+"L.L.L.L.L.L.L.L.L.] #.+.+.+.+.+.+.+.+.+.+.+.+.i 1 L.L.L.L.L.L.L.",
+"L.L.L.L.L.L.L.L.L.] $.#.O.X.O.O.O.X.O.X.O.O.O.X.8   L.L.L.L.L.L.",
+"L.L.L.L.L.L.L.L.L.] $.$. at .X...X.X.X.X.X.X. .....q   L.L.L.L.L.L.",
+"L.L.L.L.L.L.L.L.r.` $.$.#.#... . ... . . . .....q   L.L.L.L.L.L.",
+"L.L.L.L.L.L.r.s.Z.` @.#.#. at .+...| | | |  . ...X.0   L.L.L.L.L.L.",
+"L.L.L.L.r.y.x.H.H.d @. at .@. at .@. at .o.} } |  . .X.X.0   L.L.L.L.L.L.",
+"L.L.L.r.x.G.H.F.D.d +.+.+.+.+.+. .} |  .....X.O.8   L.L.L.L.L.L.",
+"L.L.L.x.G.D.D.Z.Z.p O.O.O.+.O.O.| |  . ...X.X.O.8   L.L.L.L.L.L.",
+"L.L.L.m.J.Z.V.V.m.,.d X.X.X.O.X.| |  ...X.X.O.O.8   L.L.L.L.L.L.",
+"L.L.L.x.H.F.V.z.x.z.<.y ....X... . . ...X.X.X.i = $ L.L.L.L.L.L.",
+"L.L.L.z.F.D.D.m.k.k.s.7.w  ... . . ..... .t - ! ^ F c L.L.L.L.L.",
+"L.L.L.l.S.S.S.C.z.u.u.p.N.7 [  . . ...d 5 E ^ ^ ^ ^ P c L.L.L.L.",
+"L.L.L.g.A.C.V.m.M.b.n.F.F.B.6 ]  .d 5 R ^ ^ ^ ^ ^ ^ ^ P j L.L.L.",
+"L.L.L.d.M.M.n.m.b.b.S.A.A.M._ 2 4 J W W W W W W W W W W K g L.L.",
+"L.L.L.9.b.b.b.b.l.l.M.n.n.n.) m D U U U U U U U U U U U U n   L.",
+"L.L.L.6.f.l.l.j.l.j.b.v.v.c.) m M Z K D K K D K D K K K U V   L.",
+"L.L.L.1.>.9.j.j.p.p.c.c.a.a.( M A Z K A M M M M M V K L T B   L.",
+"L.L.L.L.  ;.8.p.p.i.a.i.e.e./ A D K L U m v v m S Z L U W B   L.",
+"L.L.L.L.L.L.*.2.t.w.e.0.0.3.H A Z L U U T M v M Z K U W W B   L.",
+"L.L.L.L.L.L.L.%.:.q.0.4.=.: G Z L L T T W K m A Z L T W ~ C   L.",
+"L.L.L.L.L.L.L.L., &.-.> X   G K L U T W Q L M Z K U W Q ~ C   L.",
+"L.L.L.L.L.L.L.L.L.; O       N S L U W W ~ U A K U T Q ~ ^ C   L.",
+"L.L.L.L.L.L.L.L.L.L.    L.L.L.j M T W ~ ~ T Z L U W Q ^ Y h   L.",
+"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.# v T ~ ^ W K U T Q Y k +     L.",
+"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.* l W ^ Y L T Y b @       L.L.",
+"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.& & I W L z @ .     L.L.L.L.",
+"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.  & z % o       L.L.L.L.L."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kedit-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kedit-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kedit-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,186 @@
+/* XPM */
+static char *kedit-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 164 2",
+"   c black",
+".  c #020000",
+"X  c #050300",
+"o  c #050600",
+"O  c #060600",
+"+  c #1B0000",
+"@  c #1C0000",
+"#  c #1C0101",
+"$  c #1D0000",
+"%  c #191603",
+"&  c #1D160E",
+"*  c #1F190E",
+"=  c #3D0000",
+"-  c #31300B",
+";  c #460406",
+":  c #4E000D",
+">  c #560207",
+",  c #57070C",
+"<  c #580107",
+"1  c #503C20",
+"2  c #660104",
+"3  c #54470B",
+"4  c #585614",
+"5  c #5C5C17",
+"6  c #7F4816",
+"7  c #990002",
+"8  c #9A0306",
+"9  c #9A0407",
+"0  c #9C0408",
+"q  c #9D090C",
+"w  c #9E0F17",
+"e  c #9A1319",
+"r  c #9F273A",
+"t  c #A60609",
+"y  c #AD0F16",
+"u  c #A5171A",
+"i  c #A61619",
+"p  c #A2293C",
+"a  c #A4293B",
+"s  c #814712",
+"d  c #804816",
+"f  c #964212",
+"g  c #9F4E1A",
+"h  c #934220",
+"j  c #975626",
+"k  c #985726",
+"l  c #A04F1B",
+"z  c #A1531C",
+"x  c #BA4639",
+"c  c #BA4739",
+"v  c #B07B2D",
+"b  c #B07C2D",
+"n  c #8F7748",
+"m  c #BB4144",
+"M  c #BF4158",
+"N  c #BB525D",
+"B  c #C9323D",
+"V  c #D73E49",
+"C  c #CB4D5B",
+"Z  c #CA5054",
+"A  c #D94754",
+"S  c #D05A46",
+"D  c #D75E5B",
+"F  c #C15665",
+"G  c #CB5B7A",
+"H  c #D95F66",
+"J  c #DD5967",
+"K  c #CF624F",
+"L  c #CE6250",
+"P  c #DC635E",
+"I  c #D27D4F",
+"U  c #D47E4F",
+"Y  c #C6636B",
+"T  c #CA6265",
+"R  c #CF6A6A",
+"E  c #D46361",
+"W  c #D8666B",
+"Q  c #D0777F",
+"!  c #E25F6D",
+"~  c #E4606E",
+"^  c #E4626F",
+"/  c #E1686C",
+"(  c #E76B6C",
+")  c #E9606B",
+"_  c #EC666F",
+"`  c #EE666F",
+"'  c #E26272",
+"]  c #E36474",
+"[  c #E46370",
+"{  c #E66775",
+"}  c #E96671",
+"|  c #EA6670",
+" . c #EC6473",
+".. c #ED6D76",
+"X. c #E96E7A",
+"o. c #EF6A78",
+"O. c #E87F6B",
+"+. c #E97E6A",
+"@. c #E47777",
+"#. c #F06B73",
+"$. c #A56787",
+"%. c #BF6E81",
+"&. c #B47E94",
+"*. c #C37699",
+"=. c #CF7F94",
+"-. c #CC7F9A",
+";. c #F07880",
+":. c #9D9310",
+">. c #B79E7E",
+",. c #FC941C",
+"<. c #FC9923",
+"1. c #FF9A24",
+"2. c #FF9A25",
+"3. c #FFB407",
+"4. c #FFB507",
+"5. c #E4BE34",
+"6. c #D48351",
+"7. c #D89A58",
+"8. c #D79C79",
+"9. c #C7A150",
+"0. c #FDAE46",
+"q. c #F0B853",
+"w. c #FFC118",
+"e. c #FFD702",
+"r. c #FFD40A",
+"t. c #FFD40B",
+"y. c #FFD70A",
+"u. c #F2D511",
+"i. c #FFEE1C",
+"p. c #FFEF1D",
+"a. c #FFF11B",
+"s. c #FFFB1E",
+"d. c #FFFC1E",
+"f. c #FFF024",
+"g. c #FDF753",
+"h. c #AFBFE2",
+"j. c #B0C0E0",
+"k. c #BDECFF",
+"l. c #DB8585",
+"z. c #C482A2",
+"x. c #EB8585",
+"c. c #F0858D",
+"v. c #F4969E",
+"b. c #F19DA4",
+"n. c #EFACAF",
+"m. c #F4A8AE",
+"M. c #FAA7AA",
+"N. c #F9A8AC",
+"B. c #F4B2B6",
+"V. c #F7B0B4",
+"C. c #F7B7BC",
+"Z. c #C8BFE3",
+"A. c #DDD2D6",
+"S. c #C6EDFF",
+"D. c #E3D5DD",
+"F. c #E6D4DC",
+"G. c #F9C0C3",
+"H. c #FDC8C9",
+"J. c #FACED0",
+"K. c #FAD8DB",
+"L. c #EAFDFF",
+"P. c #FDE2E3",
+"I. c gray100",
+"U. c None",
+/* pixels */
+"U.U.U.U.U.U.U.U.U.U.U.U.f.9.& U.",
+"U.U.q 8 U.t 2 U.U.U.U.i.i.5.n * ",
+"U.U.u m 0 *.=.> U.U.s.i.r.4.0.1 ",
+"U.7 T P.Y D.I.-.: :.s.e.4.1.s X ",
+"U.u n.K.J.l.D.L.8.u.r.4.1.6   U.",
+"8 Z C.G.H.B.Q A.g.e.4.1.6   U.U.",
+"y x.N.M.m.V.b.R q.w.,.f   U.U.U.",
+"h 6.P o.;.c.v. at .S 7.>.$.< U.U.U.",
+"5 l K +.! _ ..W H N j.S.*.,   U.",
+"O - b x ( .._ | X.! F j.k.G = U.",
+"U.U.3 k U D  .| ^ ] A &.Z.a @ U.",
+"U.U.U.4 l K O.~ ^ ' C z.p + U.U.",
+"U.U.U.O - v x / { J M r @ U.U.U.",
+"U.U.U.U.U.3 j I E V w @ U.U.U.U.",
+"U.U.U.U.U.U.4 z B e + U.U.U.U.U.",
+"U.U.U.U.U.U.O % ; @ U.U.U.U.U.U."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kedit.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kedit.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kedit.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kedit[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #0A0802",
+"X  c #160202",
+"o  c #1D1207",
+"O  c #1B1904",
+"+  c #300001",
+"@  c #2B2509",
+"#  c #342E07",
+"$  c #342F08",
+"%  c #32300F",
+"&  c #353310",
+"*  c #440001",
+"=  c #4D0405",
+"-  c #530303",
+";  c #550608",
+":  c #5A0306",
+">  c #443319",
+",  c #4A3519",
+"<  c #620E08",
+"1  c #524C09",
+"2  c #7E4C14",
+"3  c #6F552B",
+"4  c #615739",
+"5  c #70582D",
+"6  c #7A4E76",
+"7  c #8F040A",
+"8  c #8E090C",
+"9  c #900809",
+"0  c #9B0003",
+"q  c #9B0508",
+"w  c #9D090C",
+"e  c #A60507",
+"r  c #A40508",
+"t  c #A30A0C",
+"y  c #AC0B0E",
+"u  c #A81013",
+"i  c #B40709",
+"p  c #B90F1A",
+"a  c #B41117",
+"s  c #AD1223",
+"d  c #AC1D23",
+"f  c #BC1F25",
+"g  c #BD1F2E",
+"h  c #BB1F31",
+"j  c #AB2028",
+"k  c #A32433",
+"l  c #B32229",
+"z  c #B6292B",
+"x  c #BD2220",
+"c  c #BB202C",
+"v  c #BB2922",
+"b  c #BA2B2B",
+"n  c #B22225",
+"m  c #B22F3C",
+"M  c #BC2C31",
+"N  c #B3313A",
+"B  c #BC3638",
+"V  c #BD393A",
+"C  c #A83043",
+"Z  c #B63B49",
+"A  c #BD3F42",
+"S  c #B83B48",
+"D  c #844C14",
+"F  c #9C4410",
+"G  c #9F4B12",
+"H  c #845B28",
+"J  c #A94814",
+"K  c #B24D27",
+"L  c #B14D28",
+"P  c #B57239",
+"I  c #9D5D7D",
+"U  c #B7474B",
+"Y  c #BA434A",
+"T  c #B94D68",
+"R  c #BB4972",
+"E  c #B55471",
+"W  c #A77C4E",
+"Q  c #B9646A",
+"!  c #C20D16",
+"~  c #CB0C12",
+"^  c #C51217",
+"/  c #C3121A",
+"(  c #CD1116",
+")  c #CD141B",
+"_  c #C42D34",
+"`  c #C72E38",
+"'  c #D8263A",
+"]  c #C24A5C",
+"[  c #D84C5C",
+"{  c #D2525B",
+"}  c #DE525D",
+"|  c #CB5260",
+" . c #D65D62",
+".. c #DA5668",
+"X. c #DE5C64",
+"o. c #DB5D6A",
+"O. c #D85665",
+"+. c #DC5F70",
+"@. c #C57345",
+"#. c #D1666D",
+"$. c #D46C62",
+"%. c #D96E62",
+"&. c #D56562",
+"*. c #DD6072",
+"=. c #DF6779",
+"-. c #DC6C7A",
+";. c #D77376",
+":. c #DE7B7E",
+">. c #E05E6D",
+",. c #E15F72",
+"<. c #E1606D",
+"1. c #EC646E",
+"2. c #E36370",
+"3. c #E56A73",
+"4. c #EA6671",
+"5. c #EC6972",
+"6. c #E46B7A",
+"7. c #E47562",
+"8. c #EE7263",
+"9. c #E2777B",
+"0. c #EB737D",
+"q. c #F26A6E",
+"w. c #F36A70",
+"e. c #F67175",
+"r. c #F07F75",
+"t. c #F2767C",
+"y. c #9A7284",
+"u. c #B9578B",
+"i. c #BB588A",
+"p. c #BC6194",
+"a. c #B773A7",
+"s. c #B571A8",
+"d. c #B875AA",
+"f. c #BC7BAB",
+"g. c #C96789",
+"h. c #C07FA9",
+"j. c #E37785",
+"k. c #E47B85",
+"l. c #EF7C85",
+"z. c #EA7481",
+"x. c #96851C",
+"c. c #BEA820",
+"v. c #98804D",
+"b. c #988054",
+"n. c #958B7D",
+"m. c #BC9552",
+"M. c #B6A577",
+"N. c #DBB915",
+"B. c #C1A23C",
+"V. c #C8BB36",
+"C. c #FB9F12",
+"Z. c #F58D21",
+"A. c #FC8E25",
+"S. c #F98D2A",
+"D. c #FB9126",
+"F. c #FE9528",
+"G. c #FF9F34",
+"H. c #FAA218",
+"J. c #FFBC00",
+"K. c #E0AE2E",
+"L. c #F9B13F",
+"P. c #D68354",
+"I. c #D6885B",
+"U. c #CD8775",
+"Y. c #CAA940",
+"T. c #DAA74A",
+"R. c #D0AE69",
+"E. c #FFAB45",
+"W. c #EDB967",
+"Q. c #F3B46C",
+"!. c #F4BB6C",
+"~. c #F9B96E",
+"^. c #FFC001",
+"/. c #FFCD0B",
+"(. c #FFD209",
+"). c #FFC526",
+"_. c #FFD12F",
+"`. c #FFEE13",
+"'. c #FFED1C",
+"]. c #FFF413",
+"[. c #FFF21B",
+"{. c #FFEB23",
+"}. c #FFE63F",
+"|. c #ECCE45",
+" X c #F7D84F",
+".X c #EFC578",
+"XX c #FFD771",
+"oX c #FFD87B",
+"OX c #EEEA70",
+"+X c #94A7BB",
+"@X c #AA8BA6",
+"#X c #B28EA4",
+"$X c #B8B3DA",
+"%X c #ADBDE3",
+"&X c #ACD2FF",
+"*X c #B6C2F9",
+"=X c #B1DAFF",
+"-X c #BADBFF",
+";X c #BCE2FE",
+":X c #CB979F",
+">X c #D49B9E",
+",X c #C282A9",
+"<X c #CA98A2",
+"1X c #D9A09F",
+"2X c #ED969E",
+"3X c #F38C92",
+"4X c #F09197",
+"5X c #F19699",
+"6X c #F39A9E",
+"7X c #F99498",
+"8X c #F99A9C",
+"9X c #EF94A0",
+"0X c #F89DA1",
+"qX c #EEA1A9",
+"wX c #EFB1B3",
+"eX c #F4A4A9",
+"rX c #F9A5A7",
+"tX c #FAA6A9",
+"yX c #F0A7B0",
+"uX c #F2ADB3",
+"iX c #F8AFB3",
+"pX c #F6B4B6",
+"aX c #F5B9BC",
+"sX c #F9B0B3",
+"dX c #FABBBD",
+"fX c #F5BEC3",
+"gX c #FDD381",
+"hX c #FFDC86",
+"jX c #C1C1D9",
+"kX c #C0D7FE",
+"lX c #C3DEFF",
+"zX c #C3E0FE",
+"xX c #C5E8FF",
+"cX c #CBE5FE",
+"vX c #CDEBFF",
+"bX c #D7E4FC",
+"nX c #D9E7FF",
+"mX c #D9EDFF",
+"MX c #D2F1FF",
+"NX c #F5C3C5",
+"BX c #F7C3C8",
+"VX c #FAC0C1",
+"CX c #FAC7C9",
+"ZX c #F8CBCD",
+"AX c #F6CED1",
+"SX c #F9CED1",
+"DX c #FBD2D4",
+"FX c #FEDBDC",
+"GX c #E0EBF3",
+"HX c #E3F6FF",
+"JX c #E2FAFF",
+"KX c #E9F4FF",
+"LX c #FDE3E5",
+"PX c #FEE9E9",
+"IX c #F6FCFF",
+"UX c #FEFFFF",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX{.T.> YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX'.'.XX.X5 YXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXt 8 YXYXYXYXYXYXYXYXYXYX'.'.`.}.W v.5 YXYX",
+"YXYXYXYXYXw w YXYXYXw r i - YXYXYXYXYXYXYXYX'.'.'.'./.K.4 R.> YX",
+"YXYXYXYXYXw u q YXw r T g./ - YXYXYXYXYXYX'.'.'.'./.J.J.L.gXm.  ",
+"YXYXYXYXq d pXA 0 t E bXJXh.! - YXYXYXYX'.'.'.'./.J.J.H.A.G.H   ",
+"YXYXYXYX0 ;.UXDXb C nXUXUXHXh.~ -   YX'.'.'.'./.J.J.H.S.F.D     ",
+"YXYXYXq n AXPXLXNXY >XUXUXUXKX#X! * 1 [.[.'./.J.J.H.S.F.D     YX",
+"YXYXYX0 :.LXAXAXLXNXV >XUXIXmXmXf.v N.[.'./.J.J.H.S.F.D     YXYX",
+"YXYXq z dXfXfXAXDXFXdXV >XMXKXUXnX|.].'./.J.J.H.S.F.D     YXYXYX",
+"YXw q 9.pXpXBXCXCXCXDXiXN :XUXKXOX].'./.J.J.H.S.F.D     YXYXYXYX",
+"YXq M 5XqXaXdXdXdXdXdXfXeXB :XcX X`./.J.J.H.S.F.D     YXYXYXYXYX",
+"w t X.6XuXsXsXsXsXsXyXsXdX6Xm U.oX_.J.J.H.S.F.2     YXYXYXYXYXYX",
+"w c 0.4X0X8X0XtXuX9XeXtXeXqX4Xz P.hX).C.A.D.J +   YXYXYXYXYXYXYX",
+"7 v Q..X7.q.w.t.k.3X8X8X9X6XrXr.v I.hXE.Z.W 6 p - YXYXYXYXYXYXYX",
+"o B.P @.K { w.<.1.w.0.k.3X7Xk.$.8.v @.M.n.+XzXs.! - YXYXYXYXYXYX",
+"& V.< s S >.,.4.q.5.<.q.e.l.#.U &. .d y.-X-XzXvXs.! - YXYXYXYXYX",
+". x.c.F V Q.W.8.1.,.w.w.4.,.5.3.-.j.3.M #X;X-XzXcXs.! -   YXYXYX",
+"YX. # @ B.P @.L ] q.w.5.,.q.w.2.6.0.z.>.l #XzX&X-XxXs.! =   YXYX",
+"YXYXYX% V.< s Z <.w.4.2.q.q.4.o.4.3.2.=...z @X=X&XvX*X' 9   YXYX",
+"YXYXYX. x.c.F S ~.W.%.1.w.2.2.q.4.,.*.<.3.[ d %XxXkXi.( =   YXYX",
+"YXYXYXYX. # @ c.P @.K { 4.2.q.4.2.+.2.,.+...d jXzXu.~ -     YXYX",
+"YXYXYXYXYXYX% V.< s S o.,.q.q.>.o.4.2.+.*.` Q lXu.~ -     YXYXYX",
+"YXYXYXYXYXYX. x.c.F V Q.Q.7.>.>.4.2.+.*...z $Xp.~ -     YXYXYXYX",
+"YXYXYXYXYXYXYX. # @ B.P @.L ] q.4.+.+.3._ I p.~ -     YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYX% V.< s Z >.>.+.+.2.} k R ) -     YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYX. x.c.F S Q.Q.%.o.5._ g ) -     YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYX  # @ c.W @.L | } a ^ ;     YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX$ V.< s Z +.h y ;     YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX. x.c.G h ' y ;     YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYX. $ O : t ;     YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  X     YXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kfloppy-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kfloppy-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kfloppy-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,206 @@
+/* XPM */
+static char *kfloppy-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 184 2",
+"   c black",
+".  c #000001",
+"X  c #000002",
+"o  c #010102",
+"O  c #000006",
+"+  c #00000C",
+"@  c #00000D",
+"#  c #00000E",
+"$  c #00000F",
+"%  c #09090A",
+"&  c #000010",
+"*  c #000011",
+"=  c #000012",
+"-  c #00001F",
+";  c #09091B",
+":  c #100906",
+">  c #110A07",
+",  c #1D1206",
+"<  c #000021",
+"1  c #030527",
+"2  c #050526",
+"3  c #0B0723",
+"4  c #0D0D22",
+"5  c #0E0D2A",
+"6  c #0E0E2A",
+"7  c #10102E",
+"8  c #29190C",
+"9  c #3F2824",
+"0  c #040541",
+"q  c #090B41",
+"w  c #0D0F45",
+"e  c #11144B",
+"r  c #171A50",
+"t  c #1F2257",
+"y  c #1E2556",
+"u  c #23235B",
+"i  c #26285D",
+"p  c #353543",
+"a  c #252562",
+"s  c #282A60",
+"d  c #292C61",
+"f  c #343466",
+"g  c #363A6D",
+"h  c #374369",
+"j  c #5A3414",
+"k  c #6F4216",
+"l  c #4A4A54",
+"z  c #4F4F5F",
+"x  c #424270",
+"c  c #404C71",
+"v  c #4F4F7A",
+"b  c #4C577C",
+"n  c #515163",
+"m  c #5C5368",
+"M  c #62626A",
+"N  c #646470",
+"B  c #6A6A79",
+"V  c #484D83",
+"C  c #5E5D81",
+"Z  c #5D5D84",
+"A  c #5B5E89",
+"S  c #556287",
+"D  c #576286",
+"F  c #576D97",
+"G  c #6F6982",
+"H  c #6E6E90",
+"J  c #637092",
+"K  c #687597",
+"L  c #707085",
+"P  c #747489",
+"I  c #74809F",
+"U  c #7A86A4",
+"Y  c #7989AB",
+"T  c #91581C",
+"R  c #8D6121",
+"E  c #A07541",
+"W  c #C3781A",
+"Q  c #BD954F",
+"!  c #CD902D",
+"~  c #D79F2D",
+"^  c #DE9729",
+"/  c #DA9D2F",
+"(  c #DEA52D",
+")  c #F59705",
+"_  c #FF9909",
+"`  c #F79E16",
+"'  c #FFA513",
+"]  c #FFA612",
+"[  c #FFA715",
+"{  c #F8A21B",
+"}  c #FDA911",
+"|  c #FCAA12",
+" . c #FFA810",
+".. c #FFAF1B",
+"X. c #E4AA2E",
+"o. c #FAB522",
+"O. c #FCBB20",
+"+. c #DDAB44",
+"@. c #FEC01E",
+"#. c #FFC226",
+"$. c #FFC626",
+"%. c #F9C92C",
+"&. c #FFD42E",
+"*. c #848494",
+"=. c #81809D",
+"-. c #96878E",
+";. c #818EAB",
+":. c #8989A5",
+">. c #8C8FB3",
+",. c #8792AE",
+"<. c #8D9AB5",
+"1. c #9495AE",
+"2. c #9D9DAE",
+"3. c #9595B2",
+"4. c #919DB7",
+"5. c #989AB4",
+"6. c #9F9FB6",
+"7. c #9FA7BF",
+"8. c #A89A99",
+"9. c #A5A5B6",
+"0. c #A6A6B5",
+"q. c #A1A2BC",
+"w. c #ACACBC",
+"e. c #BCADA7",
+"r. c #9A9EC3",
+"t. c #9BA8C1",
+"y. c #9EABC7",
+"u. c #A6AFC5",
+"i. c #A9A9C3",
+"p. c #A3B0C7",
+"a. c #A4B0C7",
+"s. c #A7B0C7",
+"d. c #ABB5CA",
+"f. c #AEB8CD",
+"g. c #AFB3D3",
+"h. c #B7B7C4",
+"j. c #B6B6C6",
+"k. c #B3B7C9",
+"l. c #B4B5C9",
+"z. c #BBBBCA",
+"x. c #BAC5D8",
+"c. c #C1AF9E",
+"v. c #CDBDAD",
+"b. c #DDCEB5",
+"n. c #C1C2D2",
+"m. c #C1C4D2",
+"M. c #C7C7D3",
+"N. c #C1C5D8",
+"B. c #C9C9D7",
+"V. c #CACAD6",
+"C. c #CACAD9",
+"Z. c #CBCBD8",
+"A. c #CAD0DD",
+"S. c #CCD3DF",
+"D. c #D1D1DC",
+"F. c #D7D7DF",
+"G. c #CED4E1",
+"H. c #CFD6E2",
+"J. c #D2D6EA",
+"K. c #DAD9E0",
+"L. c #DBDDE6",
+"P. c #DDDDE3",
+"I. c #DFDFE8",
+"U. c #E0DFE5",
+"Y. c #E1E1E8",
+"T. c #E3E3E8",
+"R. c #E7E7ED",
+"E. c #E9E9ED",
+"W. c #ECECEF",
+"Q. c #EDEDF0",
+"!. c #F1F1F5",
+"~. c #F0F2F6",
+"^. c #F3F3F6",
+"/. c #F4F4F7",
+"(. c #F6F5F7",
+"). c #F4F5F8",
+"_. c #F5F5F8",
+"`. c #F9F9FA",
+"'. c #FBFBFE",
+"]. c #FDFDFE",
+"[. c #FDFEFE",
+"{. c #FEFDFE",
+"}. c gray100",
+"|. c None",
+/* pixels */
+"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
+"|.|.j.w.7.1.:.=.H C v x f u 2 |.",
+"|.9.M.P.V.L.S.Y V.).).^.^.s.s O ",
+"|.% M T.}.U.f.F H.}.}.}.}.p.g + ",
+"B   |.*.'.(.m.S.^.}.}.}.^.,.d + ",
+"Z.M n D.`.W.k.x.f.a.t.4.U J i + ",
+"z.I.Z.Q.E.F.q.s.y.<.;.K K S t + ",
+"n Z.R.I.F.N.c.+.b.J.Z.n.l.D r = ",
+"  p G P 5.v.^ ) X.e.g.i.q.b e = ",
+"|.|.  O m / | [ | ( 8.r.3.c w + ",
+"|.|.|.; N Q O.$.#. at .~ -.>.h q = ",
+"|.|.|.a V A E %.&...| ! G y 0 = ",
+"|.|.|.7 6 1 3 R o.' _ ` 9 < < O ",
+"|.|.|.|.|.    > T { ' W ,       ",
+"|.|.|.|.|.|.|.|.> j k 8   |.|.|.",
+"|.|.|.|.|.|.|.|.|.        |.|.|."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kfloppy.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kfloppy.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kfloppy.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,280 @@
+/* XPM */
+static char *kfloppy[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 242 2",
+"   c black",
+".  c #000015",
+"X  c #02021E",
+"o  c #180F07",
+"O  c #010122",
+"+  c #080836",
+"@  c #0C0C3B",
+"#  c #181821",
+"$  c #10133C",
+"%  c #1F143E",
+"&  c #35210F",
+"*  c #362110",
+"=  c #010142",
+"-  c #0D0D4B",
+";  c #141740",
+":  c #16164E",
+">  c #191B45",
+",  c #1C1F49",
+"<  c #141451",
+"1  c #1C1C55",
+"2  c #1C2A54",
+"3  c #21244E",
+"4  c #24245C",
+"5  c #252953",
+"6  c #2B2D5B",
+"7  c #25335C",
+"8  c #30345E",
+"9  c #2B2B61",
+"0  c #2C3B64",
+"q  c #323265",
+"w  c #353963",
+"e  c #3A3B6A",
+"r  c #3E3E70",
+"t  c #2D487C",
+"y  c #364065",
+"u  c #34426B",
+"i  c #3D486E",
+"p  c #3D4B74",
+"a  c #402713",
+"s  c #432A12",
+"d  c #553617",
+"f  c #553518",
+"g  c #643E1A",
+"h  c #633F32",
+"j  c #774922",
+"k  c #7F4E25",
+"l  c #44445D",
+"z  c #42436E",
+"x  c #494964",
+"c  c #4E4E6B",
+"v  c #434373",
+"b  c #424C73",
+"n  c #484A74",
+"m  c #4B4B78",
+"M  c #475277",
+"N  c #425179",
+"B  c #4C557B",
+"V  c #53536D",
+"C  c #515174",
+"Z  c #52527B",
+"A  c #58587F",
+"S  c #755F5B",
+"D  c #63636F",
+"F  c #626273",
+"G  c #62627D",
+"H  c #6F6F7F",
+"J  c #796E78",
+"K  c #3C5585",
+"L  c #4F5E84",
+"P  c #545B80",
+"I  c #5B5B83",
+"U  c #566286",
+"Y  c #556388",
+"T  c #5D6186",
+"R  c #5C698D",
+"E  c #576C96",
+"W  c #636389",
+"Q  c #65698C",
+"!  c #6A6783",
+"~  c #6A6A8C",
+"^  c #616E91",
+"/  c #657396",
+"(  c #6A7799",
+")  c #6C7A9B",
+"_  c #77778C",
+"`  c #7B7B8D",
+"'  c #737393",
+"]  c #727698",
+"[  c #737F9E",
+"{  c #7F7F94",
+"}  c #797A9B",
+"|  c #6B7EA2",
+" . c #717FA0",
+".. c #7F7FA0",
+"X. c #7587A9",
+"o. c #7788AA",
+"O. c #7A84A4",
+"+. c #7C89A7",
+"@. c #7D8CAC",
+"#. c #835223",
+"$. c #895526",
+"%. c #8F5A26",
+"&. c #955C25",
+"*. c #945F2A",
+"=. c #9D5E21",
+"-. c #9A632A",
+";. c #A4621F",
+":. c #BB751E",
+">. c #AB7230",
+",. c #B57B32",
+"<. c #997B63",
+"1. c #A67642",
+"2. c #A97742",
+"3. c #B27F44",
+"4. c #CC7B17",
+"5. c #D47E16",
+"6. c #B68345",
+"7. c #BB8744",
+"8. c #BF8B48",
+"9. c #D68518",
+"0. c #DB911C",
+"q. c #C18224",
+"w. c #CA8C26",
+"e. c #CE9327",
+"r. c #CD942B",
+"t. c #D59727",
+"y. c #DA9720",
+"u. c #DA9B25",
+"i. c #DB9C28",
+"p. c #DFA325",
+"a. c #DFA828",
+"s. c #E6880D",
+"d. c #E1991D",
+"f. c #E99411",
+"g. c #ED9C15",
+"h. c #FF8A04",
+"j. c #FE950B",
+"k. c #FF9B0E",
+"l. c #FF9E10",
+"z. c #F0A518",
+"x. c #F2AD1B",
+"c. c #FEA212",
+"v. c #FEAC19",
+"b. c #F5B31D",
+"n. c #FFB11B",
+"m. c #E1A827",
+"M. c #E1AB2A",
+"N. c #E5B32B",
+"B. c #E7B92D",
+"V. c #E9BF30",
+"C. c #FFB720",
+"Z. c #FEBA21",
+"A. c #C38E48",
+"S. c #CC954B",
+"D. c #CE984B",
+"F. c #D59D4D",
+"G. c #DDA450",
+"H. c #E1A853",
+"J. c #EBC532",
+"K. c #EDCB35",
+"L. c #FEC126",
+"P. c #FFC628",
+"I. c #FFCE2D",
+"U. c #FFD531",
+"Y. c #FFDF37",
+"T. c #FFE038",
+"R. c #86848F",
+"E. c #868692",
+"W. c #84849F",
+"Q. c #8C8690",
+"!. c #8585A3",
+"~. c #8686A8",
+"^. c #8188A7",
+"/. c #848EAB",
+"(. c #8B8BA4",
+"). c #8D8DAC",
+"_. c #8590AC",
+"`. c #8292B1",
+"'. c #8A95B0",
+"]. c #8A99B6",
+"[. c #8D9CB8",
+"{. c #918DA7",
+"}. c #9393A9",
+"|. c #9B97A4",
+" X c #9A9AAE",
+".X c #9393B2",
+"XX c #909BB5",
+"oX c #909FBA",
+"OX c #9A9AB4",
+"+X c #9B9BBA",
+"@X c #94A2BB",
+"#X c #99A5BE",
+"$X c #9EA8BF",
+"%X c #A39FB5",
+"&X c #A2A2B5",
+"*X c #A5A5BC",
+"=X c #A9A5B7",
+"-X c #ABABBC",
+";X c #99A6C0",
+":X c #9DAAC2",
+">X c #A5A5C1",
+",X c #A1ADC3",
+"<X c #ACACC4",
+"1X c #AFAFCA",
+"2X c #A5B0C7",
+"3X c #A6B2C8",
+"4X c #A8B1C6",
+"5X c #A9B5CA",
+"6X c #AEB9CD",
+"7X c #B3B3C2",
+"8X c #B5B5CA",
+"9X c #B0BBCE",
+"0X c #B9B8C6",
+"qX c #BBBCCB",
+"wX c #B3BDD0",
+"eX c #B6C0D2",
+"rX c #BAC3D5",
+"tX c #BFC8D7",
+"yX c #C0C0CC",
+"uX c #C9C5C9",
+"iX c #C3C3D2",
+"pX c #C7C9D5",
+"aX c #C3CBDA",
+"sX c #CCCCD6",
+"dX c #CDCDD9",
+"fX c #CAD1DE",
+"gX c #D2CDD0",
+"hX c #D4D4DD",
+"jX c #DDD9DB",
+"kX c #D5D5E0",
+"lX c #D3D8E3",
+"zX c #DBDBE3",
+"xX c #DDE2EA",
+"cX c #E0E0E6",
+"vX c #E3E4E9",
+"bX c #E8E3E2",
+"nX c #E9E9ED",
+"mX c #ECEDF1",
+"MX c #F1F1F4",
+"NX c #F6F6F8",
+"BX c #FEFEFE",
+"VX c None",
+/* pixels */
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX",
+"VXVXVXVXVXVXVXVX*XOX}.!.W.} ' ~ Q I A Z n r e q 6 4 1 : @   VXVX",
+"VXVXVXVXVXVXVXVX*X at X.X).!.} } ' ~ W I m n v e q 9 4 1 : - X   VX",
+"VXVXVXVX0X0X0X7X<XlXnXnXBXmXlXlXzXBXBXBXBXBXBXBXBXBXfX2X4 =     ",
+"VXVXVX7X7XvXBXNXvXqXpXlXBX at .t K o.BXBXBXBXBXBXBXBXBX6X[...= O   ",
+"VXVXVX  Q.-XmXBXBXBXdXqXBX at .E | :XBXBXBXBXBXBXBXBXBX5X].] = O   ",
+"VXVXVX    F -XmXBXBXBXqXnX`.X.].wXBXBXBXBXBXBXBXBXBX2X at .Q = O   ",
+" X    VX    D &XMXBXBXmXqX:X at X5XfXBXBXBXBXBXBXBXBXBX#X) T = O   ",
+" X(.    VX  `  XmXBXBXNX=XBXBXBXBXBXBXBXBXBXBXBXBXmX_./ P = O   ",
+"-X0XO.    (.|.cXNXNXNXNX&XaXtXrXrXwXwX6X5X5X1X:XXX/.( R B = O   ",
+"7XMX-X_ D (.zXMXMXMXMXnXOX5X2X,X:X;X;X[.].'.o.) ( ^ R Y n = O   ",
+"}.nXnX=XW.hXnXnXnXnXnXvX(.2X,X:X;X at X[._.+. .) / R R Y L z = X   ",
+"_ hXvXcXcXvXvXvXvXvXcXlX&X,XwX9X2X$X at X[.'._.+.O.O.) Y B e = O   ",
+"A {.jXzXxXzXzXxXzXzX0X7XdX|.H.G.bXvXcXzXkXfXdXiXrXqXQ N w = O   ",
+"  G (.hXhXjXhXhXhXiXyXuXuXF.M.K.F.jXkXhXdXdXiXiXqX0XR p 8 = O   ",
+"    V ~ }.-X-X=X-XgXsXgXS.i.s.g.J.S.7X1X1X>X>X+X+X%XU u 6 = X   ",
+"VX    # l x V l Z @XgXS.t.f.j.j.g.J.A.0X8X8X1X<X>X>XL u 5 = O   ",
+"VXVX            n ! 7.t.g.c.c.c.c.z.B.A.%X+X+X.X.XOXB 0 3 = O   ",
+"VXVXVXVX        e <.r.x.n.n.n.n.n.v.x.M.3.=X*X#XOXOXM 9 , = O   ",
+"VXVXVXVXVXVXVXVXe Q.,.M.Z.Z.Z.Z.Z.Z.Z.C.a.3.{.).!.).b 7 > = O   ",
+"VXVXVXVXVXVXVXVXq +.Q.>.a.P.P.P.P.P.P.Z.Z.r.2.}.).).i 2 $ = O   ",
+"VXVXVXVXVXVXVXVX9 O.[ H >.p.I.U.U.I.Z.C.C.Z.w.2.(.!.y 2 $ = O   ",
+"VXVXVXVXVXVXVXVX4 I m e J -.u.U.T.C.n.l.j.j.b.:.S C > @ + = O   ",
+"VXVXVXVXVXVXVXVX4 < - - = % -.y.Y.v.v.j.l.j.c.d.j = = = = = X   ",
+"VXVXVXVXVXVXVXVX            s &.0.c.n.k.h.j.l.0.k               ",
+"VXVXVXVXVXVXVXVX              d %.9.c.P.n.c.l.:.g               ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVX    f $.5.j.j.j.4.#.o     VXVXVXVXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVX    f k =.;.&.j *       VXVXVXVXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX      * s *         VXVXVXVXVXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX                  VXVXVXVXVXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX          VXVXVXVXVXVXVXVX"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kgpg-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kgpg-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kgpg-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,224 @@
+/* XPM */
+static char *kgpg-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 202 2",
+"   c black",
+".  c #734121",
+"X  c #734024",
+"o  c #754224",
+"O  c #7A4723",
+"+  c #7F4C26",
+"@  c #784828",
+"#  c #7E513C",
+"$  c #535377",
+"%  c #55557F",
+"&  c #7B5646",
+"*  c #656585",
+"=  c #767693",
+"-  c #797994",
+";  c #8F511F",
+":  c #9C5B1F",
+">  c #824D25",
+",  c #824E28",
+"<  c #83502B",
+"1  c #81512E",
+"2  c #89562D",
+"3  c #8A582C",
+"4  c #815335",
+"5  c #865631",
+"6  c #8C5B30",
+"7  c #905923",
+"8  c #9C6425",
+"9  c #936331",
+"0  c #96653F",
+"q  c #9C6B37",
+"w  c #AC5F18",
+"e  c #A6621C",
+"r  c #B0651E",
+"t  c #B06C1D",
+"y  c #BF7A1D",
+"u  c #A56D34",
+"i  c #A87B3D",
+"p  c #B56D24",
+"a  c #BF7F29",
+"s  c #B0793D",
+"d  c #876043",
+"f  c #8F6A55",
+"g  c #90674C",
+"h  c #997156",
+"j  c #C36E13",
+"k  c #D27C12",
+"l  c #B78238",
+"z  c #BA8537",
+"x  c #B18245",
+"c  c #A48D7A",
+"v  c #A88D7F",
+"b  c #B98F67",
+"n  c #B6947B",
+"m  c #D28D1C",
+"M  c #D88A1C",
+"N  c #CC8C2C",
+"B  c #C38A31",
+"V  c #C99539",
+"C  c #D99E30",
+"Z  c #DDB53E",
+"A  c #EE8408",
+"S  c #E28B12",
+"D  c #E88A10",
+"F  c #EC9915",
+"G  c #F58707",
+"H  c #F68F0A",
+"J  c #FF9409",
+"K  c #FF9509",
+"L  c #FB9B0D",
+"P  c #FD9E0F",
+"I  c #FF9D0D",
+"U  c #FF9D0E",
+"Y  c #FF9E0E",
+"T  c #F7A917",
+"R  c #FEA512",
+"E  c #FFA612",
+"W  c #FFA914",
+"Q  c #FFAE17",
+"!  c #F8B41E",
+"~  c #FFB018",
+"^  c #FFB61B",
+"/  c #FFB71B",
+"(  c #FFB81C",
+")  c #FFBA1D",
+"_  c #FFBF1F",
+"`  c #EDAD2C",
+"'  c #F5BF2D",
+"]  c #FAB420",
+"[  c #FEBC20",
+"{  c #C29943",
+"}  c #C69550",
+"|  c #DAB252",
+" . c #DAB45A",
+".. c #C1A370",
+"X. c #C1A678",
+"o. c #CFB071",
+"O. c #D1AB7A",
+"+. c #DAB061",
+"@. c #DCB46D",
+"#. c #E6BE78",
+"$. c #FFC322",
+"%. c #FFC422",
+"&. c #FFCA25",
+"*. c #FFCD27",
+"=. c #FFD029",
+"-. c #FFD52C",
+";. c #FFD82D",
+":. c #FFDA2E",
+">. c #FFDB2E",
+",. c #FCDB34",
+"<. c #FFDF31",
+"1. c #FFE233",
+"2. c #FFE434",
+"3. c #FFE534",
+"4. c #FFE836",
+"5. c #FFE938",
+"6. c #FFEB3D",
+"7. c #EDCF51",
+"8. c #EFD85C",
+"9. c #F0D749",
+"0. c #E4C067",
+"q. c #E7CC64",
+"w. c #EBCB67",
+"e. c #EACF63",
+"r. c #ECD662",
+"t. c #FDE940",
+"y. c #FEED42",
+"u. c #FAE94F",
+"i. c #FCEC48",
+"p. c #FDEE48",
+"a. c #F6E358",
+"s. c #FBEC53",
+"d. c #85859E",
+"f. c #89899C",
+"g. c #9B9394",
+"h. c #8B87A1",
+"j. c #8989A0",
+"k. c #8B8BA5",
+"l. c #8C8CA2",
+"z. c #8C8CA4",
+"x. c #8F8FA8",
+"c. c #9391A1",
+"v. c #9191A7",
+"b. c #9292A7",
+"n. c #9595AA",
+"m. c #9D9BAA",
+"M. c #9F9EAF",
+"N. c #9C9CB2",
+"B. c #9F9FB1",
+"V. c #9E9EB6",
+"C. c #BBA284",
+"Z. c #A0A0B1",
+"A. c #A0A0B3",
+"S. c #A7A7B5",
+"D. c #A5A5B9",
+"F. c #A5A5BB",
+"G. c #A9A9B4",
+"H. c #A9A9BB",
+"J. c #AAAABD",
+"K. c #ABABBE",
+"L. c #ADADBC",
+"P. c #ADADBD",
+"I. c #AEAEBF",
+"U. c #BBB2AB",
+"Y. c #B0B0BF",
+"T. c #B7B7BD",
+"R. c #ACACC0",
+"E. c #ADADC0",
+"W. c #B1B1C3",
+"Q. c #B3B3C5",
+"!. c #B8B8C2",
+"~. c #B9B9C4",
+"^. c #B8B8CA",
+"/. c #BCBCC8",
+"(. c #BEBECC",
+"). c #C3AC8E",
+"_. c #CCAF8C",
+"`. c #DCB888",
+"'. c #C3B5AD",
+"]. c #E4BE88",
+"[. c #C5C2C2",
+"{. c #C1C1CB",
+"}. c #C1C1CE",
+"|. c #C8C8CE",
+" X c #C3C3D1",
+".X c #C5C5D1",
+"XX c #CACAD1",
+"oX c #C9C9D5",
+"OX c #CDCDD4",
+"+X c #CFCFD4",
+"@X c #CDCDD8",
+"#X c #D0D0DA",
+"$X c #D7D7DC",
+"%X c #D9D9DD",
+"&X c #D8D8DF",
+"*X c #DADAE0",
+"=X c #DDDDE2",
+"-X c #E9D8CE",
+";X c #E3E3E7",
+":X c #E3E3E8",
+">X c #F7EFE5",
+",X c None",
+/* pixels */
+",X,X,X,X,X,X,X= k.N.D.E.E.V.,X,X",
+",X,X,X,X,X,X* z.P..X#X at X XQ.D.,X",
+",X,X,X,X,X$ - P.*X=X*X;X:XoXQ.J.",
+",X,X,Xa N x c.OXXXP.I.{.$X*X(.J.",
+",X,X,Xz |  .).[.M.d.v.Z.~.%X}.J.",
+",X@ 9 { 9.s.q...c _.>Xl.S.OX/.N.",
+",X5 i Z ,.4.p.8.0.#.].f.G.|.I.b.",
+"1 q V ' =.>.3.y.a.w. at .g.T.!.Z.n.",
+"3 s ` [ $.&.>.1.6.u.e.X.U.m.h.v.",
+"3 B ] ( ) _ &.-.1.5.i.r.o.C.'.,X",
+", 8 m T Q Q ( $.=.>.3.t.7.+.`.,X",
+"o O 7 y F E E W Q / ) ! C } O.,X",
+",Xo & 3 t S L Y Y Y Y M i b -X,X",
+",X,Xh.# , e k H K K D u h n ,X,X",
+",X,X,X,Xd > : j A G p g v ,X,X,X",
+",X,X,X,X,X4 , ; w r 0 f ,X,X,X,X"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kgpg.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kgpg.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kgpg.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,268 @@
+/* XPM */
+static char *kgpg[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 230 2",
+"   c black",
+".  c #3C3C6A",
+"X  c #703E1B",
+"o  c #6F3E21",
+"O  c #723E22",
+"+  c #744224",
+"@  c #73452B",
+"#  c #77482A",
+"$  c #794727",
+"%  c #7D4A24",
+"&  c #7C4B29",
+"*  c #754A34",
+"=  c #7C4E32",
+"-  c #7D5035",
+";  c #7A513C",
+":  c #524F70",
+">  c #54547B",
+",  c #5D5D7C",
+"<  c #636383",
+"1  c #6E6E8B",
+"2  c #706F89",
+"3  c #717188",
+"4  c #79788C",
+"5  c #767698",
+"6  c #7D7C92",
+"7  c #7C7C9A",
+"8  c #884E1F",
+"9  c #96551E",
+"0  c #9E5E1E",
+"q  c #824B22",
+"w  c #82542F",
+"e  c #8A5324",
+"r  c #8E5925",
+"t  c #865732",
+"y  c #875B3F",
+"u  c #8F5932",
+"i  c #905821",
+"p  c #905F2D",
+"a  c #915F38",
+"s  c #916439",
+"d  c #996231",
+"f  c #99673A",
+"g  c #9E6D3B",
+"h  c #A85E1A",
+"j  c #A9611A",
+"k  c #AD6A1C",
+"l  c #B5691C",
+"z  c #B86514",
+"x  c #BB6E18",
+"c  c #A36426",
+"v  c #A56920",
+"b  c #AF7D37",
+"n  c #B57820",
+"m  c #B97926",
+"M  c #B87D2E",
+"N  c #855D40",
+"B  c #885E43",
+"V  c #8E664C",
+"C  c #8E684F",
+"Z  c #846B5A",
+"A  c #8D6559",
+"S  c #8F6953",
+"D  c #916D56",
+"F  c #926C59",
+"G  c #96715C",
+"H  c #A17741",
+"J  c #AC7B44",
+"K  c #A67D5A",
+"L  c #C66F11",
+"P  c #CD7010",
+"I  c #EB7E07",
+"U  c #887B90",
+"Y  c #BE8839",
+"T  c #BD8F4D",
+"R  c #B28B59",
+"E  c #A4836A",
+"W  c #A78670",
+"Q  c #A78B7D",
+"!  c #A98F7A",
+"~  c #A8917C",
+"^  c #BC996E",
+"/  c #CC821A",
+"(  c #D58114",
+")  c #D38419",
+"_  c #D68D19",
+"`  c #DE8512",
+"'  c #C58023",
+"]  c #C3832A",
+"[  c #CB8B2C",
+"{  c #C5913C",
+"}  c #D18F2D",
+"|  c #DCA23E",
+" . c #E2810D",
+".. c #EC890C",
+"X. c #E38E14",
+"o. c #F38607",
+"O. c #F78806",
+"+. c #F88403",
+"@. c #FF8B04",
+"#. c #FE9107",
+"$. c #FE960A",
+"%. c #FE9C0C",
+"&. c #F59D13",
+"*. c #EFA319",
+"=. c #FFA00F",
+"-. c #F5A919",
+";. c #FEA411",
+":. c #FEAB15",
+">. c #FFB017",
+",. c #FFB319",
+"<. c #FFBA1C",
+"1. c #EDB038",
+"2. c #F2AD22",
+"3. c #FDB623",
+"4. c #FFBD21",
+"5. c #FABA2D",
+"6. c #F3BD37",
+"7. c #C08F53",
+"8. c #C09145",
+"9. c #C09848",
+"0. c #C99745",
+"q. c #CC9848",
+"w. c #C29E69",
+"e. c #C39D77",
+"r. c #CCA249",
+"t. c #D1A452",
+"y. c #D5A55B",
+"u. c #D9A757",
+"i. c #DAAD5E",
+"p. c #D5B253",
+"a. c #DEB556",
+"s. c #DBB058",
+"d. c #CFAB7B",
+"f. c #D1A764",
+"g. c #DDAF61",
+"h. c #D4AD77",
+"j. c #E0B351",
+"k. c #E2B364",
+"l. c #E3BE60",
+"z. c #E5BA7B",
+"x. c #EBC33F",
+"c. c #FFC221",
+"v. c #FFC926",
+"b. c #FFCE28",
+"n. c #FBCF36",
+"m. c #FFD42B",
+"M. c #FFDA2E",
+"N. c #FEDD30",
+"B. c #FDDE39",
+"V. c #FFE333",
+"C. c #FFE936",
+"Z. c #FFED39",
+"A. c #FFF13D",
+"S. c #E4C14A",
+"D. c #F0D64C",
+"F. c #E4C062",
+"G. c #E9CC65",
+"H. c #EED364",
+"J. c #F2DC6A",
+"K. c #FFF343",
+"L. c #FEF54C",
+"P. c #FDF456",
+"I. c #FDF55C",
+"U. c #F6E66E",
+"Y. c #F7E869",
+"T. c #FAEE65",
+"R. c #F9ED6D",
+"E. c #FCF262",
+"W. c #84849C",
+"Q. c #92898C",
+"!. c #918B98",
+"~. c #8585A1",
+"^. c #8B8BA2",
+"/. c #8787B4",
+"(. c #9292A4",
+"). c #9393AA",
+"_. c #9A9AAC",
+"`. c #9393B0",
+"'. c #9C9CB2",
+"]. c #9A9AB8",
+"[. c #A79688",
+"{. c #B5A09B",
+"}. c #BBAB9F",
+"|. c #A2A2AC",
+" X c #ABA3A2",
+".X c #AAAAAA",
+"XX c #A2A2B4",
+"oX c #A4A4B9",
+"OX c #A9A9B5",
+"+X c #AAAABA",
+"@X c #B9AEAB",
+"#X c #B1B1BD",
+"$X c #BEBCBE",
+"%X c #ACACC1",
+"&X c #B3B3C4",
+"*X c #B8B8C5",
+"=X c #BBBBCA",
+"-X c #C3A98E",
+";X c #C1AC92",
+":X c #CAB197",
+">X c #D6B181",
+",X c #D3B68C",
+"<X c #DFBC8F",
+"1X c #D0B69B",
+"2X c #C7B4A9",
+"3X c #E4BC82",
+"4X c #D0C3B0",
+"5X c #EBC894",
+"6X c #EECD9C",
+"7X c #E3CDB3",
+"8X c #F1D6B0",
+"9X c #F3DDBA",
+"0X c #C4C4C5",
+"qX c #C4C4C8",
+"wX c #CACACD",
+"eX c #C1C1D6",
+"rX c #CDCDD3",
+"tX c #CECED9",
+"yX c #D1D1D4",
+"uX c #D3D3DA",
+"iX c #DBD7D1",
+"pX c #DBDBDD",
+"aX c #DBDBE2",
+"sX c #EBDBD5",
+"dX c #E4E4E5",
+"fX c #E5E5E8",
+"gX c #E9E9EB",
+"hX c #F3F3F4",
+"jX c #FDFDFD",
+"kX c None",
+/* pixels */
+"kXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkX5 7 W.~.+X%XkXkXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXkXkXkXkX< 7 ~.).'.].oXoXoXjXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXkXkX, 1 W.'.*XuXpXaXtX=XoX'.&XkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXkX> < 6 #XfXhXhXhXhXhXhXaX&XoX=XkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkX. > 1 #XgXhXfXpXuXaXdXhXhXaX&X&XeXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkX/ ) : , XXfXfXrX+X).).'.&XwXfXhXtXoX&XkXkXkXkX",
+"kXkXkXkXkXkXkXn ] [ } Z 4 yXdXyX_.~.~._.).oX+XwXgXgX+X%XjXkXkXkX",
+"kXkXkXkXkXkXkXY { a.j.T }.iXyX_.1 ~.kXkXkX].(.OXaXhX=XoXfXkXkXkX",
+"kXkXkXkXkXkXe Y p.Y.R.H.i.,X X1 < ^.kXjXkX_.).).rXhX=X'.0XkXkXkX",
+"kXkXkXkXkX% p T D.Z.A.I.J.s.R ! :XkXkXjXkX.X^.(.qXgX*X_.$XkXkXkX",
+"kXkXkXkXkXw b j.B.V.C.Z.L.R.l.y.3X6X9XkXkX).W.(.wXgX+X).wXkXkXkX",
+"kXkXkXkX+ s r.n.m.N.V.C.Z.K.I.H.k.z.5X8XkX3 6 |.pXuX(.W.kXkXkXkX",
+"kXkXkX$ t T 6.v.b.m.M.N.V.Z.A.P.U.l.k.3X-X4 (.0XpX+X(.XXkXkXkXkX",
+"kXkXkXw J 1.<.c.v.v.m.M.M.V.C.A.L.T.G.g.^ Q.#XuX#X!.^._.kXkXkXkX",
+"kXo # g | 3.<.<.c.c.v.b.m.M.V.C.Z.K.I.J.t.w.4X$XW.W.~.kXkXkXkXkX",
+"kX+ & 0.5.<.<.<.<.<.c.v.v.m.M.M.V.C.A.L.R.l.f.~ !._.kXkXkXkXkXkX",
+"kX+ # Y 2.,.,.,.,.,.<.c.c.v.m.M.N.V.V.Z.K.E.G.t.>X7XkXkXkXkXkXkX",
+"kXX + e n *.:.:.:.:.:.,.<.c.v.b.m.M.V.V.Z.A.P.H.u.<XjXkXkXkXkXkX",
+"kXkXO + % k _ -.:.:.:.:.:.,.<.c.v.b.m.M.M.V.N.x.q.h.0XkXkXkXkXkX",
+"kXkXkXO O % r / *.=.;.;.;.;.;.:.:.,.,.,.,.,.-.[ 7.d.kXkXkXkXkXkX",
+"kXkXkXkXkX* ; e k X.=.=.=.%.=.=.;.;.=.;.=.&.' J e.sXkXkXkXkXkXkX",
+"kXkXkXkXkX/.U ; % 0 ) $.%.%.%.%.%.%.%.%.%./ f K 1XkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXA - & e x ..$.$.$.$.$.$.$.` d D E kXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXy $ 8 j  .#.#.#.#.#...c V Q uXkXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkX# $ % 9 L o. at .@.O.l B F @XkXkXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXW V $ 8 z I +.P a S F kXkXkXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXkXkX@ + q 9 h p V G kXkXkXkXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXkXkXkX@ = y V F F kXkXkXkXkXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXkXkXkXkX2X[. at X{.kXkXkXkXkXkXkXkXkXkXkXkXkX",
+"kXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkX"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/khexedit-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/khexedit-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/khexedit-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,31 @@
+/* XPM */
+static char *khexedit-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 9 1",
+"  c black",
+". c #585858",
+"X c #FF8000",
+"o c #A0A0A4",
+"O c #C0C0C0",
+"+ c #C0C0FF",
+"@ c #FFFFC0",
+"# c gray100",
+"$ c None",
+/* pixels */
+"$$$$$   $$$$$$$$",
+"$$$$ + + $$$$$$$",
+"$    +++    $$$$",
+" ####   O### $$$",
+" ########### $$$",
+" #+++O ++++# $ $",
+" ####.O ####  @ ",
+" #+O.#.O ++# @X ",
+" ## O. ..## @X $",
+" #+o O.o++ @X $$",
+" ###O .## @X $$$",
+" #+++o++ @X  $$$",
+" ###### OX O $$$",
+" #+++++   +# $$$",
+" ########### $$$",
+"$           $$$$"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/khexedit.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/khexedit.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/khexedit.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,151 @@
+/* XPM */
+static char *khexedit[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 113 2",
+"   c black",
+".  c #1F1D1C",
+"X  c #2A2624",
+"o  c #3E3A2C",
+"O  c #4E2204",
+"+  c #4A321D",
+"@  c #4C331E",
+"#  c #532403",
+"$  c #542504",
+"%  c #562806",
+"&  c #5E2604",
+"*  c #6A2E04",
+"=  c #6E3E24",
+"-  c #5E564C",
+";  c #585858",
+":  c #8A3B04",
+">  c #8A3C03",
+",  c #8A3C04",
+"<  c #8B3C04",
+"1  c #8C3D03",
+"2  c #8C3C04",
+"3  c #893D09",
+"4  c #854F3B",
+"5  c #895136",
+"6  c #945125",
+"7  c #BA5603",
+"8  c #BB5703",
+"9  c #B85404",
+"0  c #BD5903",
+"q  c #BE5A03",
+"w  c #BE5904",
+"e  c #BF5C03",
+"r  c #B05B1E",
+"t  c #925640",
+"y  c #9D5F45",
+"u  c #92634E",
+"i  c #827A64",
+"p  c #A87867",
+"a  c #C05B04",
+"s  c #C35E03",
+"d  c #C05C04",
+"f  c #C25C04",
+"g  c #C56004",
+"h  c #E76C02",
+"j  c #E96F02",
+"k  c #EA7004",
+"l  c #EC7202",
+"z  c #ED7C1B",
+"x  c #EE7F1D",
+"c  c #F67C02",
+"v  c #F77C02",
+"b  c #FA7B04",
+"n  c #FA7E02",
+"m  c #F87D04",
+"M  c #C27F5F",
+"N  c #FC8002",
+"B  c #FE8204",
+"V  c #F0821C",
+"C  c #FD8B1B",
+"Z  c #FE8E1C",
+"A  c #FD901F",
+"S  c #EA8125",
+"D  c #F68D28",
+"F  c #F88E26",
+"G  c #FE9123",
+"H  c #FD9228",
+"J  c #FC9429",
+"K  c #FD952A",
+"L  c #CD885F",
+"P  c #D3925D",
+"I  c #CB8A6A",
+"U  c #E5A065",
+"Y  c #EDA363",
+"T  c #EEA366",
+"R  c #E9AB79",
+"E  c #F0A566",
+"W  c #F1A868",
+"Q  c #F1A86A",
+"!  c #F3AA6A",
+"~  c #F5AD6D",
+"^  c #F3AD71",
+"/  c #F4AE70",
+"(  c #F7B070",
+")  c #FCB573",
+"_  c #FDB573",
+"`  c #C0C000",
+"'  c #808080",
+"]  c #838383",
+"[  c #8383AE",
+"{  c #8A8ABC",
+"}  c #A9A9A9",
+"|  c #AEAEAE",
+" . c #A9A9E1",
+".. c #C29A88",
+"X. c #D7A88D",
+"o. c #DEBAA6",
+"O. c #E0B49C",
+"+. c #EEB897",
+"@. c #EAB99E",
+"#. c #E4B6A6",
+"$. c #E3B8A3",
+"%. c #FCC58B",
+"&. c #F8C6A3",
+"*. c #FEDEAC",
+"=. c #F8D0BA",
+"-. c #C0C0C0",
+";. c #C6C6C6",
+":. c #D6D6D4",
+">. c #C0C0FF",
+",. c #FFFFC0",
+"<. c #E1E1E1",
+"1. c gray100",
+"2. c None",
+/* pixels */
+"2.2.2.2.2.2.2.2.2.2.2.      2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.2.2.            2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.                    2.2.2.2.2.2.2.2.2.2.2.2.2.2.",
+"2.2.2.2.2.2.2.2.  { >.>.    >.>.{   2.2.2.2.2.2.2.2.2.2.2.2.2.2.",
+"2.                1.1.1.1.1.1.1.1.                2.2.2.2.2.2.2.",
+"  ,.,.,.,.,.,.,.  { >.>.>.>.>.>.{   ` ,.,.,.,.,.,.  2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.                -.:.1.1.1.1.1.-.  2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.1.-.-.-.-.-.-.:.:.1.1.1.1.1.1.-.  2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.1.1.  1.1.1.1.1.1.1.1.1.1.1.1.-.  2.      2.2.",
+"  ,.1.1.1.1.1.1.1.1.  1.  1.1.1.1.1.1.1.1.1.1.1.-.    P ^ o.  2.",
+"  ,.1.>.>.>.>.>.>.  ' -.1.  >.>.>.>.>.>.>.>.>.1.-.+ / *.z Q X.  ",
+"  ,.1.1.1.1.1.1.1.;   ' -.1.  1.1.1.1.1.1.1.1.1.@ ( *.D k 9 6   ",
+"  ,.1.1.1.1.1.  1.-.;   -.-.1.  1.1.1.1.1.1.1.* U *.H b w ,   2.",
+"  ,.1.1.1.1.  1.  1.  1.-.-.-.1.  1.1.1.1.1.* Q *.Z b f 2   2.2.",
+"  ,.1.>.>.  ' -.1.  1.-.'   ' -.1.  >.>.>.* ) *.G m a ,   2.2.2.",
+"  ,.1.1.1.;   ' -.-.-.'   ;   '   ; 1.1.* Q *.K B f ,   2.2.2.2.",
+"  ,.1.1.1.-.;   ' -.-.  ; -.;   ; -.1.* E *.Z N g 2   2.2.2.2.2.",
+"  ,.1.1.1.1.' ;   ' -.1.  1.' ' ' 1.* _ *.C c w , % 2.2.2.2.2.2.",
+"  ,.1.>.>.>.>.-.;   ' -.1.  >.>.>.* ~ *.K v e > $   2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.-.;   '   ; 1.1.* Y *.F n s > # ]   2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.-.;   ; -.1.* T %.V l 0 1 O | ]   2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.1.' ' ' 1.* R *.x j 8 > O | | }   2.2.2.2.2.2.",
+"  ,.1.>.>.>.>.>.>.>.>.>.>.* $.&.S h 7 3 O [ [ <.}   2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.1.1.1.1...=.+.L r > O | | <.<.-.  2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.1.1.1.* #. at .M y 4 O | | <.<.1.-.  2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.1.1.1.p O.I t = & | | <.<.1.1.-.  2.2.2.2.2.2.",
+"  ,.1.>.>.>.>.>.>.>.>.>.i u 5 O [ [  . . .>.>.1.-.  2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.1.1.- . o | | <.<.<.1.1.1.1.1.-.  2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.1.1.X X ;.<.<.<.1.1.1.1.1.1.1.-.  2.2.2.2.2.2.",
+"  ,.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.-.  2.2.2.2.2.2.",
+"  -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.  2.2.2.2.2.2.",
+"2.                                                2.2.2.2.2.2.2."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kjots-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kjots-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kjots-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,198 @@
+/* XPM */
+static char *kjots-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 176 2",
+"   c black",
+".  c #000001",
+"X  c #040405",
+"o  c #101017",
+"O  c #121217",
+"+  c #18181F",
+"@  c #1E1E26",
+"#  c #20202F",
+"$  c #22222E",
+"%  c #22222F",
+"&  c #24242B",
+"*  c #24242F",
+"=  c #242430",
+"-  c #252530",
+";  c #2A2A34",
+":  c #2A2A3C",
+">  c #31313C",
+",  c #4F515B",
+"<  c #5A5B69",
+"1  c #5F5E6F",
+"2  c #5A5A70",
+"3  c #5D5D72",
+"4  c #5D5D73",
+"5  c #5E5E73",
+"6  c #5F5F74",
+"7  c #5E5E77",
+"8  c #606075",
+"9  c #616176",
+"0  c #636376",
+"q  c #636377",
+"w  c #63637C",
+"e  c #646479",
+"r  c #66667A",
+"t  c #66667B",
+"y  c #67677A",
+"u  c #6C6D76",
+"i  c #68687B",
+"p  c #7E7E85",
+"a  c #FABC21",
+"s  c #F2D829",
+"d  c #F8D645",
+"f  c #E5CD7B",
+"g  c #E8CE71",
+"h  c #E9D769",
+"j  c #F6DC6B",
+"k  c #F9E945",
+"l  c #808088",
+"z  c #8D8EA5",
+"x  c #9E9FAC",
+"c  c #A0A0B6",
+"v  c #A2A3B5",
+"b  c #A7A7C4",
+"n  c #AFADC2",
+"m  c #B6B6C7",
+"M  c #B0B0CA",
+"N  c #B3B4CB",
+"B  c #B7B9CD",
+"V  c #BABACB",
+"C  c #BABACE",
+"Z  c #BDBDCE",
+"A  c #B9B9D1",
+"S  c #B8B8D2",
+"D  c #BABAD4",
+"F  c #BCBCD2",
+"G  c #BDBDD3",
+"H  c #BFBED1",
+"J  c #BEBED5",
+"K  c #BFBFD7",
+"L  c #C0B8AE",
+"P  c #EADB86",
+"I  c #F7CA85",
+"U  c #EDD8BB",
+"Y  c #EDE1A3",
+"T  c #FAE2BD",
+"R  c #C0C0D1",
+"E  c #C1C1D5",
+"W  c #C2C2D7",
+"Q  c #C6C5D2",
+"!  c #C1C1D9",
+"~  c #C2C2D9",
+"^  c #C4C4DB",
+"/  c #C5C5DA",
+"(  c #C5C5DB",
+")  c #C6C6D8",
+"_  c #C4C4DC",
+"`  c #C6C6DC",
+"'  c #C6C6DD",
+"]  c #C7C7DC",
+"[  c #C8C8D9",
+"{  c #CACAD9",
+"}  c #C8C8DD",
+"|  c #C9C9DD",
+" . c #CACADE",
+".. c #CBCBDF",
+"X. c #CCCCDF",
+"o. c #CDCDDF",
+"O. c #CFCFDE",
+"+. c #D0CDCC",
+"@. c #D2D2DB",
+"#. c #D0D0DF",
+"$. c #CDCDE1",
+"%. c #CECEE1",
+"&. c #CFCFE2",
+"*. c #CECEE4",
+"=. c #D1D1E1",
+"-. c #D0D0E2",
+";. c #D0D0E3",
+":. c #D1D1E2",
+">. c #D3D3E0",
+",. c #D2D2E2",
+"<. c #D2D2E3",
+"1. c #D3D3E4",
+"2. c #D4D4E0",
+"3. c #D4D4E5",
+"4. c #D5D5E6",
+"5. c #D6D6E5",
+"6. c #D7D7E6",
+"7. c #D4D4EA",
+"8. c #D7D7EC",
+"9. c #D8D8E4",
+"0. c #D8D8E6",
+"q. c #D9D9E6",
+"w. c #D9D9E7",
+"e. c #DADAE7",
+"r. c #DBDBE7",
+"t. c #DADAEE",
+"y. c #DBDBEE",
+"u. c #DBDBEF",
+"i. c #DCDCE8",
+"p. c #DDDDE8",
+"a. c #DDDDE9",
+"s. c #DCDCEF",
+"d. c #DEDEF0",
+"f. c #DFDFF0",
+"g. c #E0D9C8",
+"h. c #E9E1DD",
+"j. c #FAF2DA",
+"k. c #E2E2EB",
+"l. c #E0E0EC",
+"z. c #E3E3ED",
+"x. c #E4E4EC",
+"c. c #E4E4EF",
+"v. c #E5E5EF",
+"b. c #E7E7EE",
+"n. c #E8E4E7",
+"m. c #EDEAEB",
+"M. c #EBEBF0",
+"N. c #EAEAF2",
+"B. c #EAEAF3",
+"V. c #EBEBF4",
+"C. c #ECECF1",
+"Z. c #EEEEF6",
+"A. c #EDEDF9",
+"S. c #EEEEFA",
+"D. c #F0F1F4",
+"F. c #F0F1F5",
+"G. c #F4F4F7",
+"H. c #F1F1FA",
+"J. c #F1F1FB",
+"K. c #F1F2F8",
+"L. c #F1F1FC",
+"P. c #F2F2FC",
+"I. c #F2F7FA",
+"U. c #F7F7FC",
+"Y. c #F7F7FF",
+"T. c #F8F8F8",
+"R. c #F8F8FA",
+"E. c #F9F9FB",
+"W. c #F8FAFB",
+"Q. c #F9F9FF",
+"!. c #F8FAFE",
+"~. c #F9FBFE",
+"^. c #FBFBFF",
+"/. c #FCFBFB",
+"(. c gray100",
+"). c None",
+/* pixels */
+").).).- M J J F A A b > ).).).).",
+").).).- z.(.(.(.(.(.6.C ; ).).).",
+").).).% a.c.6.q.<.B.>.(.F @ ).).",
+").).).- p.a.>.>.$.B.$.C.U.v + ).",
+").).).* p.v.q.r.7.V.z.[ [ *.7 ).",
+").).).% 5.v.r.q.>.>.6.<.} a.i ).",
+").).X % #.E.#.5.G.[ ! J D 7.y ).",
+").  p v Q /. at .E.b.} ' ^ ! 8.y ).",
+").)., h.U E.F.C.! >...} } y.y ).",
+").& u I T E.m.F.Z E ' ' ! y.y ).",
+").x n.a j !.f j.F.C ^ [ ! y.y ).",
+").O 1 d k I.s g !.>.} } ' d.y ).",
+").).< g.P Y h L B >.$...^ d.y ).",
+").  l z n +.H N N $.>.6.N.L.y ).",
+").).  % ' ^ P.U.H.H.A.A.U.!.w ).",
+").).).o 2 4 q q q 6 6 4 7 7 : )."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kjots.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kjots.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kjots.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,177 @@
+/* XPM */
+static char *kjots[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 139 2",
+"   c #010102",
+".  c #09090C",
+"X  c #0E0E1F",
+"o  c #111115",
+"O  c #11111D",
+"+  c #121223",
+"@  c #171728",
+"#  c #1C1C22",
+"$  c #212127",
+"%  c #23232C",
+"&  c #2A2A35",
+"*  c #2B2B47",
+"=  c #2E2E4B",
+"-  c #34344C",
+";  c #38384E",
+":  c #323250",
+">  c #3C3C52",
+",  c #424253",
+"<  c #40405D",
+"1  c #4C4C56",
+"2  c #4C4C59",
+"3  c #525163",
+"4  c #575769",
+"5  c #5D5D66",
+"6  c #595968",
+"7  c #5C5C72",
+"8  c #6B6B7C",
+"9  c #71717D",
+"0  c #6F7286",
+"q  c #717281",
+"w  c #757590",
+"e  c #7B7B97",
+"r  c #7E7F9C",
+"t  c #7979A9",
+"y  c #FFB40A",
+"u  c #E8BB25",
+"i  c #FFB640",
+"p  c #FABB41",
+"a  c #FFC000",
+"s  c #FFCF00",
+"d  c #F6C211",
+"f  c #FCD404",
+"g  c #FFD50D",
+"h  c #FFD900",
+"j  c #F9D911",
+"k  c #FFE500",
+"l  c #FFEA00",
+"z  c #FFF40A",
+"x  c #FAE325",
+"c  c #F7ED3E",
+"v  c #DAD670",
+"b  c #F9C144",
+"n  c #E2D86F",
+"m  c #F7CE68",
+"M  c #FDC46B",
+"N  c #FECC7B",
+"B  c #FFD961",
+"V  c #F3DA79",
+"C  c #8585A1",
+"Z  c #8585AF",
+"A  c #8D8DAD",
+"S  c #8787B0",
+"D  c #8A8AB1",
+"F  c #9494AB",
+"G  c #9999AF",
+"H  c #9393BE",
+"J  c #979AB9",
+"K  c #9A9AB2",
+"L  c #9A9ABE",
+"P  c #A0A0AE",
+"I  c #A3A3B7",
+"U  c #A3A3BB",
+"Y  c #A9AABB",
+"T  c #9D9DC0",
+"R  c #A4A4C3",
+"E  c #A7A7C8",
+"W  c #A6A9C2",
+"Q  c #AAAAC4",
+"!  c #ABABCA",
+"~  c #AFB0C0",
+"^  c #AFB2CA",
+"/  c #B3B3C3",
+"(  c #B2B2CD",
+")  c #BABACA",
+"_  c #B5B5D1",
+"`  c #BABAD3",
+"'  c #BCC0D5",
+"]  c #CEC4B8",
+"[  c #DBCDAC",
+"{  c #DCCDB8",
+"}  c #E0C783",
+"|  c #E4D48A",
+" . c #EDD488",
+".. c #EADF97",
+"X. c #F5DE8E",
+"o. c #E4D3A3",
+"O. c #E8D2A6",
+"+. c #E5D3B3",
+"@. c #E6D2B8",
+"#. c #ECDBB5",
+"$. c #F3DAB0",
+"%. c #EAE482",
+"&. c #EBE68C",
+"*. c #E6E29E",
+"=. c #F7E086",
+"-. c #F8E29D",
+";. c #E8E7A7",
+":. c #FFE4AC",
+">. c #C2C1CE",
+",. c #CCC2C2",
+"<. c #C2C2D3",
+"1. c #C2C2D9",
+"2. c #CCCCD4",
+"3. c #CBCADB",
+"4. c #CDD0DD",
+"5. c #D4CDD1",
+"6. c #DEDFCF",
+"7. c #D6D0D0",
+"8. c #D1D1DB",
+"9. c #CACAE2",
+"0. c #CDD1E5",
+"q. c #D3D3E4",
+"w. c #D7D9E5",
+"e. c #DADAE4",
+"r. c #DCDCE9",
+"t. c #ECDDC4",
+"y. c #E5E1DF",
+"u. c #EDE2D8",
+"i. c #FFECD2",
+"p. c #E2E2EC",
+"a. c #EAE6E3",
+"s. c #E9E9EE",
+"d. c #E6E6F0",
+"f. c #EAEAF2",
+"g. c #EFEFF8",
+"h. c #F2F2F5",
+"j. c #F5F5F9",
+"k. c #FEFEFE",
+"l. c None",
+/* pixels */
+"l.l.l.l.l.l.l., H D D A S A S S S A S S S A # l.l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.> 1.f.g.g.f.f.f.f.s.p.p.r.r.Q C O l.l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.; 0.k.k.k.k.k.k.k.k.k.k.j.g./ 0.r o l.l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.; 9.k.k.k.k.k.k.k.k.k.k.j.f.! h.w.e o l.l.l.l.l.l.",
+"l.l.l.l.l.l.l.; 9.k.h.s.f.f.f.f.p.r.f.j.f.( j.k.9.w . l.l.l.l.l.",
+"l.l.l.l.l.l.l.; 9.k.0._ _ _ _ _ _ ( 3.j.g.! j.k.j.1.7   l.l.l.l.",
+"l.l.l.l.l.l.l.; 9.k.h.f.g.s.f.f.d.p.f.j.s.Q k.k.k.j.` 3 l.l.l.l.",
+"l.l.l.l.l.l.l.; 9.k.w.<.1.<.1.' ` ` q.k.f.Q h.h.j.j.d.( 3   l.l.",
+"l.l.l.l.l.l.l.; 9.k.f.p.p.p.p.p.r.r.d.j.h.Q R E W R R Q L $ l.l.",
+"l.l.l.l.l.l.l.- 9.k.r.3.3.3.3.9.1.1.r.j.h.s.p.r.e.w.w.p.R @ l.l.",
+"l.l.l.l.l.l.l.: 9.k.k.j.k.j.k.j.j.j.h.g.f.f.d.p.r.r.r.f.E @ l.l.",
+"l.l.l.l.l.l.l.- 9.h.3.<.` ` <._ ) _ ( ( _ ( _ ! ! E ! p.E @ l.l.",
+"l.l.l.l.l.l.l.- 9.g.h.j.e.g.f.8.h.j.e.>.p.r.q.0.0.q.q.d.E @ l.l.",
+"l.l.l.l.l.. l.- 3.h.k.k.2.<.) g.k.k.w.( _ _ ( ! ! ! ! p.E @ l.l.",
+"l.l.l.l.$ Y 9 > ` s.k.k.w.e.a.k.k.p.8.r.q.q.q.q.q.q.0.f.R @ l.l.",
+"l.l.l.l.6 k.k.Y ^ w.k.k.) >.k.k.h.( _ _ _ _ ( ( ( ! ( s.E @ l.l.",
+"l.l.l.l.o >.f.0.#. at .k.k.2.h.k.j.2.p.p.p.d.p.r.r.r.r.r.g.E + l.l.",
+"l.l.l.l.l.3 0.$.N u.j.k.k.k.k.) U ` ` ` _ _ _ _ _ _ _ d.E + l.l.",
+"l.l.l.l.l.q u.M i.a.k.k.a.k.k.8.K r.r.r.w.w.r.q.q.q.q.g.E + l.l.",
+"l.l.# 2 8 ` N u :.t.k.k.] y.k.k.8.I Q ! _ _ _ ( ( ! _ g.E + l.l.",
+"l.l.5 k.j.4.p y B #.k.k.o.} h.k.k.8.5.<.p.r.r.r.r.w.w.g.E + l.l.",
+"l.l.1 p.f.3.b a j ..k.j.| d [ k.k.j./ W _ ! _ ! ! ! ! g.! + l.l.",
+"l.l.. % , ` m f l V k.k.n h u a.k.k.e.8.p.r.r.r.r.r.r.h.E + l.l.",
+"l.l.l.l.l.0 t.f z ;.h.d.v l d ,.j.j.e./ ` ` ` _ _ _ _ g.! + l.l.",
+"l.l.l.l.l.6 9. .x &.6.;.c j O.W G e.p.p.p.p.p.p.p.r.r.j.! + l.l.",
+"l.l.l.l.& 2.e.1.+.X.-.X.V { ( <./ U ` ` ` _ _ _ _ ( _ j.! + l.l.",
+"l.l.l.l.q k.p.r J >.5.5./ W F 2.r.Y f.g.g.f.f.f.f.f.f.j.! + l.l.",
+"l.l.l.l.& P 2 : _ Y / Y / p.Q K Y W ` ` ` ` _ 3.g.g.g.j.R X l.l.",
+"l.l.l.l.l.    * 9.8.e.2.w.k.g.p.r.f.s.p.p.p.p.d.h.g.h.j.T + l.l.",
+"l.l.l.l.l.l.l.= 3.g.) / j.k.k.k.k.k.k.k.k.k.k.k.k.k.j.k.E + l.l.",
+"l.l.l.l.l.l.l.= H E L L R R E R R R R T T T T T T T T T t + l.l.",
+"l.l.l.l.l.l.l.. @ O O @ O + X X X X O X X X X X X X X X X   l.l."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kregexpeditor-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kregexpeditor-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kregexpeditor-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,203 @@
+/* XPM */
+static char *kregexpeditor-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 181 2",
+"   c #040756",
+".  c #080857",
+"X  c #0D1059",
+"o  c #0E105D",
+"O  c #6F375D",
+"+  c #682565",
+"@  c #774465",
+"#  c #2D3984",
+"$  c #283B8A",
+"%  c #293C8A",
+"&  c #2C3C8A",
+"*  c #2E3D8A",
+"=  c #36308F",
+"-  c #333C85",
+";  c #313F8A",
+":  c #1C2DDF",
+">  c #1D2DDF",
+",  c #1E2EDF",
+"<  c #1437DF",
+"1  c #1636DC",
+"2  c #123CD9",
+"3  c #1538DA",
+"4  c #1638DA",
+"5  c #1638DF",
+"6  c #0922FF",
+"7  c #0A22FF",
+"8  c #0F25FF",
+"9  c #1327FF",
+"0  c #1729FF",
+"q  c #172AFF",
+"w  c #182AFF",
+"e  c #1B2CFF",
+"r  c #2030DF",
+"t  c #2130DF",
+"y  c #2230DF",
+"u  c #1153BF",
+"i  c #34418A",
+"p  c #37448B",
+"a  c #3B478C",
+"s  c #3F4C8E",
+"d  c #304793",
+"f  c #314893",
+"g  c #334893",
+"h  c #354A93",
+"j  c #364993",
+"k  c #374993",
+"l  c #384A93",
+"z  c #384B93",
+"x  c #3A4B93",
+"c  c #3B4B93",
+"v  c #3C4B93",
+"b  c #3C4E93",
+"n  c #3F4F93",
+"m  c #3E539B",
+"M  c #0943D5",
+"N  c #244CC0",
+"B  c #2842DF",
+"V  c #374DCE",
+"C  c #314AD1",
+"Z  c #2F6CDF",
+"A  c #3A71DF",
+"S  c #424B8E",
+"D  c #404D93",
+"F  c #435093",
+"G  c #465394",
+"H  c #40549B",
+"J  c #42559B",
+"K  c #44579B",
+"L  c #4C5795",
+"P  c #49599B",
+"I  c #4D5C9B",
+"U  c #505094",
+"Y  c #4F74BE",
+"T  c #5075BE",
+"R  c #5076BE",
+"E  c #5579BE",
+"W  c #5B7CBE",
+"Q  c #646FA8",
+"!  c #4477DF",
+"~  c #4577DF",
+"^  c #507DDF",
+"/  c #7C8557",
+"(  c #268E95",
+")  c #31858C",
+"_  c #389AD5",
+"`  c #2DBCC4",
+"'  c #30BEC4",
+"]  c #36BDC0",
+"[  c #07CEC9",
+"{  c #09CFC9",
+"}  c #04C9D1",
+"|  c #05C9D1",
+" . c #06C9D1",
+".. c #06CAD1",
+"X. c #0AD0C9",
+"o. c #16E8D1",
+"O. c #19EAD1",
+"+. c #1DEBD1",
+"@. c #5388D9",
+"#. c #479AFF",
+"$. c #499BFF",
+"%. c #4D9DFF",
+"&. c #5685E1",
+"*. c #50A1E5",
+"=. c #59A4FF",
+"-. c #5AA4FF",
+";. c #5BA5FF",
+":. c #5CA5FF",
+">. c #628DE2",
+",. c #65A8DA",
+"<. c #64A2F1",
+"1. c #60A8FF",
+"2. c #61A8FF",
+"3. c #66ABFF",
+"4. c #68ACFF",
+"5. c #69ADFF",
+"6. c #6AADFF",
+"7. c #6BAEFF",
+"8. c #6CAEFF",
+"9. c #6DAFFF",
+"0. c #6EAFFF",
+"q. c #7DB5EC",
+"w. c #71B1FF",
+"e. c #72B1FF",
+"r. c #72B2FF",
+"t. c #73B2FF",
+"y. c #74B2FF",
+"u. c #78B4FF",
+"i. c #78B5FF",
+"p. c #79B5FF",
+"a. c #7DB8FF",
+"s. c #7EB8FF",
+"d. c #7FB8FF",
+"f. c #7FB9FF",
+"g. c #822A3F",
+"h. c #81383F",
+"j. c #92342F",
+"k. c #A92D34",
+"l. c #812643",
+"z. c #822643",
+"x. c #904931",
+"c. c #955F30",
+"v. c #9FAB3A",
+"b. c #959D4D",
+"n. c #969E4D",
+"m. c #9AA543",
+"M. c #9CA542",
+"N. c #9DA642",
+"B. c #84A772",
+"V. c #99BA6C",
+"C. c #9DBC6C",
+"Z. c #90B17E",
+"A. c #ADC542",
+"S. c #AEC64D",
+"D. c #BFC840",
+"F. c #BFC940",
+"G. c #C2CE38",
+"H. c #C3CE38",
+"J. c #CFE740",
+"K. c #D2E840",
+"L. c #80B9FF",
+"P. c #81B9FF",
+"I. c #81BAFF",
+"U. c #82BAFF",
+"Y. c #83BAFF",
+"T. c #88BDFF",
+"R. c #89BEFF",
+"E. c #8BBFFF",
+"W. c #8CBFFF",
+"Q. c #8CC0FF",
+"!. c #8DC0FF",
+"~. c #90C2FF",
+"^. c #91C2FF",
+"/. c #97C6FF",
+"(. c #98C6FF",
+"). c #99C7FF",
+"_. c #9AC7FF",
+"`. c #9BC8FF",
+"'. c #A5CDFF",
+"]. c #A6CEFF",
+"[. c #B1D4FF",
+/* pixels */
+"o S F D c c k k k k c c c D a . ",
+"L [.'._.!.E.P.f.f.f.P.E.!.`.].- ",
+"I './.E.P.u.w.8.5.5.w.u.P.Q.`.i ",
+"P _.q.] ' ` *.;.;.B.V.C.Z.f.Q.i ",
+"K !.,.+.O.o._ $.#.A.J.K.S.w.P.* ",
+"K V N X.{ [ u 5 < v.G.G.m.B C * ",
+"K t 4 | | | M 7 7 m.D.D.n.0 , % ",
+"m , 4 | ( h.g.z.z.j.c.D.n.0 , % ",
+"m t 5 | ) k.k.k.k.k.x.N./ 0 : $ ",
+"m t e 2 = k.k.k.k.k.+ 8 9 0 , $ ",
+"m >.^ ~ U k.k.k.k.k.O Z A ~ &.% ",
+"K E.u.5.Q k.k.k.k.k.@ %.;.5.u.% ",
+"K !.P.w.<.W E Y Y Y @.;.3.y.P.* ",
+"P _.E.f.t.3.1.;.;.:.1.7.y.P.!.i ",
+"G '._.Q.I.i.w.9.9.9.w.u.P.!._.# ",
+". s n b z k f f f f f k k b p   "
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kregexpeditor.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kregexpeditor.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kregexpeditor.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,188 @@
+/* XPM */
+static char *kregexpeditor[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 150 2",
+"   c black",
+".  c #00003D",
+"X  c #000043",
+"o  c #00004B",
+"O  c #00005C",
+"+  c #000062",
+"@  c #0A0C7B",
+"#  c #5F3561",
+"$  c #673757",
+"%  c #662465",
+"&  c #622570",
+"*  c #683265",
+"=  c #5E5A61",
+"-  c #665258",
+";  c #764C70",
+":  c #794F72",
+">  c #0E1180",
+",  c #171A80",
+"<  c #1C2085",
+"1  c #0720FF",
+"2  c #0A22FF",
+"3  c #1226FF",
+"4  c #1629FF",
+"5  c #1B2BFF",
+"6  c #2436DF",
+"7  c #2B3FDF",
+"8  c #117DB9",
+"9  c #2769BF",
+"0  c #0B57D0",
+"q  c #0D58D0",
+"w  c #1243D7",
+"e  c #1149D5",
+"r  c #1C49DF",
+"t  c #0667CB",
+"y  c #0868CB",
+"u  c #234EDF",
+"i  c #2C40DF",
+"p  c #2A51DF",
+"a  c #3356DF",
+"s  c #3B5ADF",
+"d  c #472391",
+"f  c #482391",
+"g  c #503581",
+"h  c #4757A3",
+"j  c #4D5DA6",
+"k  c #566394",
+"l  c #5F639D",
+"z  c #4565B5",
+"x  c #4966B5",
+"c  c #4D69B5",
+"v  c #4B6EBC",
+"b  c #4E70BC",
+"n  c #5A6BAE",
+"m  c #536CB5",
+"M  c #5B6EB1",
+"N  c #5372BC",
+"B  c #5C70B5",
+"V  c #5976BC",
+"C  c #5D78BC",
+"Z  c #635D91",
+"A  c #62659D",
+"S  c #68689D",
+"D  c #627BBC",
+"F  c #687BB8",
+"G  c #415EDF",
+"H  c #577CC3",
+"J  c #5A7DC3",
+"K  c #587CDB",
+"L  c #547AE3",
+"P  c #597FE4",
+"I  c #2D888E",
+"U  c #3E95FF",
+"Y  c #26A8CB",
+"T  c #2BABCB",
+"R  c #30ADCD",
+"E  c #3CADCE",
+"W  c #3FB0CE",
+"Q  c #05C8D1",
+"!  c #0BD3C9",
+"~  c #14E6D1",
+"^  c #16E8D1",
+"/  c #1AEAD1",
+"(  c #6D82BC",
+")  c #679EB8",
+"_  c #7388BF",
+"`  c #7FAB96",
+"'  c #4096FF",
+"]  c #4599FF",
+"[  c #4A9BFF",
+"{  c #5598EF",
+"}  c #509FFF",
+"|  c #4FAACA",
+" . c #44B2CE",
+".. c #54A9D5",
+"X. c #5CABD6",
+"o. c #53A0FF",
+"O. c #55A8F1",
+"+. c #5AA4FF",
+"@. c #6482C3",
+"#. c #6A86C3",
+"$. c #6D88C3",
+"%. c #668FD1",
+"&. c #6790D1",
+"*. c #6192DD",
+"=. c #6B92D1",
+"-. c #7289C3",
+";. c #7296D1",
+":. c #7799D1",
+">. c #7D9CD1",
+",. c #7FB0CE",
+"<. c #63A9FF",
+"1. c #6BADFF",
+"2. c #6FB0FF",
+"3. c #73B2FF",
+"4. c #7AB5FF",
+"5. c #7EB8FF",
+"6. c #A92D34",
+"7. c #845A3F",
+"8. c #904931",
+"9. c #9A5231",
+"0. c #9E7334",
+"q. c #ADA139",
+"w. c #A1B03A",
+"e. c #8A9457",
+"r. c #8E9E56",
+"t. c #828D62",
+"y. c #9CA542",
+"u. c #A2BF62",
+"i. c #ACC543",
+"p. c #BEC840",
+"a. c #A5C063",
+"s. c #C4D238",
+"d. c #C0C940",
+"f. c #CEE640",
+"g. c #D0E740",
+"h. c #D3E940",
+"j. c #83AD96",
+"k. c #89B196",
+"l. c #83A0D1",
+"z. c #88A2D1",
+"x. c #83BAFF",
+"c. c #89BEFF",
+"v. c #8DC0FF",
+"b. c #92C3FF",
+"n. c #99C6FF",
+"m. c #9EC9FF",
+"M. c #A3CCFF",
+"N. c #ABD0FF",
+"B. c #B1D4FF",
+"V. c None",
+/* pixels */
+"  o O + + + O + + + O + + O + O + O + + O + + O + O + O + + o   ",
+"o < F -._ $.#. at .D #.J J J J H H H H J H J J J @. at .#.#.#._ n > o ",
+"+ _ B.N.M.m.n.n.c.c.c.x.c.x.4.x.x.4.5.5.x.c.c.c.b.n.m.M.N.N.j + ",
+"+ z.N.M.m.n.b.c.x.x.x.4.4.4.3.3.3.3.4.4.4.5.5.x.c.c.b.n.m.M.B + ",
+"+ l.M.m.n.b.c.x.x.4.4.3.2.2.1.1.1.1.1.3.3.3.4.4.x.x.c.b.n.M.M + ",
+"+ >.m.n.b.c.x.5.4.2.1.1.1.<.<.<.<.<.<.<.1.1.3.3.4.x.c.c.b.n.N + ",
+"+ >.n.b.c.c.|  . . . .E O.+.+.+.o.+.) ` ` j.j.k.k.z.x.x.c.n.m + ",
+"+ :.n.c.c.X./ / / ^ ^ ^ R } } } } } i.g.g.h.h.h.h.a.4.x.x.c.N + ",
+"+ ;.b.x.x.../ / / ^ ^ ^ T [ [ ] ] ] i.f.f.h.h.h.h.a.3.4.5.v.c + ",
+"+ ;.c.x.4.../ / / ^ ^ ~ Y ' ' ' U U i.f.f.f.h.h.h.a.1.4.5.x.c + ",
+"+ =.K G G 9 ! ! ! ! ! ! 8 u r r r r w.s.s.s.s.s.s.r.a s s L c + ",
+"+ ;.i 5 5 r ! Q Q Q Q Q y 2 2 2 2 1 y.p.p.p.d.d.s.t.5 5 5 6 c + ",
+"+ =.i 5 5 e Q Q Q Q Q Q t 1 1 1 1 2 y.p.p.p.p.d.p.t.4 5 5 6 c + ",
+"+ =.i 5 5 e Q Q Q Q Q Q t 1 1 1 1 1 y.p.p.p.p.d.p.t.5 4 5 6 z + ",
+"+ %.7 5 5 e Q Q Q I - - $ % % % % % 8.9.9.q.p.d.p.t.4 5 5 6 z + ",
+"+ %.7 5 5 e Q Q Q = 6.6.6.6.6.6.6.6.6.6.6.0.p.d.p.t.4 5 5 6 z + ",
+"+ %.7 5 5 e Q Q Q = 6.6.6.6.6.6.6.6.6.6.6.0.p.p.p.t.4 5 5 6 z + ",
+"+ =.7 5 5 w Q Q Q = 6.6.6.6.6.6.6.6.6.6.6.7.e.e.e.k 4 4 5 6 z + ",
+"+ =.7 5 5 5 e q 0 # 6.6.6.6.6.6.6.6.6.6.6.d 2 3 3 4 4 5 5 6 z + ",
+"+ %.7 5 5 5 4 4 3 & 6.6.6.6.6.6.6.6.6.6.6.d 3 3 3 4 4 5 5 6 z + ",
+"+ =.P s a a a p u * 6.6.6.6.6.6.6.6.6.6.6.& u u p p a a s L z + ",
+"+ =.x.5.3.1.<.+.o.; 6.6.6.6.6.6.6.6.6.6.6.k ] [ o.+.<.1.4.5.c + ",
+"+ =.c.5.4.3.<.<.+.; 6.6.6.6.6.6.6.6.6.6.6.Z [ o.+.<.1.2.4.x.x + ",
+"+ :.c.x.4.3.1.<.<.: 6.6.6.6.6.6.6.6.6.6.6.l o.+.+.1.1.4.5.x.c + ",
+"+ :.c.c.5.4.3.1.<.*.S S A A A l l l A A A { +.<.1.1.3.4.5.c.m + ",
+"+ :.n.c.x.5.4.3.1.<.<.+.+.o.o.o.} o.} o.+.+.<.<.1.3.5.5.c.b.m + ",
+"+ >.n.b.c.c.4.4.3.1.<.<.+.+.+.+.+.+.+.<.+.<.1.1.3.4.5.c.c.b.N + ",
+"+ >.M.n.n.c.x.5.4.3.3.1.1.<.<.<.<.<.<.<.1.2.3.4.4.5.c.c.n.m.m + ",
+"+ l.M.M.n.b.c.x.5.5.4.4.2.1.2.1.1.1.1.3.3.3.4.5.5.c.c.b.n.M.M + ",
+"+ ( N.M.m.n.n.c.c.5.5.5.4.4.4.3.3.3.4.3.4.5.5.x.c.c.n.n.m.M.h + ",
+"o @ M D D D C V V N N N v v v v v v v v N v N N V C C D D j @ o ",
+"V.. O O O O O O O O O O O O O O O O O O O O O O O O O O O O X V."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/ktimer-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/ktimer-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/ktimer-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,208 @@
+/* XPM */
+static char *ktimer-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 186 2",
+"   c black",
+".  c #000003",
+"X  c #00000A",
+"o  c #000208",
+"O  c #000309",
+"+  c #00000D",
+"@  c #000515",
+"#  c #020811",
+"$  c #040E1D",
+"%  c #000823",
+"&  c #020E22",
+"*  c #010D2A",
+"=  c #020F33",
+"-  c #081120",
+";  c #0B1524",
+":  c #051335",
+">  c #051534",
+",  c #06193E",
+"<  c #121B2C",
+"1  c #1D2A3E",
+"2  c #000B48",
+"3  c #041942",
+"4  c #071F63",
+"5  c #0F275A",
+"6  c #122B53",
+"7  c #102D5E",
+"8  c #092163",
+"9  c #0E3070",
+"0  c #123577",
+"q  c #18397E",
+"w  c #202D41",
+"e  c #213959",
+"r  c #355072",
+"t  c #174590",
+"y  c #1C4B9A",
+"u  c #1958BF",
+"i  c #214590",
+"p  c #2E588C",
+"a  c #285095",
+"s  c #2E58A5",
+"d  c #335AA4",
+"f  c #3364A2",
+"g  c #3E6EA8",
+"h  c #3365B3",
+"j  c #316CBD",
+"k  c #336AC1",
+"l  c #347CE1",
+"z  c #4975BA",
+"x  c #6A76AE",
+"c  c #4379CC",
+"v  c #5573C2",
+"b  c #528BC8",
+"n  c #5889C1",
+"m  c #518DD5",
+"M  c #488CE4",
+"N  c #4F93EC",
+"B  c #579AEF",
+"V  c #5F9AE7",
+"C  c #639ACD",
+"Z  c #729BCB",
+"A  c #629AE7",
+"S  c #6CA6EF",
+"D  c #68AAF7",
+"F  c #70A2E5",
+"G  c #71A6E2",
+"H  c #7AA9E5",
+"J  c #7EADE2",
+"K  c #7EB1EC",
+"L  c #FE9277",
+"P  c #8C8CC1",
+"I  c #8E99CC",
+"U  c #809AD6",
+"Y  c #9E9DC9",
+"T  c #929DD1",
+"R  c #91A2D4",
+"E  c #97A3D4",
+"W  c #9DA9D6",
+"Q  c #85B5E9",
+"!  c #87B7E9",
+"~  c #8AB8E9",
+"^  c #89B8ED",
+"/  c #8AB9EF",
+"(  c #8ABEF0",
+")  c #8EBCF2",
+"_  c #90B7E5",
+"`  c #91B7E4",
+"'  c #92BBEA",
+"]  c #A5B2DC",
+"[  c #AEB8DB",
+"{  c #B4ADC5",
+"}  c #B5BCDE",
+"|  c #88C1FD",
+" . c #88C3FE",
+".. c #9DC2ED",
+"X. c #9DC3EC",
+"o. c #96C3F7",
+"O. c #B0C1DF",
+"+. c #ADCCED",
+"@. c #A5C9F2",
+"#. c #A6C9F3",
+"$. c #A3C9F8",
+"%. c #A2CBFB",
+"&. c #ADCEF2",
+"*. c #AECEF0",
+"=. c #B9CCE7",
+"-. c #BBD1ED",
+";. c #BCD4EF",
+":. c #B2D2F2",
+">. c #B1D2F5",
+",. c #B5D2F2",
+"<. c #B7D6F5",
+"1. c #B9D8F5",
+"2. c #BFD9F5",
+"3. c #ECBFB7",
+"4. c #FECBBB",
+"5. c #FECEBE",
+"6. c #FED1BF",
+"7. c #DCC9D1",
+"8. c #DECCD1",
+"9. c #CCD8ED",
+"0. c #C1D8F0",
+"q. c #C5D9F2",
+"w. c #C5DEF7",
+"e. c #C9DFF7",
+"r. c #CCDEF2",
+"t. c #D9DEEF",
+"y. c #D1DEF2",
+"u. c #D1DFF5",
+"i. c #CEE1F7",
+"p. c #C9E4FD",
+"a. c #D1E1F3",
+"s. c #D1E2F7",
+"d. c #D5E2F3",
+"f. c #D4E2F7",
+"g. c #D6E5F7",
+"h. c #D2EAFE",
+"j. c #D2EDFE",
+"k. c #D5EAFE",
+"l. c #D6EAFE",
+"z. c #D4EFFE",
+"x. c #D5EFFE",
+"c. c #D6ECFE",
+"v. c #DCE7F7",
+"b. c #DFE7F5",
+"n. c #DBE9F7",
+"m. c #DCE9F7",
+"M. c #DBE9FA",
+"N. c #D9EDFE",
+"B. c #DFE9F8",
+"V. c #DEEAF8",
+"C. c #DCECFB",
+"Z. c #DCEFFE",
+"A. c #DFEFFE",
+"S. c #D9F0FE",
+"D. c #DCF2FE",
+"F. c #DCF3FE",
+"G. c #DFF2FE",
+"H. c #DEF8FE",
+"J. c #ECCECE",
+"K. c #E2EAF2",
+"L. c #E7ECF5",
+"P. c #E1EAFA",
+"I. c #E1F0FE",
+"U. c #E1F2FE",
+"Y. c #E4F0FB",
+"T. c #E4F2FE",
+"R. c #E4F3FE",
+"E. c #ECF0F7",
+"W. c #EAF0F8",
+"Q. c #E9F3FE",
+"!. c #EDF3FA",
+"~. c #FEEAE2",
+"^. c #FDEAE4",
+"/. c #FEEFE9",
+"(. c #FEEFEA",
+"). c #F3F7FD",
+"_. c #F2F8FD",
+"`. c #F3FAFE",
+"'. c #F5FAFE",
+"]. c #F8FBFD",
+"[. c #F8FBFE",
+"{. c #FAFEFE",
+"}. c #FDFDFE",
+"|. c #FDFEFE",
+" X c #FEFEFE",
+".X c None",
+/* pixels */
+".X.X.X.X2 8 i d d q =   .X.X.X.X",
+".X.X  4 z ` &.*.:.#.H a @ .X.X.X",
+".X  5 F X.0.n.r.V.g.+.o.c % .X.X",
+".X: A @.e.e.U.D.A.D.0.R ) k + .X",
+"  h ^ 2.l.c.j.c.l.S.I ] 1.S 9   ",
+"> V ,.w.N.c.7.8.H.E W F.1./ u + ",
+"0 K s.U.D.H.J.L [ T D.h.p.>.l * ",
+"y ! a.Q.Y.9.} x v P.Y.Y.A.;.N 3 ",
+"t _ ).].t.P Y U { {.`.'.`.b.B , ",
+"7 G L.{.{.{.{.{.J.^. X X'.d.M $ ",
+"$ m =.L.{.{.{.{./.4. X XK.X.j   ",
+"  p Q L.{.{.{.{. X4.~.].y.D 6   ",
+".X# b ` b.).{.{.{.(.3.s.| f   .X",
+".X.X- n ! -.v.f.V.M.}  .g O .X.X",
+".X.X.XO r Z ' $.%.( C e   .X.X.X",
+".X.X.X.X  O < w 1 ;     .X.X.X.X"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/ktimer.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/ktimer.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/ktimer.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,285 @@
+/* XPM */
+static char *ktimer[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 247 2",
+"   c #000000",
+".  c #00000B",
+"X  c #000113",
+"o  c #00041A",
+"O  c #01081A",
+"+  c #000321",
+"@  c #000A25",
+"#  c #000E2A",
+"$  c #051026",
+"%  c #02112F",
+"&  c #02143A",
+"*  c #001F3F",
+"=  c #0B1B3B",
+"-  c #021A47",
+";  c #081C40",
+":  c #021F59",
+">  c #001E66",
+",  c #0F2958",
+"<  c #162A4F",
+"1  c #112651",
+"2  c #102853",
+"3  c #182F5B",
+"4  c #1C345E",
+"5  c #002366",
+"6  c #01266A",
+"7  c #072D6E",
+"8  c #0C2E6A",
+"9  c #042A77",
+"0  c #002A7A",
+"q  c #092775",
+"w  c #05307B",
+"e  c #09347C",
+"r  c #1D3765",
+"t  c #1F3966",
+"y  c #1E3C6F",
+"u  c #153775",
+"i  c #264273",
+"p  c #284370",
+"a  c #002E84",
+"s  c #03358A",
+"d  c #0A3C8D",
+"f  c #0A3D90",
+"g  c #0C4090",
+"h  c #094299",
+"j  c #12418A",
+"k  c #1B448A",
+"l  c #1F488E",
+"z  c #1D4E99",
+"x  c #124CA3",
+"c  c #1454B1",
+"v  c #175AB8",
+"b  c #1F5FB8",
+"n  c #2F5B9B",
+"m  c #3B5582",
+"M  c #3B5E92",
+"N  c #295DA9",
+"B  c #3D659C",
+"V  c #336CB9",
+"C  c #386DB5",
+"Z  c #3C73BC",
+"A  c #2A6DC5",
+"S  c #3075CE",
+"D  c #3975C2",
+"F  c #3D79D7",
+"G  c #2176E1",
+"H  c #4E6D9C",
+"J  c #4270B1",
+"K  c #5173A5",
+"L  c #6462AC",
+"P  c #7372B6",
+"I  c #7375B9",
+"U  c #797BBC",
+"Y  c #457DC9",
+"T  c #3A88E2",
+"R  c #5681B8",
+"E  c #5E84B6",
+"W  c #5B84B9",
+"Q  c #6581AC",
+"!  c #648BBC",
+"~  c #6C8FBD",
+"^  c #4782D0",
+"/  c #408DDE",
+"(  c #5C95DC",
+")  c #5E99D5",
+"_  c #5A98DB",
+"`  c #4694E6",
+"'  c #4595E8",
+"]  c #4A9AE9",
+"[  c #509EEA",
+"{  c #5E9AE2",
+"}  c #5C9DE9",
+"|  c #42A8FF",
+" . c #56A3EC",
+".. c #5CA7ED",
+"X. c #6191CA",
+"o. c #6398CF",
+"O. c #6D9ACE",
+"+. c #6395D7",
+"@. c #6399D2",
+"#. c #7C8FC4",
+"$. c #7C99C4",
+"%. c #7F9FCB",
+"&. c #7690D0",
+"*. c #729FD9",
+"=. c #6DA4DE",
+"-. c #73A1D3",
+";. c #70A4DC",
+":. c #71ABDE",
+">. c #7BA0D1",
+",. c #7AABDD",
+"<. c #67A9E5",
+"1. c #64ACEF",
+"2. c #6BA3E3",
+"3. c #6CACEB",
+"4. c #69AEF1",
+"5. c #73ABE4",
+"6. c #72AFEA",
+"7. c #7BADE4",
+"8. c #79ACE9",
+"9. c #74B3EC",
+"0. c #7DB0E7",
+"q. c #75B3F0",
+"w. c #7BBEF6",
+"e. c #FF7E5D",
+"r. c #FF8970",
+"t. c #8287C2",
+"y. c #868AC4",
+"u. c #8C88C0",
+"i. c #8E91C8",
+"p. c #919DCF",
+"a. c #82A0CA",
+"s. c #83ABDA",
+"d. c #8EABD1",
+"f. c #8FAFDB",
+"g. c #8BB5DF",
+"h. c #92AFD6",
+"j. c #9CA2D2",
+"k. c #93B4DC",
+"l. c #9DB7DC",
+"z. c #81AEE0",
+"x. c #85B3E4",
+"c. c #83B4E9",
+"v. c #8CB6E3",
+"b. c #8FB8E5",
+"n. c #8CBAE9",
+"m. c #81B7F2",
+"M. c #83BAF1",
+"N. c #8ABBF3",
+"B. c #94BAE5",
+"V. c #93BCEB",
+"C. c #9CBCE5",
+"Z. c #A2A8D5",
+"A. c #A8AAD4",
+"S. c #ADB6DD",
+"D. c #A8BEDF",
+"F. c #A4BEE6",
+"G. c #82C1F4",
+"H. c #8DC3F3",
+"J. c #8ECCFA",
+"K. c #9CC0E5",
+"L. c #9BC0EB",
+"P. c #9FCAEF",
+"I. c #93C2F5",
+"U. c #91CBF5",
+"Y. c #98C4F2",
+"T. c #9CCDF3",
+"R. c #95D0F9",
+"E. c #9BD3F8",
+"W. c #A3C4E6",
+"Q. c #A3C4EB",
+"!. c #A9C1E0",
+"~. c #AFCAED",
+"^. c #AACBF2",
+"/. c #ACD0F5",
+"(. c #ABD8F3",
+"). c #ABDDFD",
+"_. c #B3CEEB",
+"`. c #BBC1E3",
+"'. c #BFCFE6",
+"]. c #B3CFF4",
+"[. c #B9D2ED",
+"{. c #B4D1F1",
+"}. c #B7DEF4",
+"|. c #BCD6F2",
+" X c #BEDAF5",
+".X c #BCD8F8",
+"XX c #B4E6FF",
+"oX c #BAECFF",
+"OX c #D5A9AA",
+"+X c #F6AC9C",
+"@X c #FFAB90",
+"#X c #EEB6AB",
+"$X c #F3B5A3",
+"%X c #FFBCA5",
+"&X c #F3BCB5",
+"*X c #FFC1AE",
+"=X c #FFC4B2",
+"-X c #D5C4C7",
+";X c #C3C3E0",
+":X c #C1CBE9",
+">X c #CBCEE7",
+",X c #C9CFE8",
+"<X c #C3D6EE",
+"1X c #C6D9EF",
+"2X c #CAD6EE",
+"3X c #CDDCEE",
+"4X c #C3DAF2",
+"5X c #CAD7F1",
+"6X c #CADEF3",
+"7X c #D2DEF2",
+"8X c #DEDFF0",
+"9X c #C7E1F8",
+"0X c #C3E9FD",
+"qX c #CDE1F5",
+"wX c #CCE3FA",
+"eX c #CFECFD",
+"rX c #C4F1FF",
+"tX c #CAF0FF",
+"yX c #D3E3F4",
+"uX c #D3E5F9",
+"iX c #D5EAFC",
+"pX c #D9E5F4",
+"aX c #DEE7F8",
+"sX c #DDE8F5",
+"dX c #DCECFB",
+"fX c #D3F4FF",
+"gX c #DCF1FF",
+"hX c #E0CBCE",
+"jX c #EDDFDD",
+"kX c #F2CCC9",
+"lX c #FEE2D5",
+"zX c #E3EBF6",
+"xX c #E2EDFA",
+"cX c #EAEFF6",
+"vX c #E8EFFA",
+"bX c #E4F2FE",
+"nX c #E6F9FF",
+"mX c #EBF4FD",
+"MX c #ECF9FE",
+"NX c #F6E9E7",
+"BX c #FFECE7",
+"VX c #FEECE9",
+"CX c #F0EDF3",
+"ZX c #F2F6FC",
+"AX c #F3FAFE",
+"SX c #FDFEFE",
+"DX c None",
+/* pixels */
+"DXDXDXDXDXDXDXDXDXDX* 9 0 a d f d s 6 : @ DXDXDXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXq 0 d V ;.L.{. X{.Q.8.Y x 6 @ DXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDX  6 x +..XdXyX[._.[._.[.5XdXwX8.b 5 X DXDXDXDXDXDXDX",
+"DXDXDXDXDX5 9 Y .XyXW.B.].qXyX[.9XwX|.C.K.1XwX{ h # DXDXDXDXDXDX",
+"DXDXDXDXX f 2.uXK.v.qXAXCXzXmX3XpXzXmXmXsXL.v.qXN.c & DXDXDXDXDX",
+"DXDXDX+ d 8.4Xz. XyXyXsXvXmXAXyXmXmXbXyXsXyX9Xv._.I.v % DXDXDXDX",
+"DXDX  7 2.{.z.uXsXuX<XMXMXmXnXMXmXmXAXAXyX1XyX5Xn.Q.m.x O DXDXDX",
+"DXDX- ^ /.,.wXuXuXbXxXbXbXmXmXbXmXbXbXmXdXMXt.Z.gXx.Q.} e   DXDX",
+"DX. z I.7. XpXqXmXbXbXbXbXbXbXbXbXbXbXbXMXj.i.pXqXiXx.Y.S = DXDX",
+"DX- ( n.B.4X4XbXbXbXbXbXbXbXbXgXbXbXbXMXS.U bXnXqX9XL.x.1.d   DX",
+"  k M.7.uX9X|.dXbXbXbXbXbXzXbXbXbXdXMX:XI sXnXmXqX|.pX0.` A # DX",
+"o Z c.B.dXqXmXbXbXbXdXbXbX+X+XbXbXMX7XI 2XMXbXdXdX9XwX^./ T 2   ",
+"& ) 5.|.uXdXmXbXnXmXbXmXnX&Xe.jXMXbXU `.MXbXbXgXdXiX XiX{ ' k   ",
+"8 3.=.pXyXmXmXmXmXmXmXmXnXcXr. at XMXy.A.MXmXdXbXgXbXbX9XdX7.' N   ",
+"k 6.5.xXuXAXMXmXMXmXAXMXAXSXkXOXp.y.AXMXmXbXmXmXnXAXpXmXV.' V X ",
+"l 3.,.7X1XpXAXAXAXAXAXvX2XA.&.| G A.AXAXAXMXmXAXZXbX1XyXV. .D O ",
+"k 3.;.sXpXmXAXAXSX>XP L P u.y.F #.mXAXAXAXAXAXAXAXAXsXcXL. .Z O ",
+"u 9.) cXsXSXSXSXSX8X;XzXAXSXSXCX*XlXSXSXSXAXSXSXSXSXzXZXL...C   ",
+"= 6.) yXzXSXSXSXSXSXSXSXSXSXSXSXVX%XSXSXSXSXSXSXSXSXzXmX8.1.n   ",
+"O X.<.!.CXmXSXSXSXSXSXSXSXSXSXSXSX*XlXSXSXSXSXSXSXAXzXzX2.4.y   ",
+"  B G.O.AXzXcXAXSXSXSXSXSXSXSXSXSXVX%XSXSXSXSXSXcXpXAX~.3.{ =   ",
+"DX2 H.) :XpX8XSXSXSXSXSXSXSXSXSXSXSX*XlXSXSXSXSXcX3XpX7.w.J . DX",
+"DXX W U.X.mXcXAXSXSXSXSXSXSXSXSXSXSXVX%XSXSXSXSXzXSXQ.9.9.4   DX",
+"DXDX1 T.:.h.SXzXSXSXSXSXSXSXSXSXSXSXSX*XlXSXSXzXmXyX5.J.J . DXDX",
+"DXDX  M XX at .D.AXzXAXmXSXSXSXSXSXSXSXSXVX$XmXcXmXzX7.R.=.=   DXDX",
+"DXDXDXo E oXo.l.AXvXpXSXSXSXSXAXSXSXSXAX$X-XAXuX7.E.m.t   DXDXDX",
+"DXDXDXDX# ! 0X,.%.<XAXAXmXZXSXvXZXZXmXmXNXhX^.c.).H.i   DXDXDXDX",
+"DXDXDXDXDXO K 0X(.-.f.1XmXZXSXvXAXAXZXaX].V.T.oXc.t   DXDXDXDXDX",
+"DXDXDXDXDXDX. p l.fX}.g.s.k.C.W.F.C.B.V.).rX).R =   DXDXDXDXDXDX",
+"DXDXDXDXDXDXDX  # m d.wXgXiXiXwXiXeXeXeXQ.W 4 .   DXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDX  O < i ~ $.a.%.~ H i =     DXDXDXDXDXDXDXDXDX",
+"DXDXDXDXDXDXDXDXDXDXDX          .         DXDXDXDXDXDXDXDXDXDXDX"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kwikdisk-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kwikdisk-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kwikdisk-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,196 @@
+/* XPM */
+static char *kwikdisk-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 174 2",
+"   c black",
+".  c #010000",
+"X  c #000103",
+"o  c #000601",
+"O  c #040000",
+"+  c #040100",
+"@  c #060100",
+"#  c #00040A",
+"$  c #00060F",
+"%  c #010801",
+"&  c #000D02",
+"*  c #0B0000",
+"=  c #0E0400",
+"-  c #001101",
+";  c #001300",
+":  c #001602",
+">  c #021A04",
+",  c #011F04",
+"<  c #130200",
+"1  c #1A0602",
+"2  c #030F23",
+"3  c #031524",
+"4  c #051325",
+"5  c #05172F",
+"6  c #023E06",
+"7  c #09320D",
+"8  c #0D243A",
+"9  c #220601",
+"0  c #260F02",
+"q  c #301405",
+"w  c #052542",
+"e  c #03490B",
+"r  c #0B5414",
+"t  c #095D15",
+"y  c #0A6615",
+"u  c #0F7A19",
+"i  c #0D6B52",
+"p  c #107244",
+"a  c #621D09",
+"s  c #6D1D08",
+"d  c #692109",
+"f  c #6E290E",
+"g  c #7D2D0B",
+"h  c #73341C",
+"j  c #0B6790",
+"k  c #11618A",
+"l  c #276A8F",
+"z  c #286A93",
+"x  c #606E8E",
+"c  c #04850E",
+"v  c #028210",
+"b  c #068019",
+"n  c #009E15",
+"m  c #089310",
+"M  c #159429",
+"N  c #1A9120",
+"B  c #03A018",
+"V  c #06A01B",
+"C  c #00B210",
+"Z  c #02B513",
+"A  c #06B517",
+"S  c #08B419",
+"D  c #0BB51B",
+"F  c #0AB619",
+"G  c #0FB71E",
+"H  c #0CBA1B",
+"J  c #0DA421",
+"K  c #229B2A",
+"L  c #299C2D",
+"P  c #21A427",
+"I  c #22AD6A",
+"U  c #01C60E",
+"Y  c #03CB0F",
+"T  c #07D21A",
+"R  c #11CE18",
+"E  c #19C225",
+"W  c #25C831",
+"Q  c #28CF33",
+"!  c #29D033",
+"~  c #34D23F",
+"^  c #3DCE4B",
+"/  c #39DE41",
+"(  c #41D94A",
+")  c #43D84A",
+"_  c #4CE453",
+"`  c #6CF26F",
+"'  c #0B9DB7",
+"]  c #1494E7",
+"[  c #06A6F3",
+"{  c #0CACF6",
+"}  c #01B1FF",
+"|  c #07B4F9",
+" . c #05B4FF",
+".. c #05BBFA",
+"X. c #0FB8FF",
+"o. c #0FBAFF",
+"O. c #228DCA",
+"+. c #2AA6C2",
+"@. c #00C4FF",
+"#. c #04C5FF",
+"$. c #08C5FF",
+"%. c #0DC6FF",
+"&. c #01D3FF",
+"*. c #05D0FF",
+"=. c #09DDFF",
+"-. c #17C6F6",
+";. c #13C6FF",
+":. c #1CC4FF",
+">. c #29D0FF",
+",. c #3BCDF5",
+"<. c #34D1FF",
+"1. c #34D8FF",
+"2. c #35DCFF",
+"3. c #4C82A7",
+"4. c #4986AF",
+"5. c #768CA5",
+"6. c #4295C3",
+"7. c #5CCE9C",
+"8. c #74DD8F",
+"9. c #40D4FF",
+"0. c #41D6FF",
+"q. c #45D5FF",
+"w. c #46D6FF",
+"e. c #67C7EA",
+"r. c #841E06",
+"t. c #9C3F11",
+"y. c #874A23",
+"u. c #9D6037",
+"i. c #A55E2F",
+"p. c #CF3F12",
+"a. c #D33E0F",
+"s. c #D17B37",
+"d. c #FD4B10",
+"f. c #F15614",
+"g. c #F95C1B",
+"h. c #FF5B19",
+"j. c #F6661C",
+"k. c #FF611D",
+"l. c #FF621F",
+"z. c #FF6918",
+"x. c #FF691C",
+"c. c #E46C22",
+"v. c #E6792B",
+"b. c #FF6D26",
+"n. c #FF7B28",
+"m. c #FF782D",
+"M. c #FF7C28",
+"N. c #FF7A32",
+"B. c #FF7C32",
+"V. c #FF7F36",
+"C. c #E98A37",
+"Z. c #FF822C",
+"A. c #FF8135",
+"S. c #FF8237",
+"D. c #FF8E34",
+"F. c #FF893A",
+"G. c #FF8745",
+"H. c #FF8949",
+"J. c #F38E50",
+"K. c #FF9E47",
+"L. c #FF9D5F",
+"P. c #E4A16D",
+"I. c #EFA578",
+"U. c #FFA363",
+"Y. c #FEB574",
+"T. c #8C969C",
+"R. c #86EDFF",
+"E. c #8BEFFF",
+"W. c #FFB682",
+"Q. c #FFB984",
+"!. c #FFBD87",
+"~. c #FFC696",
+"^. c #FFD4AB",
+"/. c None",
+/* pixels */
+"/./././././././.# $ /./././././.",
+"/./././././.  8 3.4.4 /././././.",
+"/././././.3 z e.E.R.6.5 /./././.",
+"/././././.k 1.0.q.q.0.O.2 /././.",
+"/././.@ * j =.%. .o.<.,.w /././.",
+"/./.q u.i.l &.*.:.>.2.-.i ; /./.",
+"0 y.P.^.~.T... at .;.$.#.| 7.L : /.",
+"s.Y.!.Q.W.I.5.{ o.} [ +.8.` K , ",
+"C.K.F.S.N.V.J.x ] ' I ^ ) ( / N ",
+"v.D.Z.z.m.L.U.h p T R F H Q _ P ",
+"c.M.n.S.G.H.N.f u Y U E W ~ Q m ",
+"t.j.x.b.l.l.g.a t A C G F F Z c ",
+"= g f.h.d.a.s < & y V J n B v 6 ",
+"/.@ d p.r.9   /./.% r M u e ;   ",
+"/./.  1 @ /././././.o 7 >   /./.",
+"/./././././././././././././././."
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/kwikdisk.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/kwikdisk.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/kwikdisk.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kwikdisk[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #000209",
+"X  c #000A00",
+"o  c #0A0100",
+"O  c #000412",
+"+  c #000D1F",
+"@  c #001402",
+"#  c #001A03",
+"$  c #130200",
+"%  c #190206",
+"&  c #00132C",
+"*  c #021A39",
+"=  c #002504",
+"-  c #002908",
+";  c #04340B",
+":  c #043C09",
+">  c #023203",
+",  c #083611",
+"<  c #220900",
+"1  c #280601",
+"2  c #3C1200",
+"3  c #3B0802",
+"4  c #052659",
+"5  c #05335F",
+"6  c #06316E",
+"7  c #0E3060",
+"8  c #083172",
+"9  c #232E70",
+"0  c #054709",
+"q  c #0C4910",
+"w  c #06540A",
+"e  c #055A0A",
+"r  c #0D5413",
+"t  c #0B6413",
+"y  c #10771D",
+"u  c #06620D",
+"i  c #1A7822",
+"p  c #0A4475",
+"a  c #571204",
+"s  c #4A1201",
+"d  c #4B2D37",
+"f  c #601C08",
+"g  c #622202",
+"h  c #762806",
+"j  c #093783",
+"k  c #19528F",
+"l  c #087FB1",
+"z  c #197DB3",
+"x  c #2A64A6",
+"c  c #716E99",
+"v  c #787094",
+"b  c #627DAE",
+"n  c #038C19",
+"m  c #078A18",
+"M  c #009816",
+"N  c #029A18",
+"B  c #04921D",
+"V  c #05880F",
+"C  c #118C21",
+"Z  c #189C2C",
+"A  c #1F9730",
+"S  c #00A214",
+"D  c #00AC13",
+"F  c #09A41A",
+"G  c #00B60F",
+"H  c #00B610",
+"J  c #03B912",
+"K  c #0CBA1C",
+"L  c #0CB31E",
+"P  c #10BC1D",
+"I  c #15A927",
+"U  c #19B623",
+"Y  c #17B826",
+"T  c #209C37",
+"R  c #20BC2F",
+"E  c #2CBC38",
+"W  c #1C9B70",
+"Q  c #1BA364",
+"!  c #3EAA7C",
+"~  c #00C10D",
+"^  c #00CB0B",
+"/  c #05C613",
+"(  c #01D50A",
+")  c #00D707",
+"_  c #19CB23",
+"`  c #1ECA28",
+"'  c #1DD325",
+"]  c #06E20A",
+"[  c #21C32D",
+"{  c #21C92D",
+"}  c #25CB31",
+"|  c #2ACC35",
+" . c #2DCE38",
+".. c #22D329",
+"X. c #2DD735",
+"o. c #30CF3B",
+"O. c #30D33A",
+"+. c #36DF3D",
+"@. c #31E037",
+"#. c #3BDF42",
+"$. c #42D94A",
+"%. c #47DA50",
+"&. c #58D962",
+"*. c #45E54A",
+"=. c #4BE152",
+"-. c #58F65A",
+";. c #58E45E",
+":. c #5BE361",
+">. c #74EC78",
+",. c #73EF77",
+"<. c #65EC6A",
+"1. c #189B84",
+"2. c #2A87B4",
+"3. c #0F82DF",
+"4. c #0989E9",
+"5. c #1991EF",
+"6. c #1997F3",
+"7. c #01A5FD",
+"8. c #01ACFD",
+"9. c #0EA8F8",
+"0. c #00B5FE",
+"q. c #00BBFE",
+"w. c #08B2FB",
+"e. c #17A4EB",
+"r. c #18ADEC",
+"t. c #14AFFF",
+"y. c #19B1ED",
+"u. c #14B3FF",
+"i. c #14BCFF",
+"p. c #1ABBFF",
+"a. c #3286CC",
+"s. c #2792E5",
+"d. c #38ADF1",
+"f. c #26A7F0",
+"g. c #01C4FE",
+"h. c #00CDFF",
+"j. c #09C8FF",
+"k. c #00D4FF",
+"l. c #00DCFF",
+"z. c #0BD2FF",
+"x. c #13C2FF",
+"c. c #1CCBFF",
+"v. c #15C8FF",
+"b. c #14DAFF",
+"n. c #1CD0FE",
+"m. c #1CDFFF",
+"M. c #01E3FF",
+"N. c #24C9FF",
+"B. c #2DCBFF",
+"V. c #22C6FF",
+"C. c #24D5FF",
+"Z. c #29D6FF",
+"A. c #33CDFF",
+"S. c #36D7FE",
+"D. c #5B88B8",
+"F. c #59BD88",
+"G. c #5DAFA5",
+"H. c #57A8BB",
+"J. c #449AD9",
+"K. c #5EA3C3",
+"L. c #48A9E8",
+"P. c #60ABE3",
+"I. c #41DAFF",
+"U. c #42D4FF",
+"Y. c #5EDFFF",
+"T. c #54DDFF",
+"R. c #47E1FF",
+"E. c #5DE0FF",
+"W. c #64CFFC",
+"Q. c #60E9FF",
+"!. c #7BEAFF",
+"~. c #8B340A",
+"^. c #942A0A",
+"/. c #A6370E",
+"(. c #BE3410",
+"). c #AC2809",
+"_. c #9E420C",
+"`. c #BD4416",
+"'. c #BB5417",
+"]. c #EF3A09",
+"[. c #C44A1B",
+"{. c #C35619",
+"}. c #DB4512",
+"|. c #C65D23",
+" X c #CA621F",
+".X c #D4661E",
+"XX c #CC6822",
+"oX c #DA7231",
+"OX c #C36833",
+"+X c #E7400E",
+"@X c #E95618",
+"#X c #FE460D",
+"$X c #FF4C11",
+"%X c #FF5D0B",
+"&X c #FF530E",
+"*X c #FE5013",
+"=X c #FF5A14",
+"-X c #FE5A19",
+";X c #FF620E",
+":X c #FF6413",
+">X c #FF641C",
+",X c #FF6C1C",
+"<X c #FA661A",
+"1X c #FF7019",
+"2X c #FF6621",
+"3X c #FD6E25",
+"4X c #FF7324",
+"5X c #FF7B27",
+"6X c #FF7D2A",
+"7X c #FF762A",
+"8X c #FF7C34",
+"9X c #FF7D3A",
+"0X c #F07936",
+"qX c #C27049",
+"wX c #FF812D",
+"eX c #FF813B",
+"rX c #FF8831",
+"tX c #FB8638",
+"yX c #FF9238",
+"uX c #FF9C3E",
+"iX c #FF9136",
+"pX c #FF8B44",
+"aX c #FF8E4A",
+"sX c #FF9244",
+"dX c #FF924E",
+"fX c #FF9940",
+"gX c #FF9452",
+"hX c #FD9956",
+"jX c #EA8C5D",
+"kX c #E29C76",
+"lX c #FFA649",
+"zX c #EDAC7C",
+"xX c #FDAA6C",
+"cX c #FFA76F",
+"vX c #FFAB73",
+"bX c #FFBA67",
+"nX c #FFB476",
+"mX c #FFB379",
+"MX c #FFBA7A",
+"NX c #92F991",
+"BX c #8CF88D",
+"VX c #A6FFA3",
+"CX c #82DEFE",
+"ZX c #9AF3FF",
+"AX c #91F0FF",
+"SX c #A5E9FF",
+"DX c #A8F2FF",
+"FX c #FFBD8D",
+"GX c #FDBD87",
+"HX c #FFC392",
+"JX c #FFC894",
+"KX c #FFCEA5",
+"LX c #FFD3AA",
+"PX c #FFD8AF",
+"IX c #FFDEBD",
+"UX c #FFE2C4",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX. O   YXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  * x a.4   YXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYX& k P.SXDXL.4 . YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX+ p J.CXZXZXZXAXL.6 . YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYX. 5 a.W.!.!.!.CX!.!.!.L.8 . YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYX* f.I.T.Y.Y.Q.Q.Y.Y.Y.Y.d.j . YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYX* y.m.c.c.N.B.A.A.A.B.V.c.f.4 YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYX* y.M.m.x.0.0.0.0.0.q.N.E.S.8   YXYXYXYXYXYX",
+"YXYXYXYXYXYXYX  $ YX* y.l.l.b.i.8.8.w.p.U.Q.Q.n.8   YXYXYXYXYXYX",
+"YXYXYXYXYXYX% ~.{.2 * e.k.k.k.z.p.u.B.I.R.R.S.g.p # YXYXYXYXYXYX",
+"YXYXYXYX$ h oXGXMX.Xd e.k.h.k.k.c.S.C.C.Z.C.z.0.1.F = YXYXYXYXYX",
+"YXYXo g XXxXPXUXIXnXqXs.h.g.g.g.v.c.j.j.j.j.g.0.H.-.L = YXYXYXYX",
+"o s '.hXJXLXLXLXLXKXzXD.w.g.q.g.x.x.g.q.q.g.g.8.K.VX-.U ; YXYXYX",
+"_.yXMXJXJXHXHXFXHXFXGXkXb 9.0.0.i.i.0.0.0.0.7.3.G.NXBX-.U :   YX",
+"XXbXMXmXmXmXmXvXxXvXvXcXjXc 6.0.u.i.8.8.7.4.2.F.>.>.>.,.*.U 0   ",
+"XXlXlXsXsXdXgXgXgXaXpX9X7X0Xv 5.t.t.7.4.z ! &.:.:.:.:.:.;. at .U 0 ",
+".XuXfXuX5X1X,X,X:X:X;X4XhXnXOX9 s.5.l Q Y ` |  .o.O. .} ..X.+.t ",
+" XyXyXyXyX1X%X%X%X,XpXxXFXxX|.% 7 W / ( ..P G G G G J _ @.<.$.e ",
+"{.iXrXrXrXrX,X:X8XhXvXvXxXpX|.$ , ..) ( ( ..L S D Y X.=.<.:.' e ",
+"{.wX6XwX6X6XrXaXgXhXgXhXpX6X[.$ , } ^ ^ ^ ^ ` E [ O.$.$.%.O./ w ",
+"{.5X4X5X5X4XwXpX9X9X9X8X3X4X`.$ , [ ~ ~ ~ ~ / o.{ { | | } / J w ",
+"/.3X,X,X,X2X7X3X2X2X2X2X2X2X(.$ , R H H H H J [ K K P P J G G w ",
+"$ /.<X<X>X-X3X2X-X-X-X-X-X-X/.$ # C L D D D D Y D D D D D D D 0 ",
+"YX$ ~. at X:X=X>X-X$X$X*X$X}.^.1   YX# y I S S S R S S S S S S V > ",
+"YXYX$ h @X*X-X*X#X#X+X^.3       YX  # y I N N I M M N N V e =   ",
+"YXYXYX  a }.-X$X].).s o     YXYXYXYXYXX t A B T n B n u =     YX",
+"YXYXYXYX  a [.(.a $     YXYXYXYXYXYXYXYX. r A A m t >       YXYX",
+"YXYXYXYXYX  3 %     YXYXYXYXYXYXYXYXYXYXYX  q i : X     YXYXYXYX",
+"YXYXYXYXYXYX    YXYXYXYXYXYXYXYXYXYXYXYXYXYX  X     YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/superkaramba-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/superkaramba-16.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/superkaramba-16.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,147 @@
+/* XPM */
+static char * superkaramba_16_xpm[] = {
+"16 16 128 2",
+"  	c None",
+". 	c #0CB8FF",
+"+ 	c #48D1FF",
+"@ 	c #62DBFF",
+"# 	c #67DDFF",
+"$ 	c #58DAFF",
+"% 	c #21C9FF",
+"& 	c #0087FF",
+"* 	c #149AFF",
+"= 	c #7CC9FF",
+"- 	c #8ED1FF",
+"; 	c #8FD2FF",
+"> 	c #90D4FF",
+", 	c #91D5FF",
+"' 	c #8DD5FF",
+") 	c #37BAFF",
+"! 	c #009EFF",
+"~ 	c #005FFF",
+"{ 	c #0066FF",
+"] 	c #5A9EFF",
+"^ 	c #83B7FF",
+"/ 	c #84B9FF",
+"( 	c #84BBFF",
+"_ 	c #85BCFF",
+": 	c #87BFFF",
+"< 	c #8AC2FF",
+"[ 	c #8BC3FF",
+"} 	c #208FFF",
+"| 	c #0D82FF",
+"1 	c #003BFF",
+"2 	c #003EFF",
+"3 	c #6088FF",
+"4 	c #789CFF",
+"5 	c #799EFF",
+"6 	c #7AA0FF",
+"7 	c #7FA5FF",
+"8 	c #89ADFF",
+"9 	c #91B4FF",
+"0 	c #96B9FF",
+"a 	c #568FFF",
+"b 	c #2C76FF",
+"c 	c #000FFF",
+"d 	c #0013FF",
+"e 	c #0016FF",
+"f 	c #2F42FF",
+"g 	c #6E7EFF",
+"h 	c #7182FF",
+"i 	c #7788FF",
+"j 	c #8495FF",
+"k 	c #8FA0FF",
+"l 	c #96A6FD",
+"m 	c #95A7FA",
+"n 	c #4E6EF9",
+"o 	c #4367FC",
+"p 	c #234EFE",
+"q 	c #0017FF",
+"r 	c #0014FF",
+"s 	c #0213FF",
+"t 	c #101EFF",
+"u 	c #4D57FF",
+"v 	c #7E84FF",
+"w 	c #8D92FF",
+"x 	c #9A9EFF",
+"y 	c #A0A3FD",
+"z 	c #9397F7",
+"A 	c #6B70F2",
+"B 	c #5E65F0",
+"C 	c #444CF6",
+"D 	c #2A35FC",
+"E 	c #0039EC",
+"F 	c #023EFF",
+"G 	c #1A4DFF",
+"H 	c #3962FF",
+"I 	c #5275FF",
+"J 	c #6884FF",
+"K 	c #869BFF",
+"L 	c #96A8FF",
+"M 	c #93A4FD",
+"N 	c #798CF7",
+"O 	c #7B8EF0",
+"P 	c #8293EE",
+"Q 	c #455AF4",
+"R 	c #253CFB",
+"S 	c #004ED1",
+"T 	c #106DFD",
+"U 	c #3682FF",
+"V 	c #5A97FF",
+"W 	c #7BAAFF",
+"X 	c #95B9FF",
+"Y 	c #A7C3FF",
+"Z 	c #ADC7FF",
+"` 	c #A6C2FF",
+" .	c #95B5FB",
+"..	c #7CA2F8",
+"+.	c #618EF7",
+"@.	c #4074FA",
+"#.	c #053FE6",
+"$.	c #1081E2",
+"%.	c #46A9FE",
+"&.	c #6EBAFF",
+"*.	c #96CCFF",
+"=.	c #BBDDFF",
+"-.	c #D7EAFF",
+";.	c #D4E7FF",
+">.	c #BBDAFF",
+",.	c #A2CCFF",
+"'.	c #87BDFE",
+").	c #5FA6FE",
+"!.	c #1675F4",
+"~.	c #0043B3",
+"{.	c #1998D5",
+"].	c #5BC8FA",
+"^.	c #97DDFF",
+"/.	c #BFE9FF",
+"(.	c #E0F5FF",
+"_.	c #DCF2FF",
+":.	c #B9E5FF",
+"<.	c #96D7FF",
+"[.	c #6BC5FE",
+"}.	c #299EED",
+"|.	c #045DA9",
+"1.	c #24A3C8",
+"2.	c #53C4E7",
+"3.	c #72D4F3",
+"4.	c #77D6F5",
+"5.	c #5FCEF0",
+"6.	c #3CB5DD",
+"7.	c #0F86B4",
+"                                ",
+"                                ",
+"          . + @ # $ %           ",
+"      & * = - ; > , ' ) !       ",
+"    ~ { ] ^ / ( _ : < [ } |     ",
+"    1 2 3 4 5 6 7 8 9 0 a b     ",
+"  c d e f g h i j k l m n o p   ",
+"  q r s t u v w x y z A B C D   ",
+"  E F G H I J K L M N O P Q R   ",
+"  S T U V W X Y Z `  ...+. at .#.  ",
+"    $.%.&.*.=.-.;.>.,.'.).!.~.  ",
+"      {.].^./.(._.:.<.[.}.|.    ",
+"          1.2.3.4.5.6.7.        ",
+"                                ",
+"                                ",
+"                                "};

Added: people/jriddell/KDE/3.5/kdeutils/debian/icons/superkaramba.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/icons/superkaramba.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/icons/superkaramba.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,517 @@
+/* XPM */
+static char * superkaramba_xpm[] = {
+"32 32 482 2",
+"  	c None",
+". 	c #00C4FF",
+"+ 	c #03C8FF",
+"@ 	c #1DD0FF",
+"# 	c #2ED5FF",
+"$ 	c #32D6FF",
+"% 	c #29D4FF",
+"& 	c #0ECFFF",
+"* 	c #00ACFF",
+"= 	c #00B1FF",
+"- 	c #1BBCFF",
+"; 	c #5ED1FF",
+"> 	c #8EDFFF",
+", 	c #97E2FF",
+"' 	c #98E3FF",
+") 	c #98E4FF",
+"! 	c #97E4FF",
+"~ 	c #79DEFF",
+"{ 	c #40D0FF",
+"] 	c #06C1FF",
+"^ 	c #009AFF",
+"/ 	c #019CFF",
+"( 	c #4CBBFF",
+"_ 	c #8FD5FF",
+": 	c #91D6FF",
+"< 	c #91D7FF",
+"[ 	c #92D7FF",
+"} 	c #92D8FF",
+"| 	c #92D9FF",
+"1 	c #93DAFF",
+"2 	c #94DBFF",
+"3 	c #94DCFF",
+"4 	c #82D7FF",
+"5 	c #24BAFF",
+"6 	c #00AEFF",
+"7 	c #0081FF",
+"8 	c #0085FF",
+"9 	c #0086FF",
+"0 	c #4EADFF",
+"a 	c #8BC9FF",
+"b 	c #8BCAFF",
+"c 	c #8BCBFF",
+"d 	c #8CCCFF",
+"e 	c #8DCDFF",
+"f 	c #8DCEFF",
+"g 	c #8DCFFF",
+"h 	c #8ED0FF",
+"i 	c #8FD1FF",
+"j 	c #8FD2FF",
+"k 	c #8CD1FF",
+"l 	c #2AACFF",
+"m 	c #009CFF",
+"n 	c #009BFF",
+"o 	c #006DFF",
+"p 	c #0070FF",
+"q 	c #0071FF",
+"r 	c #1C82FF",
+"s 	c #84BCFF",
+"t 	c #85BDFF",
+"u 	c #86BEFF",
+"v 	c #86BFFF",
+"w 	c #86C0FF",
+"x 	c #87C0FF",
+"y 	c #87C1FF",
+"z 	c #88C2FF",
+"A 	c #88C3FF",
+"B 	c #89C4FF",
+"C 	c #89C5FF",
+"D 	c #89C6FF",
+"E 	c #8AC7FF",
+"F 	c #8BC8FF",
+"G 	c #83C5FF",
+"H 	c #1190FF",
+"I 	c #048BFF",
+"J 	c #048AFF",
+"K 	c #0057FF",
+"L 	c #005AFF",
+"M 	c #005BFF",
+"N 	c #005DFF",
+"O 	c #478BFF",
+"P 	c #80AFFF",
+"Q 	c #80B0FF",
+"R 	c #80B1FF",
+"S 	c #81B2FF",
+"T 	c #81B3FF",
+"U 	c #82B4FF",
+"V 	c #82B5FF",
+"W 	c #82B6FF",
+"X 	c #83B7FF",
+"Y 	c #84B8FF",
+"Z 	c #86BAFF",
+"` 	c #8ABCFF",
+" .	c #8CBEFF",
+"..	c #8FC0FF",
+"+.	c #90C1FF",
+"@.	c #52A1FF",
+"#.	c #1781FF",
+"$.	c #1481FF",
+"%.	c #0C7CFF",
+"&.	c #0045FF",
+"*.	c #0046FF",
+"=.	c #0047FF",
+"-.	c #0049FF",
+";.	c #5183FF",
+">.	c #7AA2FF",
+",.	c #7BA3FF",
+"'.	c #7BA4FF",
+").	c #7CA5FF",
+"!.	c #7CA6FF",
+"~.	c #7CA7FF",
+"{.	c #7DA8FF",
+"].	c #7EA9FF",
+"^.	c #81ABFF",
+"/.	c #85AFFF",
+"(.	c #8AB2FF",
+"_.	c #8EB6FF",
+":.	c #91B8FF",
+"<.	c #93BAFF",
+"[.	c #94BCFF",
+"}.	c #75A9FF",
+"|.	c #2A7BFF",
+"1.	c #277AFF",
+"2.	c #2077FF",
+"3.	c #002EFF",
+"4.	c #0030FF",
+"5.	c #0032FF",
+"6.	c #0033FF",
+"7.	c #0035FF",
+"8.	c #3F67FF",
+"9.	c #7593FF",
+"0.	c #7594FF",
+"a.	c #7695FF",
+"b.	c #7696FF",
+"c.	c #7797FF",
+"d.	c #7798FF",
+"e.	c #7899FF",
+"f.	c #7C9DFF",
+"g.	c #82A2FF",
+"h.	c #88A7FF",
+"i.	c #8DACFF",
+"j.	c #92B0FF",
+"k.	c #95B3FF",
+"l.	c #98B5FF",
+"m.	c #9AB7FF",
+"n.	c #7DA3FF",
+"o.	c #3C76FF",
+"p.	c #3875FF",
+"q.	c #3372FF",
+"r.	c #1660FF",
+"s.	c #001BFF",
+"t.	c #001CFF",
+"u.	c #001EFF",
+"v.	c #001FFF",
+"w.	c #0020FF",
+"x.	c #1433FF",
+"y.	c #6F83FF",
+"z.	c #7085FF",
+"A.	c #7186FF",
+"B.	c #7187FF",
+"C.	c #7188FF",
+"D.	c #7289FF",
+"E.	c #768DFF",
+"F.	c #7D94FF",
+"G.	c #849AFF",
+"H.	c #8AA0FF",
+"I.	c #90A5FF",
+"J.	c #95AAFF",
+"K.	c #98ADFE",
+"L.	c #99AEFC",
+"M.	c #9AAFFB",
+"N.	c #6A8AFB",
+"O.	c #446DFC",
+"P.	c #446EFD",
+"Q.	c #416DFE",
+"R.	c #2F60FF",
+"S.	c #0006FF",
+"T.	c #0007FF",
+"U.	c #0008FF",
+"V.	c #000AFF",
+"W.	c #000BFF",
+"X.	c #000CFF",
+"Y.	c #000EFF",
+"Z.	c #3A45FF",
+"`.	c #6B75FF",
+" +	c #6E78FF",
+".+	c #707BFF",
+"++	c #737EFF",
+"@+	c #7681FF",
+"#+	c #7D89FF",
+"$+	c #8490FF",
+"%+	c #8A96FF",
+"&+	c #8F9BFF",
+"*+	c #93A0FE",
+"=+	c #95A1FC",
+"-+	c #95A2FA",
+";+	c #95A3F8",
+">+	c #8B9AF7",
+",+	c #4861F7",
+"'+	c #445FF8",
+")+	c #4460F9",
+"!+	c #4461FB",
+"~+	c #4360FD",
+"{+	c #042DFF",
+"]+	c #000DFF",
+"^+	c #0009FF",
+"/+	c #0208FF",
+"(+	c #0B0FFF",
+"_+	c #494CFF",
+":+	c #7678FF",
+"<+	c #7A7DFF",
+"[+	c #7D80FF",
+"}+	c #8385FF",
+"|+	c #8B8DFF",
+"1+	c #9194FF",
+"2+	c #9799FF",
+"3+	c #9B9EFF",
+"4+	c #9C9FFC",
+"5+	c #989CFA",
+"6+	c #9599F7",
+"7+	c #8A8FF5",
+"8+	c #515AF3",
+"9+	c #4550F3",
+"0+	c #4450F4",
+"a+	c #4451F6",
+"b+	c #4452F8",
+"c+	c #4453FA",
+"d+	c #0D22FE",
+"e+	c #0021FF",
+"f+	c #001DFF",
+"g+	c #0721FF",
+"h+	c #142BFF",
+"i+	c #2034FF",
+"j+	c #2B3DFF",
+"k+	c #4A59FF",
+"l+	c #7782FF",
+"m+	c #8A92FF",
+"n+	c #9097FF",
+"o+	c #979EFF",
+"p+	c #9DA3FF",
+"q+	c #A2A7FF",
+"r+	c #A5A9FE",
+"s+	c #A3A7FB",
+"t+	c #9EA1F8",
+"u+	c #8286F5",
+"v+	c #5A5EF2",
+"w+	c #787AED",
+"x+	c #8E8FEC",
+"y+	c #6466EE",
+"z+	c #4447F3",
+"A+	c #4447F6",
+"B+	c #4447F9",
+"C+	c #1317FE",
+"D+	c #002FEC",
+"E+	c #0033FD",
+"F+	c #0132FF",
+"G+	c #0A38FF",
+"H+	c #1A43FF",
+"I+	c #284EFF",
+"J+	c #3658FF",
+"K+	c #4261FF",
+"L+	c #4D69FF",
+"M+	c #556FFF",
+"N+	c #667DFF",
+"O+	c #7F92FF",
+"P+	c #91A0FF",
+"Q+	c #9AA8FF",
+"R+	c #9EABFF",
+"S+	c #9CA8FE",
+"T+	c #8E9CFB",
+"U+	c #7887F8",
+"V+	c #6B7BF5",
+"W+	c #6A79F1",
+"X+	c #A2ABEC",
+"Y+	c #BEC4ED",
+"Z+	c #828DEC",
+"`+	c #4655F2",
+" @	c #4452F5",
+".@	c #4451F8",
+"+@	c #1322FE",
+"@@	c #003BD3",
+"#@	c #0045F5",
+"$@	c #094CFF",
+"%@	c #1A57FF",
+"&@	c #2B62FF",
+"*@	c #3B6DFF",
+"=@	c #4A77FF",
+"-@	c #5780FF",
+";@	c #6488FF",
+">@	c #6E8FFF",
+",@	c #7F9BFF",
+"'@	c #88A1FF",
+")@	c #8EA5FF",
+"!@	c #91A7FF",
+"~@	c #92A8FF",
+"{@	c #8EA3FC",
+"]@	c #859CF9",
+"^@	c #7B93F6",
+"/@	c #708AF3",
+"(@	c #728BF0",
+"_@	c #738BEF",
+":@	c #5571F1",
+"<@	c #4462F4",
+"[@	c #4461F6",
+"}@	c #3C59FA",
+"|@	c #0225FB",
+"1@	c #0048CD",
+"2@	c #0051E8",
+"3@	c #045DFF",
+"4@	c #1567FF",
+"5@	c #2872FF",
+"6@	c #3A7CFF",
+"7@	c #4B87FF",
+"8@	c #5B91FF",
+"9@	c #6B9AFF",
+"0@	c #79A3FF",
+"a@	c #85ABFF",
+"b@	c #8FB1FF",
+"c@	c #97B6FF",
+"d@	c #9FBAFF",
+"e@	c #A3BDFF",
+"f@	c #A4BDFF",
+"g@	c #A2BCFF",
+"h@	c #9EB8FE",
+"i@	c #94B0FB",
+"j@	c #89A8F8",
+"k@	c #7D9EF6",
+"l@	c #7194F5",
+"m@	c #648AF5",
+"n@	c #567FF5",
+"o@	c #4974F7",
+"p@	c #446FF9",
+"q@	c #1348FB",
+"r@	c #002EDF",
+"s@	c #0042A7",
+"t@	c #0056D6",
+"u@	c #0970F7",
+"v@	c #1F7FFF",
+"w@	c #3289FF",
+"x@	c #4693FF",
+"y@	c #589DFF",
+"z@	c #6AA7FF",
+"A@	c #7CB0FF",
+"B@	c #8CB9FF",
+"C@	c #9BC2FF",
+"D@	c #A7C8FF",
+"E@	c #AFCDFF",
+"F@	c #B5D0FF",
+"G@	c #B8D1FF",
+"H@	c #B6D0FF",
+"I@	c #B0CCFF",
+"J@	c #AAC7FF",
+"K@	c #A1C1FE",
+"L@	c #95B9FC",
+"M@	c #88B0FA",
+"N@	c #7BA6F9",
+"O@	c #6D9CF9",
+"P@	c #5F92F9",
+"Q@	c #5187FA",
+"R@	c #2167FD",
+"S@	c #0049F0",
+"T@	c #003CCF",
+"U@	c #005ABD",
+"V@	c #0774E1",
+"W@	c #2592FC",
+"X@	c #3A9DFF",
+"Y@	c #4EA6FF",
+"Z@	c #62AFFF",
+"`@	c #75B8FF",
+" #	c #88C1FF",
+".#	c #9BCAFF",
+"+#	c #ACD3FF",
+"@#	c #BCDBFF",
+"##	c #C8E1FF",
+"$#	c #CEE4FF",
+"%#	c #CEE3FF",
+"&#	c #C7DFFF",
+"*#	c #BDD9FF",
+"=#	c #B2D3FF",
+"-#	c #A7CCFF",
+";#	c #9CC5FF",
+">#	c #8FBDFE",
+",#	c #82B5FD",
+"'#	c #73ACFD",
+")#	c #63A1FD",
+"!#	c #3484FE",
+"~#	c #0563F8",
+"{#	c #004FD9",
+"]#	c #00389F",
+"^#	c #006DC0",
+"/#	c #128EE6",
+"(#	c #3CABFC",
+"_#	c #52B6FF",
+":#	c #67BDFF",
+"<#	c #7BC5FF",
+"[#	c #90CEFF",
+"}#	c #A4D6FF",
+"|#	c #B8DEFF",
+"1#	c #CBE7FF",
+"2#	c #DDEFFF",
+"3#	c #E8F4FF",
+"4#	c #E4F2FF",
+"5#	c #D6EAFF",
+"6#	c #C6E3FF",
+"7#	c #B7DBFF",
+"8#	c #A9D4FF",
+"9#	c #9ACCFF",
+"0#	c #8CC5FF",
+"a#	c #7EBCFF",
+"b#	c #68B1FF",
+"c#	c #3D9AFF",
+"d#	c #1D86FA",
+"e#	c #0366DF",
+"f#	c #0048AE",
+"g#	c #0073B1",
+"h#	c #0F9AE2",
+"i#	c #45BAF9",
+"j#	c #67C9FF",
+"k#	c #7CD0FF",
+"l#	c #90D7FF",
+"m#	c #A5DEFF",
+"n#	c #B9E5FF",
+"o#	c #CEECFF",
+"p#	c #E2F3FF",
+"q#	c #F3FAFF",
+"r#	c #EDF7FF",
+"s#	c #DAF0FF",
+"t#	c #C7E8FF",
+"u#	c #B5E0FF",
+"v#	c #A5D9FF",
+"w#	c #94D1FF",
+"x#	c #81C9FF",
+"y#	c #4BB0FF",
+"z#	c #2F9EF7",
+"A#	c #097CDE",
+"B#	c #0053A5",
+"C#	c #00577C",
+"D#	c #0295CF",
+"E#	c #26B5ED",
+"F#	c #63D0FB",
+"G#	c #8ADEFF",
+"H#	c #9EE3FF",
+"I#	c #B1E8FF",
+"J#	c #C3EDFF",
+"K#	c #D2F1FF",
+"L#	c #DBF4FF",
+"M#	c #D9F3FF",
+"N#	c #CEEFFF",
+"O#	c #BEE9FF",
+"P#	c #ACE3FF",
+"Q#	c #99DCFF",
+"R#	c #85D5FF",
+"S#	c #70CDFF",
+"T#	c #55C0FB",
+"U#	c #24A4EC",
+"V#	c #0383CE",
+"W#	c #006888",
+"X#	c #009BCB",
+"Y#	c #1CBBE9",
+"Z#	c #4FD1F5",
+"`#	c #82E1FB",
+" $	c #ACECFE",
+".$	c #BAEFFF",
+"+$	c #C0F0FF",
+"@$	c #B8EEFF",
+"#$	c #ADEAFF",
+"$$	c #9DE6FE",
+"%$	c #7DDBFB",
+"&$	c #4FC9F5",
+"*$	c #23B2E9",
+"=$	c #0393CF",
+"-$	c #006592",
+";$	c #007399",
+">$	c #0091C1",
+",$	c #05A4D8",
+"'$	c #1DB3E5",
+")$	c #2FBBE9",
+"!$	c #35BFEB",
+"~$	c #30BDEA",
+"{$	c #20B8E6",
+"]$	c #0BACDB",
+"^$	c #0099C6",
+"/$	c #007EA3",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                        . + @ # $ % &                           ",
+"                  * = - ; > , , ' ) ! ~ { ]                     ",
+"                ^ / ( _ : < [ } | 1 1 2 3 4 5 6                 ",
+"            7 8 9 0 a b c d d e f g h h i j k l m n             ",
+"          o p q r s t u v w x y z A B C D E F G H I J           ",
+"        K L M N O P Q R S T U V W X Y Z `  ...+. at .#.$.%.        ",
+"        &.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.        ",
+"      3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.      ",
+"      s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.      ",
+"    S.T.U.V.W.X.Y.Z.`. +.+++ at +#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+    ",
+"    ]+X.W.^+U.T./+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+    ",
+"    e+w.v.f+t.g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+    ",
+"    D+E+6.F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @. at +@    ",
+"    @@#@=.$@%@&@*@=@-@;@>@a.,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@    ",
+"    1 at 2@3 at 4@5 at 6@7 at 8@9 at 0@a at b@c at d@e at f@g at h@i at j@k at l@m at n@o at p@q at r@    ",
+"    s at t@u at v@w at x@y at z@A at B@C at D@E at F@G at H@I at J@K at L@M at N@O at P@Q at R@S at T@    ",
+"      U at V@W at X@Y at Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#    ",
+"        ^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#      ",
+"          g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#:#y#z#A#B#        ",
+"            C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#            ",
+"                W#X#Y#Z#`# $.$+$+$@$#$$$%$&$*$=$-$              ",
+"                      ;$>$,$'$)$!$~${$]$^$/$                    ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdeutils/debian/kcalc.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kcalc.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kcalc.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+debian/tmp/usr/bin/kcalc
+debian/tmp/usr/lib/kde3/kcalc.la
+debian/tmp/usr/lib/kde3/kcalc.so
+debian/tmp/usr/lib/libkdeinit_kcalc.so
+debian/tmp/usr/share/applications/kde/kcalc.desktop
+debian/tmp/usr/share/apps/kcalc/kcalcui.rc
+debian/tmp/usr/share/apps/kconf_update/kcalcrc.upd
+debian/tmp/usr/share/config.kcfg/kcalc.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kcalc/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcalc/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcalc/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kcalc/kcalc_on_Aix.txt
+debian/tmp/usr/share/doc/kde/HTML/en/kcalc/kcalc_on_OSF.txt
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kcalc.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kcalc.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kcalc.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kcalc.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kcalc.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kcalc.svgz
+
+debian/icons/kcalc.xpm		/usr/share/pixmaps
+debian/icons/kcalc-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeutils/debian/kcalc.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kcalc.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kcalc.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+kcalc: no-shlibs-control-file usr/lib/libkdeinit_kcalc.so
+kcalc: postinst-must-call-ldconfig usr/lib/libkdeinit_kcalc.so
+kcalc: postrm-should-call-ldconfig usr/lib/libkdeinit_kcalc.so

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/kcharselect.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kcharselect.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kcharselect.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+debian/tmp/usr/bin/kcharselect
+debian/tmp/usr/lib/kde3/kcharselect_panelapplet.la
+debian/tmp/usr/lib/kde3/kcharselect_panelapplet.so
+debian/tmp/usr/share/applications/kde/KCharSelect.desktop
+debian/tmp/usr/share/apps/kcharselect/kcharselectui.rc
+debian/tmp/usr/share/apps/kconf_update/kcharselect.upd
+debian/tmp/usr/share/apps/kicker/applets/kcharselectapplet.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kcharselect/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcharselect/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcharselect/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kcharselect.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kcharselect.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kcharselect.png
+
+debian/icons/kcharselect.xpm		/usr/share/pixmaps
+debian/icons/kcharselect-16.xpm		/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/kdelirc.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kdelirc.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdelirc.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,49 @@
+debian/tmp/usr/bin/irkick
+debian/tmp/usr/lib/kde3/irkick.la
+debian/tmp/usr/lib/kde3/irkick.so
+debian/tmp/usr/lib/kde3/kcm_kcmlirc.la
+debian/tmp/usr/lib/kde3/kcm_kcmlirc.so
+debian/tmp/usr/lib/libkdeinit_irkick.so
+debian/tmp/usr/share/applications/kde/irkick.desktop
+debian/tmp/usr/share/applications/kde/kcmlirc.desktop
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledblue.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledgreen.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledlightblue.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledlightgreen.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledorange.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledpurple.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledred.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/16x16/actions/ledyellow.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledblue.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledgreen.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledlightblue.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledlightgreen.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledorange.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledred.png
+debian/tmp/usr/share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
+debian/tmp/usr/share/apps/profiles/klauncher.profile.xml
+debian/tmp/usr/share/apps/profiles/konqueror.profile.xml
+debian/tmp/usr/share/apps/profiles/noatun.profile.xml
+debian/tmp/usr/share/apps/profiles/profile.dtd
+debian/tmp/usr/share/apps/remotes/RM-0010.remote.xml
+debian/tmp/usr/share/apps/remotes/cimr100.remote.xml
+debian/tmp/usr/share/apps/remotes/hauppauge.remote.xml
+debian/tmp/usr/share/apps/remotes/remote.dtd
+debian/tmp/usr/share/apps/remotes/sherwood.remote.xml
+debian/tmp/usr/share/apps/remotes/sonytv.remote.xml
+debian/tmp/usr/share/autostart/irkick.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/irkick/common
+debian/tmp/usr/share/doc/kde/HTML/en/irkick/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/irkick/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kcmlirc/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcmlirc/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcmlirc/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/irkick.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/irkick.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/irkick.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/irkick.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/irkick.png

Added: people/jriddell/KDE/3.5/kdeutils/debian/kdelirc.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kdelirc.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdelirc.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+kdelirc: no-shlibs-control-file usr/lib/libkdeinit_irkick.so
+kdelirc: postinst-must-call-ldconfig usr/lib/libkdeinit_irkick.so
+kdelirc: postrm-should-call-ldconfig usr/lib/libkdeinit_irkick.so

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,29 @@
+debian/tmp/usr/include/kde/kmultiformlistbox.h
+debian/tmp/usr/include/kde/kmultiformlistboxentry.h
+debian/tmp/usr/include/kde/kmultiformlistboxfactory.h
+debian/tmp/usr/include/kde/ksim/chart.h
+debian/tmp/usr/include/kde/ksim/common.h
+debian/tmp/usr/include/kde/ksim/ksimconfig.h
+debian/tmp/usr/include/kde/ksim/label.h
+debian/tmp/usr/include/kde/ksim/led.h
+debian/tmp/usr/include/kde/ksim/pluginglobal.h
+debian/tmp/usr/include/kde/ksim/pluginloader.h
+debian/tmp/usr/include/kde/ksim/pluginmodule.h
+debian/tmp/usr/include/kde/ksim/progress.h
+debian/tmp/usr/include/kde/ksim/themeloader.h
+debian/tmp/usr/include/kde/ksim/themetypes.h
+debian/tmp/usr/include/kde/kwidgetstreamer.h
+debian/tmp/usr/lib/libkcmlaptop.la
+debian/tmp/usr/lib/libkcmlaptop.so
+debian/tmp/usr/lib/libkdeinit_ark.la
+debian/tmp/usr/lib/libkdeinit_irkick.la
+debian/tmp/usr/lib/libkdeinit_kcalc.la
+debian/tmp/usr/lib/libkdeinit_kedit.la
+debian/tmp/usr/lib/libkmilo.la
+debian/tmp/usr/lib/libkmilo.so
+debian/tmp/usr/lib/libkregexpeditorcommon.la
+debian/tmp/usr/lib/libkregexpeditorcommon.so
+debian/tmp/usr/lib/libksimcore.la
+debian/tmp/usr/lib/libksimcore.so
+debian/tmp/usr/lib/libkhexeditcommon.la
+debian/tmp/usr/lib/libkhexeditcommon.so

Added: 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.ark	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.ark	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeutils-doc-html-ark
+Title: Ark Handbook
+Author: Matt Johnston, Henrique Pinto
+Abstract: Ark is an archive manager for KDE
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ark/index.html
+Files: /usr/share/doc/kde/HTML/en/ark/*.html
+

Added: 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.irkick	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.irkick	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdeutils-doc-html-irkick
+Title: IRKick: The KDE LIRC Server Handbook
+Author: Gav Wood
+Abstract: KDE LIRC is the infrastructure for the KDE's Infrared Remote
+ Control functionality; IRKick is the server component of that infrastructure.
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/irkick/index.html
+Files: /usr/share/doc/kde/HTML/en/irkick/*.html
+

Added: 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.kcalc	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeutils-doc-html-kcalc
+Title: KCalc Handbook
+Author: Bernd Johannes Wuebben, Pamela Roberts
+Abstract: KCalc is a scientific calculator for KDE
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kcalc/index.html
+Files: /usr/share/doc/kde/HTML/en/kcalc/*.html
+

Added: 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.kcmlirc	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeutils-doc-html-kcmlirc
+Title: KDE Infrared Remote Control Configuration
+Author: Gav Wood
+Abstract: The infrastructure for the KDE's Infrared Remote Control functionality.
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kcmlirc/index.html
+Files: /usr/share/doc/kde/HTML/en/kcmlirc/*.html
+

Added: 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.kdf	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kdf	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kdeutils-doc-html-kdf
+Title: KDiskFree Handbook
+Author: Jonathan Singer, Michael Kropfberger
+Abstract: KDiskFree displays available file devices, along with information about them.
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kdf/index.html
+Files: /usr/share/doc/kde/HTML/en/kdf/*.html
+
+

Added: 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.kedit	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kedit	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeutils-doc-html-kedit
+Title: KEdit Handbook
+Author: Thad McGinnis
+Abstract: KEdit is a simple text editor for KDE
+Section: Editors
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kedit/index.html
+Files: /usr/share/doc/kde/HTML/en/kedit/*.html
+

Added: 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.kfloppy	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+Document: kdeutils-doc-html-kfloppy
+Title: KFloppy Formatter Handbook
+Author: Thad McGinnis
+Abstract: KFloppy Formatter is a utility that provides a straightforward
+ graphical means to format 3.5" and 5.25" floppy disks.
+Section: System
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kfloppy/index.html
+Files: /usr/share/doc/kde/HTML/en/kfloppy/*.html
+
+

Added: 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.kgpg	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeutils-doc-html-kgpg
+Title: KGPG Handbook
+Author: Jean-Baptiste Mardelle
+Abstract: KGPG is a simple graphical interface for GnuPG
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kgpg/index.html
+Files: /usr/share/doc/kde/HTML/en/kgpg/*.html
+

Added: 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.khexedit	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeutils-doc-html-khexedit
+Title: KHexEdit Handbook
+Author: Jonathan Singer
+Abstract: KHexEdit is a hexadecimal editor for KDE
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/khexedit/index.html
+Files: /usr/share/doc/kde/HTML/en/khexedit/*.html
+

Added: 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.kjots	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kjots	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeutils-doc-html-kjots
+Title: KJots Handbook
+Author: Matt Johnston
+Abstract: KJots is a small program which is handy for keeping miscellaneous notes.
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kjots/index.html
+Files: /usr/share/doc/kde/HTML/en/kjots/*.html
+

Added: 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.kregexpeditor	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Document: kdeutils-doc-html-kregexpeditor
+Title: The Regular Expression Editor Manual
+Author: Jesper K. Pedersen
+Abstract: This Handbook describes the Regular Expression Editor widget
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/KRegExpEditor/index.html
+Files: /usr/share/doc/kde/HTML/en/KRegExpEditor/*.html

Added: 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.kwallet	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kdeutils-doc-html-kwallet
+Title: KWallet Handbook
+Author: George Staikos, Lauri Watts
+Abstract: The wallet subsytem provides a convenient and secure way to manage all your passwords.
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kwallet/index.html
+Files: /usr/share/doc/kde/HTML/en/kwallet/*.html
+

Added: people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+Document: kdeutils-doc-html-superkaramba
+Title: Superkaramba API
+Author: Adam Geitgey
+Abstract: This Handbook documents the Superkaramba API
+ SuperKaramba is a tool based on karamba that allows anyone to easily create
+ and run little interactive widgets on a KDE desktop. Widgets are defined in a
+ simple text file and can be augmented with Python code to make them
+ interactive.
+Section: Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/superkaramba/index.html
+Files: /usr/share/doc/kde/HTML/en/superkaramba/*.html

Added: people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdeutils-doc.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/kde/HTML/en/kdeutils*-apidocs/* /usr/share/doc/kde/HTML/en/kdeutils-apidocs

Added: people/jriddell/KDE/3.5/kdeutils/debian/kdf.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kdf.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kdf.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,38 @@
+debian/tmp/usr/bin/kdf
+debian/tmp/usr/bin/kwikdisk
+debian/tmp/usr/lib/kde3/kcm_kdf.la
+debian/tmp/usr/lib/kde3/kcm_kdf.so
+debian/tmp/usr/share/applications/kde/kcmdf.desktop
+debian/tmp/usr/share/applications/kde/kdf.desktop
+debian/tmp/usr/share/applications/kde/kwikdisk.desktop
+debian/tmp/usr/share/apps/kdf/kdfui.rc
+debian/tmp/usr/share/apps/kdf/pics/delete.png
+debian/tmp/usr/share/apps/kdf/pics/tick.png
+debian/tmp/usr/share/doc/kde/HTML/en/kdf/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdf/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdf/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdf/kdf.png
+debian/tmp/usr/share/doc/kde/HTML/en/kdf/kdf_config.png
+debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/blockdevices/common
+debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/blockdevices/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kinfocenter/blockdevices/index.docbook
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kcmdf.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kcmdf.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kcmdf.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kdf.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kwikdisk.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kdf.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kwikdisk.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kdf.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kwikdisk.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kdf.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kwikdisk.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kdf.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kwikdisk.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kdf.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kwikdisk.png
+
+debian/icons/kdf.xpm		/usr/share/pixmaps
+debian/icons/kdf-16.xpm		/usr/share/pixmaps
+debian/icons/kwikdisk.xpm	/usr/share/pixmaps
+debian/icons/kwikdisk-16.xpm	/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/kedit.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kedit.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kedit.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+debian/tmp/usr/bin/kedit
+debian/tmp/usr/lib/kde3/kedit.la
+debian/tmp/usr/lib/kde3/kedit.so
+debian/tmp/usr/lib/libkdeinit_kedit.so
+debian/tmp/usr/share/applications/kde/KEdit.desktop
+debian/tmp/usr/share/apps/kedit/keditui.rc
+debian/tmp/usr/share/config.kcfg/kedit.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kedit/common
+debian/tmp/usr/share/doc/kde/HTML/en/kedit/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kedit/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kedit.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kedit.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kedit.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kedit.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kedit.png
+
+debian/icons/kedit.xpm		/usr/share/pixmaps
+debian/icons/kedit-16.xpm	/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdeutils/debian/kedit.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kedit.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kedit.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+kedit: no-shlibs-control-file usr/lib/libkdeinit_kedit.so
+kedit: postinst-must-call-ldconfig usr/lib/libkdeinit_kedit.so
+kedit: postrm-should-call-ldconfig usr/lib/libkdeinit_kedit.so

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/kedit.mime
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kedit.mime	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kedit.mime	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+application/x-shellscript;	kedit  -caption "Text Editor" %s;	nametemplate=%s.sh;	test=test "$DISPLAY" != "";	priority=7
+text/english;	kedit  -caption "Text Editor" %s;	test=test "$DISPLAY" != "";	priority=7
+text/plain;	kedit  -caption "Text Editor" %s;	nametemplate=%s.txt;	test=test "$DISPLAY" != "";	priority=7
+text/x-c++;	kedit  -caption "Text Editor" %s;	nametemplate=%s.cpp;	test=test "$DISPLAY" != "";	priority=7
+text/x-c++hdr;	kedit  -caption "Text Editor" %s;	nametemplate=%s.hh;	test=test "$DISPLAY" != "";	priority=7
+text/x-c++src;	kedit  -caption "Text Editor" %s;	nametemplate=%s.cpp;	test=test "$DISPLAY" != "";	priority=7
+text/x-c;	kedit  -caption "Text Editor" %s;	nametemplate=%s.c;	test=test "$DISPLAY" != "";	priority=7
+text/x-chdr;	kedit  -caption "Text Editor" %s;	nametemplate=%s.h;	test=test "$DISPLAY" != "";	priority=7
+text/x-csrc;	kedit  -caption "Text Editor" %s;	nametemplate=%s.c;	test=test "$DISPLAY" != "";	priority=7
+text/x-java;	kedit  -caption "Text Editor" %s;	nametemplate=%s.java;	test=test "$DISPLAY" != "";	priority=7
+text/x-makefile;	kedit  -caption "Text Editor" %s;	test=test "$DISPLAY" != "";	priority=7
+text/x-moc;	kedit  -caption "Text Editor" %s;	nametemplate=%s.moc;	test=test "$DISPLAY" != "";	priority=7
+text/x-pascal;	kedit  -caption "Text Editor" %s;	nametemplate=%s.p;	test=test "$DISPLAY" != "";	priority=7
+text/x-tcl;	kedit  -caption "Text Editor" %s;	nametemplate=%s.tcl;	test=test "$DISPLAY" != "";	priority=7
+text/x-tex;	kedit  -caption "Text Editor" %s;	nametemplate=%s.tex;	test=test "$DISPLAY" != "";	priority=7

Added: people/jriddell/KDE/3.5/kdeutils/debian/kfloppy.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kfloppy.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kfloppy.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+debian/tmp/usr/bin/kfloppy
+debian/tmp/usr/share/applications/kde/KFloppy.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/floppy_format.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kfloppy/common
+debian/tmp/usr/share/doc/kde/HTML/en/kfloppy/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kfloppy/index.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kfloppy.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kfloppy.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kfloppy.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kfloppy.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kfloppy.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kfloppy.png
+
+debian/icons/kfloppy.xpm		/usr/share/pixmaps
+debian/icons/kfloppy-16.xpm		/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/kgpg.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kgpg.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kgpg.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,44 @@
+debian/tmp/usr/bin/kgpg
+debian/tmp/usr/share/applications/kde/kgpg.desktop
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key3.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key4.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_edit.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_export.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_gen.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_identity.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_import.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_info.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_photo.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_show.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_sign.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_term.png
+debian/tmp/usr/share/apps/kgpg/kgpg.rc
+debian/tmp/usr/share/apps/kgpg/listkeys.rc
+debian/tmp/usr/share/apps/kgpg/pics/kgpg_anim.gif
+debian/tmp/usr/share/apps/kgpg/pics/kgpg_blank.png
+debian/tmp/usr/share/apps/kgpg/pics/kgpg_docked.gif
+debian/tmp/usr/share/apps/kgpg/pics/kgpg_docked.png
+debian/tmp/usr/share/apps/kgpg/pics/kgpg_fill.png
+debian/tmp/usr/share/apps/kgpg/tips
+debian/tmp/usr/share/apps/konqueror/servicemenus/encryptfile.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/encryptfolder.desktop
+debian/tmp/usr/share/autostart/kgpg.desktop
+debian/tmp/usr/share/config.kcfg/kgpg.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kgpg/common
+debian/tmp/usr/share/doc/kde/HTML/en/kgpg/editor.png
+debian/tmp/usr/share/doc/kde/HTML/en/kgpg/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kgpg/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kgpg/keygen.png
+debian/tmp/usr/share/doc/kde/HTML/en/kgpg/keymanage.png
+debian/tmp/usr/share/doc/kde/HTML/en/kgpg/keys.png
+debian/tmp/usr/share/doc/kde/HTML/en/kgpg/kicker.png
+debian/tmp/usr/share/doc/kde/HTML/en/kgpg/options.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kgpg.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kgpg.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kgpg.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kgpg.png
+
+debian/icons/kgpg.xpm		/usr/share/pixmaps
+debian/icons/kgpg-16.xpm	/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/khexedit.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/khexedit.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/khexedit.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,25 @@
+debian/tmp/usr/bin/khexedit
+debian/tmp/usr/lib/kde3/libkbyteseditwidget.la
+debian/tmp/usr/lib/kde3/libkbyteseditwidget.so
+debian/tmp/usr/lib/kde3/libkhexedit2part.la
+debian/tmp/usr/lib/kde3/libkhexedit2part.so
+debian/tmp/usr/lib/libkhexeditcommon.so.0
+debian/tmp/usr/lib/libkhexeditcommon.so.0.0.0
+debian/tmp/usr/share/applications/kde/khexedit.desktop
+debian/tmp/usr/share/apps/khexedit/khexeditui.rc
+debian/tmp/usr/share/apps/khexedit/pics/hexdrag.png
+debian/tmp/usr/share/apps/khexedit/pics/hexmask.png
+debian/tmp/usr/share/apps/khexedit/pics/hexwrite.png
+debian/tmp/usr/share/apps/khexedit2part/khexedit2partui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/khexedit/common
+debian/tmp/usr/share/doc/kde/HTML/en/khexedit/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/khexedit/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khexedit/khexedit1.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/khexedit.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/khexedit.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/khexedit.png
+debian/tmp/usr/share/services/kbyteseditwidget.desktop
+debian/tmp/usr/share/services/khexedit2part.desktop
+
+debian/icons/khexedit.xpm		/usr/share/pixmaps
+debian/icons/khexedit-16.xpm		/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/kjots.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kjots.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kjots.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,16 @@
+debian/tmp/usr/bin/kjots
+debian/tmp/usr/share/applications/kde/Kjots.desktop
+debian/tmp/usr/share/apps/kjots/kjotsui.rc
+debian/tmp/usr/share/apps/kjots/pics/filedel.png
+debian/tmp/usr/share/config.kcfg/kjots.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kjots/common
+debian/tmp/usr/share/doc/kde/HTML/en/kjots/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kjots/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kjots.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kjots.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kjots.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kjots.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kjots.png
+
+debian/icons/kjots.xpm		/usr/share/pixmaps
+debian/icons/kjots-16.xpm	/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/klaptopdaemon.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/klaptopdaemon.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/klaptopdaemon.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,48 @@
+debian/tmp/usr/bin/klaptop_acpi_helper
+debian/tmp/usr/bin/klaptop_check
+debian/tmp/usr/lib/kde3/kcm_laptop.la
+debian/tmp/usr/lib/kde3/kcm_laptop.so
+debian/tmp/usr/lib/kde3/kded_klaptopdaemon.la
+debian/tmp/usr/lib/kde3/kded_klaptopdaemon.so
+debian/tmp/usr/lib/libkcmlaptop.so.0
+debian/tmp/usr/lib/libkcmlaptop.so.0.0.0
+debian/tmp/usr/share/applications/kde/laptop.desktop
+debian/tmp/usr/share/applications/kde/pcmcia.desktop
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nobattery.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_power.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_power.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_nocharge.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_power.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_charge.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nobattery.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png
+debian/tmp/usr/share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/laptop/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/laptop/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/laptop/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/powerctrl/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/powerctrl/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/powerctrl/index.docbook
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/laptop_battery.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/laptop_battery.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/laptop_battery.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/laptop_pcmcia.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/laptop_battery.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/laptop_battery.png
+debian/tmp/usr/share/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+debian/tmp/usr/share/services/kded/klaptopdaemon.desktop

Added: people/jriddell/KDE/3.5/kdeutils/debian/kmilo.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kmilo.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kmilo.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,27 @@
+debian/tmp/usr/lib/kde3/kcm_kvaio.la
+debian/tmp/usr/lib/kde3/kcm_kvaio.so
+debian/tmp/usr/lib/kde3/kcm_thinkpad.la
+debian/tmp/usr/lib/kde3/kcm_thinkpad.so
+debian/tmp/usr/lib/kde3/kded_kmilod.la
+debian/tmp/usr/lib/kde3/kded_kmilod.so
+debian/tmp/usr/lib/kde3/kmilo_asus.la
+debian/tmp/usr/lib/kde3/kmilo_asus.so
+debian/tmp/usr/lib/kde3/kmilo_delli8k.la
+debian/tmp/usr/lib/kde3/kmilo_delli8k.so
+debian/tmp/usr/lib/kde3/kmilo_generic.la
+debian/tmp/usr/lib/kde3/kmilo_generic.so
+debian/tmp/usr/lib/kde3/kmilo_kvaio.la
+debian/tmp/usr/lib/kde3/kmilo_kvaio.so
+debian/tmp/usr/lib/kde3/kmilo_thinkpad.la
+debian/tmp/usr/lib/kde3/kmilo_thinkpad.so
+debian/tmp/usr/lib/libkmilo.so.1
+debian/tmp/usr/lib/libkmilo.so.1.0.0
+debian/tmp/usr/share/applications/kde/kvaio.desktop
+debian/tmp/usr/share/applications/kde/thinkpad.desktop
+debian/tmp/usr/share/services/kded/kmilod.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_asus.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_delli8k.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_generic.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_kvaio.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_thinkpad.desktop
+debian/tmp/usr/share/servicetypes/kmilo/kmilopluginsvc.desktop

Added: people/jriddell/KDE/3.5/kdeutils/debian/kmilo.install.powerpc
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kmilo.install.powerpc	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kmilo.install.powerpc	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,30 @@
+debian/tmp/usr/lib/kde3/kcm_kvaio.la
+debian/tmp/usr/lib/kde3/kcm_kvaio.so
+debian/tmp/usr/lib/kde3/kcm_thinkpad.la
+debian/tmp/usr/lib/kde3/kcm_thinkpad.so
+debian/tmp/usr/lib/kde3/kded_kmilod.la
+debian/tmp/usr/lib/kde3/kded_kmilod.so
+debian/tmp/usr/lib/kde3/kmilo_asus.la
+debian/tmp/usr/lib/kde3/kmilo_asus.so
+debian/tmp/usr/lib/kde3/kmilo_delli8k.la
+debian/tmp/usr/lib/kde3/kmilo_delli8k.so
+debian/tmp/usr/lib/kde3/kmilo_generic.la
+debian/tmp/usr/lib/kde3/kmilo_generic.so
+debian/tmp/usr/lib/kde3/kmilo_kvaio.la
+debian/tmp/usr/lib/kde3/kmilo_kvaio.so
+debian/tmp/usr/lib/kde3/kmilo_powerbook.la
+debian/tmp/usr/lib/kde3/kmilo_powerbook.so
+debian/tmp/usr/lib/kde3/kmilo_thinkpad.la
+debian/tmp/usr/lib/kde3/kmilo_thinkpad.so
+debian/tmp/usr/lib/libkmilo.so.1
+debian/tmp/usr/lib/libkmilo.so.1.0.0
+debian/tmp/usr/share/applications/kde/kvaio.desktop
+debian/tmp/usr/share/applications/kde/thinkpad.desktop
+debian/tmp/usr/share/services/kded/kmilod.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_asus.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_delli8k.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_generic.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_kvaio.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_powerbook.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_thinkpad.desktop
+debian/tmp/usr/share/servicetypes/kmilo/kmilopluginsvc.desktop

Added: people/jriddell/KDE/3.5/kdeutils/debian/kregexpeditor.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kregexpeditor.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kregexpeditor.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,60 @@
+debian/tmp/usr/bin/kregexpeditor
+debian/tmp/usr/lib/kde3/libkregexpeditorgui.la
+debian/tmp/usr/lib/kde3/libkregexpeditorgui.so
+debian/tmp/usr/lib/libkregexpeditorcommon.so.1
+debian/tmp/usr/lib/libkregexpeditorcommon.so.1.0.0
+debian/tmp/usr/share/applications/kde/kregexpeditor.desktop
+debian/tmp/usr/share/apps/kregexpeditor/pics/altn.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/anychar.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/autoverify.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/begline.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/characters.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/compound.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/endline.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/error.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/neglookahead.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/nonwordboundary.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/poslookahead.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/repeat.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/select.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/text.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/verify.png
+debian/tmp/usr/share/apps/kregexpeditor/pics/wordboundary.png
+debian/tmp/usr/share/apps/kregexpeditor/predefined/general/anything.regexp
+debian/tmp/usr/share/apps/kregexpeditor/predefined/general/spaces.regexp
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/altn.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/altntool.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/anychar.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/anychartool.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/begline.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/boundarytools.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/characters.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/charactertool.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/common
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/compound.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/compoundtool.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/endline.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/linestartendtool.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/lookaheadtools.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/neglookahead.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/nonwordboundary.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/poslookahead.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/repeat.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/repeattool.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/select.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/text.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/texttool.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/theEditor.png
+debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/wordboundary.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kregexpeditor.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kregexpeditor.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kregexpeditor.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kregexpeditor.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kregexpeditor.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kregexpeditor.png
+debian/tmp/usr/share/services/kregexpeditorgui.desktop
+
+debian/icons/kregexpeditor.xpm		/usr/share/pixmaps
+debian/icons/kregexpeditor-16.xpm	/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/ksim.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/ksim.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/ksim.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,40 @@
+debian/tmp/etc/kde3/ksim_panelextensionrc
+debian/tmp/usr/lib/kde3/ksim_*.la
+debian/tmp/usr/lib/kde3/ksim_*.so
+debian/tmp/usr/lib/libksimcore.so.1
+debian/tmp/usr/lib/libksimcore.so.1.0.0
+debian/tmp/usr/share/applications/kde/ksim.desktop
+debian/tmp/usr/share/apps/kicker/extensions/ksim.desktop
+debian/tmp/usr/share/apps/ksim/monitors/DFree.desktop
+debian/tmp/usr/share/apps/ksim/monitors/Lm_sensors.desktop
+debian/tmp/usr/share/apps/ksim/monitors/Net.desktop
+debian/tmp/usr/share/apps/ksim/monitors/Snmp.desktop
+debian/tmp/usr/share/apps/ksim/monitors/cpu.desktop
+debian/tmp/usr/share/apps/ksim/monitors/disk.desktop
+debian/tmp/usr/share/apps/ksim/pics/clock.png
+debian/tmp/usr/share/apps/ksim/pics/uptime.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/bg_chart.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/bg_grid.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/bg_meter.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/bg_panel.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/frame_bottom.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/frame_left.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/frame_right.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/frame_top.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/gkrellmrc
+debian/tmp/usr/share/apps/ksim/themes/ksim/gkrellmrc_ksim
+debian/tmp/usr/share/apps/ksim/themes/ksim/host/bg_meter.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/krell_meter.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/krell_panel.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/krell_slider.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/mail/decal_mail.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/mail/krell_mail.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
+debian/tmp/usr/share/apps/ksim/themes/ksim/net/decal_net_leds.png
+debian/tmp/usr/share/doc/kde/HTML/en/ksim/common
+debian/tmp/usr/share/doc/kde/HTML/en/ksim/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/ksim/index.docbook
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/ksim.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/devices/ksim_cpu.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/ksim.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/ksim.png

Added: people/jriddell/KDE/3.5/kdeutils/debian/ksim.preinst
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/ksim.preinst	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/ksim.preinst	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,44 @@
+#! /bin/sh
+# preinst script for ksim
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        if [ "$1" = "upgrade" ]
+        then
+	    # Debian testing (Sarge) files
+	    rm /etc/kde3/ksimrc > /dev/null 2>&1 || true
+        fi
+    ;;
+
+    abort-upgrade)
+
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: people/jriddell/KDE/3.5/kdeutils/debian/ktimer.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/ktimer.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/ktimer.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+debian/tmp/usr/bin/ktimer
+debian/tmp/usr/share/applications/kde/ktimer.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/ktimer/common
+debian/tmp/usr/share/doc/kde/HTML/en/ktimer/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/ktimer/index.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/ktimer.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/ktimer.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/ktimer.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/ktimer.png
+
+debian/icons/ktimer.xpm		/usr/share/pixmaps
+debian/icons/ktimer-16.xpm	/usr/share/pixmaps

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

Added: people/jriddell/KDE/3.5/kdeutils/debian/kwalletmanager.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/kwalletmanager.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/kwalletmanager.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,31 @@
+debian/tmp/usr/bin/kwalletmanager
+debian/tmp/usr/lib/kde3/kcm_kwallet.la
+debian/tmp/usr/lib/kde3/kcm_kwallet.so
+debian/tmp/usr/share/applications/kde/kwalletconfig.desktop
+debian/tmp/usr/share/applications/kde/kwalletmanager.desktop
+debian/tmp/usr/share/applications/kde/kwalletmanager-kwalletd.desktop
+debian/tmp/usr/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
+debian/tmp/usr/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
+debian/tmp/usr/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
+debian/tmp/usr/share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
+debian/tmp/usr/share/apps/kwalletmanager/kwalleteditor.rc
+debian/tmp/usr/share/apps/kwalletmanager/kwalletmanager.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/common
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_closed.png
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/cr22-action-wallet_open.png
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/edit1.png
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/edit2.png
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/edit3.png
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/kwalletmanager.png
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/password1.png
+debian/tmp/usr/share/doc/kde/HTML/en/kwallet/password2.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kwalletmanager.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kwalletmanager.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kwalletmanager.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kwalletmanager.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kwalletmanager.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kwalletmanager.png
+debian/tmp/usr/share/services/kwallet_config.desktop
+debian/tmp/usr/share/services/kwalletmanager_show.desktop

Added: people/jriddell/KDE/3.5/kdeutils/debian/man/kcharselect.1
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/man/kcharselect.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/man/kcharselect.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,253 @@
+.lf 1 info/kdeutils.kcharselect.1
+.TH KCHARSELECT 1 "May 2003" KDE "KDE Application"
+.SH NAME
+kcharselect \- KDE Character Selector
+.SH SYNOPSIS
+.B kcharselect
+[\fIQt-options\fR] [\fIKDE-options\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B KCharSelect
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+With the
+.B kcharselect
+utility you can view which characters that exist in any font installed on the system, in any
+character table, and also assemble a string of characters by klicking on them with the mouse
+from a palette of characters, and export it to the clip board in various formats.
+It is good too locate which characters are actually available in a font and to use rare or national characters which might not be easily available on the keyboard.
+.P
+This program is part of the official KDE utils module.
+.SH OPTIONS
+.SS "General Options"
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v\fR, \fB\-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.lf 1 info/kdeqtoptions
+.SS "KDE options"
+.TP 12
+.BI \-\-caption \ caption
+Use \fIcaption\fP as name in the titlebar.
+.TP
+.BI \-\-icon \ icon
+Use \fIicon\fP as the application icon. \fIicon\fP is the name of the
+icon, which can either be an absolute filename path, or otherwise the
+icon is sought for in places according to the normal KDE rules.
+.TP
+.BI \-\-miniicon \ icon
+Use \fIicon\fP as the icon in the titlebar. \fIicon\fP is the filename
+of the icon, according to the same rules as for the \-\-icon parameter.
+.TP
+.BI \-\-config \ filename
+Use an alternative configuration file, instead of the default, which
+is normally located in
+.I /usr/share/config
+or in
+.RB $ KDEHOME\fI/share/config
+.TP
+.BI \-\-dcopserver \ server
+Set the address of the DCOP server to attach to.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps. This option has the same
+effect as definiting the environment variable KDE_DEBUG.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.BI \-\-style \ style
+sets the application GUI style.
+.TP
+.BI \-\-geometry \ geometry
+sets the client geometry of the main widget.
+The geometry parameter follows the normal X convention for geometry,
+which is on the form:
+.RS
+.IP
+[\fIwidth\fBx\fIheight\fR][{\fB+-\fR}\fIxpos\fR{\fB+-\fR}\fIypos\fR]
+.P
+Where \fIwidth\fR and \fIheight\fR gives the desired minimum width and
+height, of the main application window. Both in pixels. A value of 0
+specifies the default size. The optional \fIxpos\fR and \fIypos\fR
+specifies the x,y-position that which is desired for the application
+window. Specifying negative values for x or y implies that the x or y
+position is to be measured from the left or bottom screen edge,
+instead of as in the normal case, with positive values, from the left
+and top edges. 
+.RE
+.SS "Qt options"
+.TP 12
+.BI \-\-display \ displayname
+Use the X-server display \fIdisplayname\fP.
+.TP
+.BI \-\-session \ sessionId
+Restore the application for the given \fIsessionId\fP.
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display.
+.TP
+.BI \-\-ncols \ count
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+Running under a debugger can cause an implicit
+.B \-nograb, use \fB\-dograb\fR to override.
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging.
+.TP
+.BI "\-\-fn\fR, \fP\-\-font" \ fontname
+Defines the default application font. The \fIfontname\fP should be in
+the X logical font name description format XLFD. For a full description of
+the format see
+.I /usr/X11R6/lib/X11/doc/xlfd.TXT
+Note that the application might override the font specified with
+its own font.
+.TP
+.BI "-\-bg\fR, \fB\-\-background"  \ color
+Sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
+Sets the default foreground color.
+.TP
+.BI \-\-btn\fR, \fB\-\-button \ color
+Sets the default button color.
+.TP
+.BI \-\-name \ name
+Sets the application name.
+.TP
+.BI \-\-title \ title
+Sets the application title. This option might, or might not appear
+in the title bar caption, depending on the application. To change the caption, use the 
+.B \-\-caption
+option instead. 
+.TP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.BI \-\-inputstyle \ inputstyle
+Sets XIM (X Input Method) input style. Possible
+values are 
+.BR onthespot ", " overthespot ", " offthespot and root .
+.TP
+.BI \-\-im " XIM-server"
+Set XIM server.
+.TP
+.B \-\-noxim
+Disable XIM.
+.TP
+.B \-\-reverse
+Mirror reverses the whole layout of widgets. This means that menus
+will go in the opposite direction, the scroll bar will be on the
+opposite side, etc. For a normal western layout that means that menus
+and tool bars will go from the right edge to the left, the vertical
+scroll bar will be on the left side and so on.
+
+.lf 48 info/kdeutils.kcharselect.1
+.SH ENVIRONMENT
+.lf 1 info/kdeenviron
+.SS "standard KDE environment variables"
+.IP KDE_LANG
+Language locale setting to use. This option makes it possible to set
+another language environment for a program than what is the default. The
+correct language pack for this language has to be installed for this option
+to work. The default language when there is none set is en_US. When
+deciding upon a language, the following resources are looked up, in
+order: KDE_LANG, configuration file, LC_CTYPE, LC_MESSAGES, LC_ALL,
+LANG.
+.IP KDE_UTF8_FILENAMES
+Assume that all filenames are in UTF-8 format regardless of the
+current language setting. Otherwise the filename format is defined by
+the language.
+.IP KDE_MULTIHEAD
+If this variable has the value
+.B true
+multihead multiple display mode is enabled. The KDE display will be
+shared over more than one screen.
+.IP DISPLAY
+Specifies the X display to run KDE on.
+.IP KDESYCOCA
+Specifies and alternative path for the 
+.I ksycoca
+KDE system configuration cache file.
+The default path is
+/tmp/kde-$USER/ksycoca
+.IP DCOPSERVER
+Specifies an alternative path for the DCOP server file. The default
+file is
+$HOME/.DCOPserver_\fIhostname\fP_\fIdisplayname\fP
+.IP SESSION_MANAGER
+The session manager to use. This option is set automatically by KDE
+and is a network path to the session manager socket.
+.IP HOME
+Path to the home directory for the current user. 
+.IP KDEHOME
+The KDE per-user setting directory. Default if not specified is
+.I $HOME/.kde
+.lf 50 info/kdeutils.kcharselect.1
+.SH FILES
+.TP
+.I $HOME/.kde/share/config/kcharselectrc
+configuration file.
+.SH AUTHOR
+KCharSelect was written by
+.nh
+.ad l
+Reginald Stadlbauer <reggie at kde.org>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+.ad l
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+The full documentation for
+.B KCharSelect
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kcharselect
+.PP
+should give you access to the complete manual.
+.P
+Alternatively the manual can be browsed in
+.B konqueror
+giving it the URL help:/kcharselect
+

Added: people/jriddell/KDE/3.5/kdeutils/debian/man/kgpg.1
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/man/kgpg.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/man/kgpg.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,187 @@
+.TH KGPG "1" "December 2002" "KDE" "KDE Application"
+.SH NAME
+kgpg \- a KDE frontend for GNU Privacy Guard (GnuPG)
+.SH SYNOPSIS
+.B kgpg
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR] \fIfile\fR
+.SH DESCRIPTION
+This manual page documents briefly the
+.B Kgpg
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B Kgpg
+is a simple graphical interface for gpg (http://gnupg.org).
+Basically, It allows you to encrypt and decrypt files or messages, and to manage your keys. 
+.PP
+Kgpg can be used in different ways: 
+.IP "1 -" 4
+Open Kgpg. You will see an editor. Just type or paste your text in the editor. You can then easily encrypt/decrypt the text. 
+.IP "2 -" 4
+On your Desktop or from a Konqueror window, right click on a file and you will see an encrypt file entry in the menu. just select it to encrypt the file. In the same way, simply left click on an encrypted file to decrypt it. 
+.IP "3 -" 4
+If you enable Kgpg's Klipper action, as soon as you copy an encrypted text to the clipboard, a popup menu will ask you if you want to decrypt it. 
+.SH OPTIONS
+.TP
+.B \-e
+encrypt file
+.TP
+.B \-s
+show encrypted file
+.TP
+.B \-S
+sign file
+.TP
+.B \-V
+verify signature
+.SS "Arguments:"
+.TP 12
+file
+file to open
+.SS "Generic options:"
+.TP 12
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v\fR, \fB\-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.SS "Qt options"
+.TP 12
+.BI \-\-display \ displayname
+Use the X-server display \fIdisplayname\fP.
+.TP
+.BI \-\-session \ sessionId
+Restore the application for the given \fIsessionId\fP.
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display.
+.TP
+.BI \-\-ncols \ count
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+running under a debugger can cause an implicit
+.B \-nograb, use \fB\-dograb\fR to override.
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging.
+.TP
+.BI "\-\-fn\fR, \fP\-\-font" \ fontname
+defines the application font.
+.TP
+.BI "-\-bg\fR, \fB\-\-background"  \ color
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
+sets the default foreground color.
+.TP
+.BI \-\-btn\fR, \fB\-\-button \ color
+sets the default button color.
+.TP
+.BI \-\-name \ name
+sets the application name.
+.TP
+.BI \-\-title \ title
+sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.BI \-\-inputstyle \ inputstyle
+sets XIM (X Input Method) input style. Possible
+values are 
+.BR onthespot ", " overthespot ", " offthespot and root .
+.TP
+.BI \-\-im " XIM-server"
+set XIM server.
+.TP
+.B \-\-noxim
+disable XIM.
+.TP
+.B \-\-reverse
+mirrors the whole layout of widgets.
+.SS "KDE options"
+.TP 12
+.BI \-\-caption \ caption
+Use \fIcaption\fP as name in the titlebar.
+.TP
+.BI \-\-icon \ icon
+Use \fIicon\fP as the application icon.
+.TP
+.BI \-\-miniicon \ icon
+Use \fIicon\fP as the icon in the titlebar.
+.TP
+.BI \-\-config \ filename
+Use alternative configuration file.
+.TP
+.BI \-\-dcopserver \ server
+Use the DCOP Server specified by \fIserver\fP.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.BI \-\-style \ style
+sets the application GUI style.
+.TP
+.BI \-\-geometry \ geometry
+sets the client geometry of the main widget.
+.SH AUTHOR
+kgpg was written by
+.nh
+.ad l
+y0k0 <bj at altern.org>,
+.br
+.hy
+This manual page was prepared by
+.nh
+.ad l
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+The full documentation for
+.B Kgpg
+is maintained as a docbook manual.  If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/kgpg
+.PP
+should give you access to the complete manual.
+.P
+Alternatively the manual can be browsed in
+.B konqueror
+giving it the URL help:/kgpg
+

Added: people/jriddell/KDE/3.5/kdeutils/debian/man/superkaramba.1
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/man/superkaramba.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/man/superkaramba.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,51 @@
+.TH SUPERKARAMBA 1 "juli  27, 2003"
+.SH NAME
+superkaramba \- a program based on karamba improving the eyecandy of KDE.
+.SH SYNOPSIS
+.B superkaramba
+[\fIQt-options\fR] [\fIKDE-options\fR] \fIfile\fR
+.SH DESCRIPTION
+This manual page documents briefly the
+.B superkaramba
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+Instead, it has documentation in the GNU Info format; see below.
+.PP
+.B Superkaramba
+is a tool based on karamba that allows anyone to easily create and run little
+interactive widgets on a KDE desktop. Widgets are defined in a simple text file
+and can be augmented with Python code to make them interactive.
+.SH OPTIONS
+A summary of options are included below.
+.TP
+.B \-\-help
+Show summary of options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-\-license
+Show license information
+.TP
+.B file
+A required argument 'file'
+.SH AUTHOR
+.B Superkaramba
+was written by Adam Geitgey <adam at rootnode.org> and Hans Karlsson
+<d98hk at efd.lth.se>.
+.PP
+This manual page was written by Jean-Michel Kelbert <kelbert at debian.org>,
+for the Debian project (but may be used by others).

Added: people/jriddell/KDE/3.5/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/patches/10_klaptopdaemon_checksum.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,34 @@
+--- kde.orig/klaptopdaemon/apm.cpp
++++ kde.new/klaptopdaemon/apm.cpp
+@@ -187,14 +187,6 @@
+ 	unsigned long len, crc;
+ 	QString helper = KStandardDirs::findExe("klaptop_acpi_helper");
+ 	checkcrc(helper.latin1(), len, crc);
+-	if (len != file_len || crc != file_crc) {
+-		QString str(i18n("The %1 application does not seem to have "
+-					"the same size or checksum as when it was compiled we do NOT recommend "
+-					"you proceed with making it setuid-root without further investigation").arg(helper));
+-		int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless"));
+-		if (rc != KMessageBox::Continue) 
+-			return;
+-	}
+ 
+ 	QString kdesu = KStandardDirs::findExe("kdesu");
+ 	if (!kdesu.isEmpty()) {
+--- kde.orig/klaptopdaemon/acpi.cpp
++++ kde.new/klaptopdaemon/acpi.cpp
+@@ -165,14 +165,6 @@
+ 	unsigned long len, crc;
+ 	QString helper = KStandardDirs::findExe("klaptop_acpi_helper");
+ 	checkcrc(QFile::encodeName(helper), len, crc);
+-	if (len != file_len || crc != file_crc) {
+-		QString str(i18n("The %1 application does not seem to have "
+-					"the same size or checksum as when it was compiled we do NOT recommend "
+-					"you proceed with making it setuid-root without further investigation").arg(helper));
+-		int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless"));
+-		if (rc != KMessageBox::Continue) 
+-			return;
+-	}
+ 
+ 	QString kdesu = KStandardDirs::findExe("kdesu");
+ 	if (!kdesu.isEmpty()) {

Added: people/jriddell/KDE/3.5/kdeutils/debian/patches/11_floppy_nodes.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/11_floppy_nodes.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/patches/11_floppy_nodes.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,27 @@
+--- kde.orig/kfloppy/format.cpp
++++ kde.patched/kfloppy/format.cpp
+@@ -165,15 +165,15 @@
+ //
+ #ifdef ANY_LINUX
+ 
+-const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/floppy/0u1440", "/dev/fd0h1440", "/dev/fd0H1440", 0L } ;
+-const char *fd0D720[] = { "/dev/fd0u720", "/dev/floppy/0u720", "/dev/fd0D720", "/dev/fd0h720", 0L };
+-const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/floppy/0h1200", 0L };
+-const char *fd0h360[] = { "/dev/fd0u360", "/dev/floppy/0u360", "/dev/fd0h360", "/dev/fd0d360", 0L };
+-
+-const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/floppy/1u1440","/dev/fd1h1440", "/dev/fd1H1440", 0L } ;
+-const char *fd1D720[] = { "/dev/fd1u720", "/dev/floppy/1u720", "/dev/fd1D720", "/dev/fd1h720", 0L };
+-const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/floppy/1h1200", 0L };
+-const char *fd1h360[] = { "/dev/fd1u360", "/dev/floppy/1u360","/dev/fd1h360", "/dev/fd1d360", 0L };
++const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/fd0h1440", "/dev/fd0", 0L } ;
++const char *fd0D720[] = { "/dev/fd0u720", "/dev/fd0h720", "/dev/fd0", 0L };
++const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/fd0", 0L };
++const char *fd0h360[] = { "/dev/fd0u360", "/dev/fd0h360", "/dev/fd0d360", "/dev/fd0", 0L };
++
++const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/fd1h1440", "/dev/fd1", 0L } ;
++const char *fd1D720[] = { "/dev/fd1u720", "/dev/fd1h720", "/dev/fd1", 0L };
++const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/fd1", 0L };
++const char *fd1h360[] = { "/dev/fd1u360", "/dev/fd1h360", "/dev/fd1d360", "/dev/fd1", 0L };
+ 
+ const char *fd0auto[] = { "/dev/fd0", 0L };
+ const char *fd1auto[] = { "/dev/fd1", 0L };

Added: people/jriddell/KDE/3.5/kdeutils/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/patches/common/07_disable-visibility.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/common/07_disable-visibility.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/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/kdeutils/debian/patches/kubuntu_01_kmenu_tidy.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_01_kmenu_tidy.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_01_kmenu_tidy.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+--- kdeutils/kcharselect/KCharSelect.desktop	2005-03-17 00:37:01.991143032 +0000
++++ kdeutils/kcharselect/KCharSelect.desktop	2005-03-17 00:37:11.258734144 +0000
+@@ -88,4 +88,4 @@
+ Name[zh_TW]=KDE å—å…ƒé¸æ“‡
+ X-KDE-StartupNotify=true
+ X-DCOP-ServiceType=Multi
+-Categories=Qt;KDE;Utility;X-KDE-More;
++Categories=Qt;KDE;Utility;

Added: people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_02_kregexpeditor_kmenu_entry_tidy.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_02_kregexpeditor_kmenu_entry_tidy.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_02_kregexpeditor_kmenu_entry_tidy.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+--- kdeutils/kregexpeditor/kregexpeditor.desktop	2005-03-17 02:21:23.051317208 +0000
++++ kdeutils/kregexpeditor/kregexpeditor.desktop	2005-03-17 02:21:33.604712848 +0000
+@@ -60,5 +60,5 @@
+ Terminal=false
+ Type=Application
+ X-KDE-StartupNotify=true
+-Categories=Qt;KDE;Utility;X-KDE-More;
++Categories=Qt;KDE;Utility;
+ Icon=kregexpeditor

Added: people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_04_use_pmi.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_04_use_pmi.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_04_use_pmi.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,61 @@
+--- kdeutils/klaptopdaemon/acpi_helper.cpp	2005-09-29 15:14:27.000000000 +0100
++++ kdeutils/klaptopdaemon/acpi_helper.cpp	2005-09-29 16:58:32.000000000 +0100
+@@ -100,7 +100,7 @@
+    Returns only if the program does not exist; if the program exists
+    and is unsafe, exit; if the program exists and is safe, run it
+    and never return. */
+-void run_program(const char *path)
++void run_program(const char *path, const int action)
+ {
+ 	struct stat sb;
+ 	int err;
+@@ -118,7 +118,13 @@
+ 		exit(1);
+ 	}
+ 	::setuid(::geteuid());					// otherwise bash will throw it away
+-	::execl(path, NULL);	// this is not KDE environment code 
++	if (action == 1) {
++		system("/usr/sbin/pmi action hibernate");
++	} else if (action == 2) {
++		system("/usr/sbin/pmi action sleep");
++	} else {
++		::execl(path, NULL);	// this is not KDE environment code 
++	}
+ 	exit(0);
+ }
+ 
+@@ -139,11 +145,13 @@
+ 	for (i = 1; i < argc; i++)
+ 	if (strcmp(argv[i], "--suspend") == 0 || strcmp(argv[i], "-suspend") == 0) {
+ 		/* Returns only if suspend does not exist. */
+-		run_program("/usr/sbin/suspend");
++		run_program("/usr/sbin/pmi", 2);
++		/*
+ 		if (useSysPower)
+ 			write_to_power("mem");
+ 		else
+ 			write_to_proc_sleep(3);
++		*/
+ 		exit(0);
+ 	} else
+ 	if (strcmp(argv[i], "--standby") == 0 || strcmp(argv[i], "-standby") == 0) {
+@@ -158,15 +166,17 @@
+ 		exit(0);
+ 	} else
+ 	if (strcmp(argv[i], "--hibernate") == 0 || strcmp(argv[i], "-hibernate") == 0) {
+-		run_program("/usr/sbin/hibernate");
++		run_program("/usr/sbin/pmi", 1);
++		/*
+ 		if (useSysPower)
+ 			write_to_power("disk");
+ 		else
+ 			write_to_proc_sleep(4);
++		*/
+ 		exit(0);
+ 	} else
+ 	if (strcmp(argv[i], "--software-suspend") == 0 || strcmp(argv[i], "-software-suspend") == 0) {
+-		run_program("/usr/sbin/hibernate");
++		run_program("/usr/sbin/hibernate", 0);
+ 		exit(0);
+ 	} else
+ 	if (strcmp(argv[i], "--throttling") == 0 || strcmp(argv[i], "-throttling") == 0) {

Added: people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_06_lock_on_hibernate.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_06_lock_on_hibernate.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_06_lock_on_hibernate.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,17 @@
+--- kdeutils/klaptopdaemon/daemondock.cpp	2005-10-03 18:01:20.000000000 +0100
++++ kdeutils/klaptopdaemon/daemondock.cpp	2005-10-03 18:01:54.000000000 +0100
+@@ -102,10 +102,10 @@
+     if (can_standby || can_suspend || can_hibernate) {
+     	rightPopup->insertSeparator();
+     	if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, SLOT(invokeStandby()));
+-	if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, SLOT(invokeLockSuspend()));
+-    	if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, SLOT(invokeSuspend()));
+-        if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, SLOT(invokeLockHibernation()));
+-	if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, SLOT(invokeHibernation()));
++	//	if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, SLOT(invokeLockSuspend()));
++    	if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, SLOT(invokeLockSuspend()));
++	//        if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, SLOT(invokeLockHibernation()));
++	if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, SLOT(invokeLockHibernation()));
+     }
+ 
+     rightPopup->insertSeparator();

Added: people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_08_kwallermanager_menu_tidy.diff
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_08_kwallermanager_menu_tidy.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/patches/kubuntu_08_kwallermanager_menu_tidy.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+--- kdeutils/kwallet/kwalletmanager.desktop	2005-09-10 09:21:30.000000000 +0100
++++ kdeutils/kwallet/kwalletmanager.desktop	2006-01-18 15:19:52.000000000 +0000
+@@ -53,3 +53,4 @@
+ X-KDE-StartupNotify=false
+ Categories=Qt;KDE;Settings;
+ DocPath=kwallet/index.html
++NoDisplay=true

Added: people/jriddell/KDE/3.5/kdeutils/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,22 @@
+#! /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
+
+DOC_HTML_PRUNE := kcontrol kinfocenter ktimer kcharselect ksim
+
+PACKAGES_WITH_LIBS := khexedit klaptopdaemon kmilo kregexpeditor ksim
+
+DEB_DH_MAKESHLIBS_ARGS_khexedit		:= -V'khexedit (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_klaptopdaemon	:= -V'klaptopdaemon (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kmilo		:= -V'kmilo (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kregexpeditor	:= -V'kregexpeditor (>= 4:3.5-rc1-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksim		:= -V'ksim (>= 4:3.5-rc1-1)'
+
+#shlibs_ver = 4:3.5.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+
+binary-install/superkaramba::
+	rm -f debian/superkaramba/usr/share/doc/superkaramba/examples/globalMouse/xcursor.so


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

Added: people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.examples
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.examples	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.examples	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,12 @@
+superkaramba/examples/API
+superkaramba/examples/autoHide
+superkaramba/examples/globalMouse
+superkaramba/examples/input_api
+superkaramba/examples/input_example
+superkaramba/examples/mouseDrag
+superkaramba/examples/popupMenu
+superkaramba/examples/README
+superkaramba/examples/richtext
+superkaramba/examples/taskBar
+superkaramba/examples/template.py
+superkaramba/examples/unicode

Added: people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.install
===================================================================
--- people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdeutils/debian/superkaramba.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,24 @@
+debian/tmp/usr/bin/superkaramba
+debian/tmp/usr/share/applnk/Utilities/superkaramba.desktop
+debian/tmp/usr/share/apps/superkaramba/superkarambaui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/superkaramba/common
+debian/tmp/usr/share/doc/kde/HTML/en/superkaramba/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/superkaramba/index.docbook
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/superkaramba.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/superkaramba.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/superkaramba_theme.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/superkaramba.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/superkaramba_theme.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/superkaramba.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/superkaramba_theme.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/superkaramba.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/superkaramba_theme.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/superkaramba.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
+debian/tmp/usr/share/icons/crystalsvg/scalable/apps/superkaramba.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
+debian/tmp/usr/share/mimelnk/application/x-superkaramba.desktop
+
+debian/icons/superkaramba.xpm		/usr/share/pixmaps
+debian/icons/superkaramba-16.xpm	/usr/share/pixmaps

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

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

Added: people/jriddell/KDE/3.5/kdevelop3/debian/README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+KDevelop3 for Debian
+-------------------
+
+If you wish to make use of KDevelop's SVN integration, you need to install
+either the 'kdesdk-kio-plugins' or the 'kdesvn-kio-plugins' package.
+
+ -- Jeremy LainÃ© <jeremy.laine at m4x.org>  Fri, 13 Jan 2006 20:00:05 +0100

Added: people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,88 @@
+# -*- 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-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
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif

Added: people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,824 @@
+kdevelop3 (4:3.3.1-0ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 17:40:48 +0000
+
+kdevelop3 (4:3.3.0-2) unstable; urgency=low
+
+  * Add Suggests on exuberant-ctags (Closes: #178793)
+  * Make kdevelop3-dev architecture 'any' due to .la files
+  * Move some .la files back to kdevelop3, these are for plugins
+
+ -- Jeremy LainÃ© <jeremy.laine at m4x.org>  Tue, 17 Jan 2006 08:11:19 +0100
+
+kdevelop3 (4:3.3.0-1) unstable; urgency=low
+
+  * New upstream release, build against KDE 3.5 (Closes: #347862)
+  * Add Jeremy LainÃ© to maintainers, acknowledge NMU fixes (Closes: #274966,
+    #295659, #302133, #304203, #304419, #306485, #309351, #311153, #312160,
+    #312161, #315170, #326883, #326929, #327710, #327730, #330037, #330038,
+    #331346, #336094, #341990) 
+  * Switch to Debian Qt/KDE team's CDBS scripts
+  * Update Suggests and README.Debian regarding SVN integration
+  * Remove explicit Build-Depends on g++-3.4 (Closes: #342991)
+  * Remove patches/qmake_new_class_fix.diff, included upstream
+  * Move development .la and .so files to kdevelop3-dev (Closes: #327904)
+
+ -- Jeremy LainÃ© <jeremy.laine at m4x.org>  Fri, 13 Jan 2006 20:00:05 +0100
+
+kdevelop3 (4:3.2.2-0.7) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Remove obsolete Build-Depends on libdb4.1-dev, add libdb4.3-dev
+  * Update versioned Build-Depends on libcvsservice-dev
+  * Fix crash when disabling plugins (Closes: #306485)
+  * Fix cron.weekly when package is removed but not purged (Closes: #302133)
+
+ -- Jeremy LainÃ© <jeremy.laine at m4x.org>  Wed, 21 Dec 2005 22:00:59 +0100
+
+kdevelop3 (4:3.2.2-0.6) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Rebuild against kdelibs4c2a (Closes: #341990)
+  * Add a note about SVN integration in README.Debian (Closes: #295659)
+  * Remove obsolete Build-Depends on libdb4.0-dev
+  * Fix KDevelop documentation browsing (correct DocPath in *.desktop)
+
+ -- Jeremy LainÃ© <jeremy.laine at m4x.org>  Sun,  4 Dec 2005 17:24:35 +0100
+
+kdevelop3 (4:3.3.0-0ubuntu4) dapper; urgency=low
+
+  * Add kubuntu_01_app_name.diff, fix .desktop files for kdevelop3
+    rename
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 30 Dec 2005 13:20:34 +0000
+
+kdevelop3 (4:3.3.0-0ubuntu3) dapper; urgency=low
+
+  * Replace automaken build-dep with automake1.9
+  * Make libdb4.3 the only build-dep candidate for libdb
+  * Alter debian/rules for .pot generation
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 10 Dec 2005 18:35:19 +0000
+
+kdevelop3 (4:3.3.0-0ubuntu2) dapper; urgency=low
+
+  * Rebuild for a2c transition without changes.
+
+ -- Stefan Potyra <sistpoty at ubuntu.com>  Fri,  9 Dec 2005 13:10:37 +0100
+
+kdevelop3 (4:3.3.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2005 23:59:22 +0000
+
+kdevelop3 (4:3.2.2-0.5) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Make sure kdevelop3 and kdevelop3-plugins have the same version
+    (Closes: #336094)
+
+ -- Jeremy LainÃ© <jeremy.laine at m4x.org>  Thu, 27 Oct 2005 18:47:30 +0200
+
+kdevelop3 (4:3.2.2-0.4) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Remove hardcoded Depends on debconf, let dh_installdebconf
+    handle it by using ${misc:Depends} (Closes: #327730)
+  * Add Swedish debconf translation (Closes: #331346)
+  * Remove obsolete Build-Depends on libsvn0-dev
+  * Switch to Python 2.4
+
+ -- Jeremy LainÃ© <jeremy.laine at m4x.org>  Tue, 18 Oct 2005 14:43:03 +0200
+
+kdevelop3 (4:3.2.2-0.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * work around gcc-4.0 FTBFS on some architectures
+
+ -- LaMont Jones <lamont at debian.org>  Fri, 14 Oct 2005 19:28:31 +0000
+
+kdevelop3 (4:3.2.2-0.2) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Fix kdevdesigner crash on start (Closes: #309351)
+  * Fix kdevassistant crash on start (Closes: #274966)
+  * Fix file permissions of Python/Qt examples (Closes: #330037, #330038) 
+
+ -- Jeremy LainÃ© <jeremy.laine at m4x.org>  Thu, 15 Sep 2005 08:37:32 +0200
+
+kdevelop3 (4:3.2.2-0.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * New upstream release (Closes: #326883)
+  * Build against new Qt / KDE libraries (Closes: #326929)
+  * Fix lintian warnings:
+   - Update to Standards-Version 3.6.2
+   - Replace possible bashism "-a" by "&&" in debian/config  
+  * Add Suggests on kdesdk-misc to provide kio_svn files
+  * Translation fixes:
+   - Fix debian/templates.master, run debconf-updatepo (Closes: #312161) 
+   - Add Vietnamese debconf translation (Closes: #312160)
+   - Update Brazilian translation (Closes: #304419)
+  * Fix adding new classes to qmake projects (Closes: #315170)
+  * Remove X-KDE-KDevelopIDE category from .desktop entries
+  * Add --disable-rpath to configure flags (Closes: #327710) 
+  * Fix debian/menu , package is 'kdevelop3' not 'kdevelop' (Closes: #311153)
+  * Fix some references to 'kdevelop' in .desktop files (Closes: #304203)
+  * Add missing Depends on debconf (Closes: #327730)
+
+ -- Jeremy LainÃ© <jeremy.laine at m4x.org>  Mon, 12 Sep 2005 23:15:38 +0200
+
+kdevelop3 (4:3.2.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat,  8 Oct 2005 22:20:19 +0000
+
+kdevelop3 (4:3.2.2-0ubuntu2) breezy; urgency=low
+
+  * Rebuild because of updated QT/KDE
+
+ -- Stephan Hermann <sh at sourcecode.de>  Wed,  7 Sep 2005 21:09:08 +0200
+
+kdevelop3 (4:3.2.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Switch to Python 2.4
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 26 Jul 2005 20:12:10 +0000
+
+kdevelop3 (4:3.2.1-0ubuntu1) breezy; urgency=low
+
+  * New upstream release 
+
+ -- Jonathan Riddell <jr at jriddell.org>  Fri, 25 Mar 2005 00:40:35 +0000
+
+kdevelop3 (4:3.2.0-3) unstable; urgency=low
+
+  * Fixed up the creation and removal of the symlinks for kio_svn
+    files (Closes: #310684)
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 25 May 2005 10:18:35 -0700
+
+kdevelop3 (4:3.2.0-2) unstable; urgency=medium
+
+  * Added the debconf translations back (Closes: #305276)
+  * Removed kpaint from the suggests field for kdevelop3
+    (Closes: #308198)
+  * Fixed icon path (Closes: #299522)
+  * Added pt_BR debconf translation (Closes: #304419)
+  * Moved the kio_svn files out of the way. Symlinks are created for
+    them if they are not already there. (Closes: #309379)
+
+ -- Norman Jordan <njordan at debian.org>  Mon,  23 May 2005 03:52:16 -0700
+
+kdevelop3 (4:3.2.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Norman Jordan <njordan at debian.org>  Mon,  4 Apr 2005 10:25:06 -0700
+
+kdevelop3 (4:3.2.0-0-BS1) unstable; urgency=low
+
+  * updated to released version
+
+ -- Bernd Schubert <bernd.schubert at pci.uni-heidelberg.de>  Thu, 17 Mar 2005 00:49:05 +0100
+
+kdevelop3 (4:3.1.2-3.2.0-rc1-cvs050306-2) unstable; urgency=low
+
+  * reverted the Makefile changes, modified the sourcecode instead
+
+ -- Bernd Schubert <bernd.schubert at pci.uni-heidelberg.de>  Wed,  9 Mar 2005 15:18:37 +0100
+
+kdevelop3 (4:3.1.2-3.2.0-rc1-cvs050306-1) unstable; urgency=low
+
+  * current cvs version
+  * not an offical debian version, so changed the maintainer
+  * had to replace the profilesdatadir in the Makefiles*
+
+ -- Bernd Schubert <bernd.schubert at pci.uni-heidelberg.de>  Wed,  9 Mar 2005 13:29:30 +0100
+
+kdevelop3 (4:3.1.2-4) unstable; urgency=low
+
+  * Fixed up the problem with linking a shared library with a static
+    one (Closes: #296511)
+  * Now the VIM editor part can no longer be loaded (Closes: #286884, #291814)
+
+ -- Norman Jordan <njordan at debian.org>  Thu,  9 Mar 2005 10:55:27 -0800
+
+kdevelop3 (4:3.1.2-3) unstable; urgency=low
+
+  * KDevelop 2.x is not yet phased out.
+  * Upload to get the latest upstream version into Debian
+
+ -- Norman Jordan <njordan at debian.org>  Tue, 19 Feb 2005 14:34:21 -0800
+
+kdevelop (4:3.1.2-2) unstable; urgency=low
+
+  * Added the Czech Debconf translation (Closes: #289456)
+  * Fix building on amd64 (Closes: #287096)
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 26 Jan 2005 09:05:00 -0800
+
+kdevelop3 (4:3.1.2-1ubuntu2) hoary; urgency=low
+
+  * Patch bdb_compile_pic to compile bdb using -fPIC to prevent compiler errors on amd64
+  * Build-dep on qt3-apps-dev
+  * Use /etc/kde3/kdevelop3rc not /usr/share/config/kdevelop3rc
+
+ -- Jonathan Riddell <jr at jriddell.org>  Sat, 22 Jan 2005 16:33:29 +0000
+
+kdevelop3 (4:3.1.2-1ubuntu1) hoary; urgency=low
+
+  * New upstream release 
+
+ -- Andreas Mueller <amu at canonical.com>  Sun, 16 Jan 2005 13:50:28 +0100
+
+kdevelop (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release
+  * KDevelop 2.x is now phased out, the kdevelop packages now contain
+    KDevelop 3.x
+  * Added libsvn0-dev to the build dependencies (Closes: #285873)
+  * Fixed the search path for the images (Closes: #236111)
+  * Added a versioned dependency to libcvsservice-dev 3.3.0
+    (Closes: #284626)
+
+ -- Norman Jordan <njordan at debian.org>  Tue, 28 Dec 2004 01:22:23 -0800
+
+kdevelop3 (4:3.1.1-2) unstable; urgency=medium
+
+  * Changed the icon entry in kdevelop3.desktop to refer to the
+    kdevelop3 icon (Closes: #239028)
+  * Now symbolic links are created that are named kdevelop3.mo and
+    point to the kdevelop.mo files from the kde-i18n-* packages
+    (Closes: #280794, #257076, #251475)
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 14 Nov 2004 02:27:16 -0800
+
+kdevelop3 (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Modified debconf phrase to use a question mark (Closes: #274019)
+  * Changed the directory that is searched for the license headers
+    (Closes: #279255)
+
+ -- Norman Jordan <njordan at debian.org>  Tue,  9 Nov 2004 23:01:42 -0800
+
+kdevelop3 (4:3.1.0-4) unstable; urgency=low
+
+  * Changed the configure options that are used. Now all languages,
+    and project types are enabled.
+
+ -- Norman Jordan <njordan at debian.org>  Wed,  6 Oct 2004 02:22:34 -0700
+
+kdevelop3 (4:3.1.0-3) unstable; urgency=low
+
+  * Modified vcs/cvsservice/cvspartimpl.cpp to support the version of
+    libcvsservice currently in Debian
+  * Added libcvsservice-dev to the build-dependencies (Closes: #273681)
+  * Added the German debconf translation (Closes: #273998)
+
+ -- Norman Jordan <njordan at debian.org>  Mon, 29 Sep 2004 20:50:39 -0700
+
+kdevelop3 (4:3.1.0-2) unstable; urgency=low
+
+  * Added qt3-apps-dev to the build-dependencies (Closes: #273534)
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 26 Sep 2004 18:07:38 -0700
+
+kdevelop3 (4:3.1.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Added the Japanese Debconf translation (Closes: #255057)
+  * Added ctags to the recommends field of the kdevelop3 package
+    (Closes: #265742)
+  * Changed the local copy of BDB to compile with the -fPIC flag. Required
+    for compiling on AMD64.
+
+ -- Norman Jordan <njordan at debian.org>  Sat, 25 Sep 2004 11:21:57 -0700
+
+kdevelop3 (4:3.0.4-2) unstable; urgency=low
+
+  * Now the kdevelop3 package depends on automaken, rather than listing each
+    version of automake, same for the build-dependencies
+  * Added a diversion for the file
+    /usr/share/icons/hicolor/22x22/actions/save_all.png
+    (Closes: #258383)
+  * Now libdb4.2-dev can satisfy the libdb*-dev build-dependency
+  * Updated the French translation (Closes: #255414)
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 11 Jul 2004 23:07:36 -0700
+
+kdevelop3 (4:3.0.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Rewrote the kdevelop3 postinst script in Perl
+  * Now the global documentation index is generated in the background
+    (Closes: #247123)
+  * Updated the menu file (Closes: #254651)
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 16 Jun 2004 12:55:21 -0700
+
+kdevelop3 (4:3.0.3-2) unstable; urgency=low
+
+  * Updated the depends field for kdevelop3 to accept automake1.8 as the
+    automake package to use (Closes: #249624)
+  * Added libtool to the recommends field for kdevelop3 (Closes: #250597)
+
+ -- Norman Jordan <njordan at debian.org>  Wed,  2 Jun 2004 00:10:17 -0700
+
+kdevelop3 (4:3.0.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed the /usr/lib/lib*.la files from the kdevelop3-dev package
+    (Closes: #243981)
+
+ -- Norman Jordan <njordan at debian.org>  Thu, 22 Apr 2004 12:52:06 -0700
+
+kdevelop3 (4:3.0.2-2) unstable; urgency=low
+
+  * Moved the *.la files from kdevelop3-dev to kdevelop3 (Closes: #234824)
+  * Added the Dutch translation provided by Frans Pop <aragorn at tiscali.nl>
+    (Closes: #237817)
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 17 Mar 2004 19:22:00 -0800
+
+kdevelop3 (4:3.0.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Added a French debconf translation provided by Eric <eric-m at wanadoo.fr>
+    (Closes: #236299)
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 10 Mar 2004 01:49:46 -0800
+
+kdevelop3 (4:3.0.1-2) unstable; urgency=low
+
+  * Now the update_doc_index.sh script and the config script will only accept
+    the installed version of ht://Dig if it is version 3.2.x (Closes: #234753)
+  * Updated the configure options so that the Qt documentation is detected
+  * Cleaned up the dependencies and suggests fields for all of the packages
+    (Closes: #235105)
+  * Fixed the debconf templates using the patch from Denis Barbier
+    (Closes: #234825)
+  * Changed the description for the kdevelop3-dev package to make it clear
+    that this package is only needed for writing KDevelop plugins
+    (Closes: #235248)
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 29 Feb 2004 23:40:45 -0800
+
+kdevelop3 (4:3.0.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated the configure options
+  # The cron job no longer uses debconf
+
+ -- Norman Jordan <njordan at debian.org>  Fri, 20 Feb 2004 21:48:35 -0800
+
+kdevelop3 (4:3.0.0-1) unstable; urgency=low
+
+  * Updated to the 3.0.0 release
+  * Update debian/update_doc_index.sh
+    - Updated to work with the htdig 3.2.x packages
+  * Fixed the documentation search dialog
+  * Updated the htdig suggestion to htdig 3.2
+  * Added a debconf question to see if the global documentation index should
+    be created
+
+ -- Norman Jordan <njordan at debian.org>  Sun,  15 Feb 2004 19:26:18 -0800
+
+kdevelop3 (4:3.0-00cvs-20031106) unstable; urgency=low
+
+  * Updated CVS sources
+  * Update debian/update_doc_index.sh
+    - Will not try to compare package versions for documentation packages that
+      are not installed
+
+ -- Norman Jordan <njordan at debian.org>  Thu,  6 Nov 2003 22:40:19 -0800
+
+kdevelop3 (4:3.0-00cvs20031021) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added the 'noopt' option to use the --enable-debug=full to configure
+    option. Patch supplied by Chris Halls.
+
+ -- Norman Jordan <njordan at debian.org>  Tue, 21 Oct 2003 13:51:34 -0700
+
+kdevelop3 (4:3.0-00cvs20031013) unstable; urgency=low
+
+  * Updated CVS sources
+  * Change the package names again to kdevelop3*
+    - Now KDevelop 3 and KDevelop 2 can be installed at the same time
+
+ -- Norman Jordan <njordan at debian.org>  Mon, 13 Oct 2003 23:05:06 -0700
+
+kdevelop (4:2.999-0cvs20031006) unstable; urgency=low
+
+  * Updated CVS sources
+  * Changed the packages to kdevelop* rather than gideon*
+  * The packages now conflict with the gideon packages
+  * The kdevelop package now contains all lib*.so.* and lib*.so files in
+    /usr/lib
+  * The kdevelop-dev package now contains all lib*.la files in /usr/lib
+
+ -- Norman Jordan <njordan at debian.org>  Mon,  6 Oct 2003 13:03:35 -0700
+
+gideon (1:2.999-0cvs20030928) unstable; urgency=low
+
+  * Updated CVS sources
+  * Updated the gideon-doc package to include the gideon HTML documentation
+  * Removed the x-pascal.desktop file from gideon-data
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 28 Sep 2003 15:27:30 -0700
+
+gideon (1:2.999-0cvs20030918) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added the libraries without a package to the gideon package
+
+ -- Norman Jordan <njordan at debian.org>  Thu, 18 Sep 2003 03:47:53 -0700
+
+gideon (1:2.999-0cvs20030909) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Tue,  9 Sep 2003 23:56:47 -0700
+
+gideon (1:2.999-0cvs20030905) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Thu,  5 Sep 2003 18:36:53 -0700
+
+gideon (1:2.999-0cvs20030820) unstable; urgency=low
+
+  * Updated CVS sources
+  * Updated the build-depends and suggests fields
+    - Removed obsolete packages
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 20 Aug 2003 16:15:24 -0700
+
+gideon (1:2.999-0cvs20030815) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added some extra arguments for when configure is run
+    + Enabled all of the language support options
+  * Added python2.2-dev / python2.3-dev to the build depends
+
+ -- Norman Jordan <njordan at debian.org>  Tue, 15 Aug 2003 03:18:32 -0700
+
+gideon (1:2.999-0cvs20030802) unstable; urgency=low
+
+  * Updated CVS sources
+  * Built against KDE 3.1.3
+  * Fixed to compile with GCC 3.3
+
+ -- Norman Jordan <njordan at debian.org>  Sat,  2 Aug 2003 05:03:12 -0700
+
+gideon (1:2.999-0cvs20030719) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Sat, 19 Jul 2003 14:14:26 -0700
+
+gideon (1:2.999-0cvs20030716) unstable; urgency=low
+
+  * Updated the Debian menu entry to use the name KDevelop 3.0
+  * Added the Gideon icon to the Debian menu entry
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 16 Jul 2003 21:04:24 -0700
+
+gideon (1:2.999-0cvs20030706) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added the URL for KDevelop to the package descriptions
+
+ -- Norman Jordan <njordan at debian.org>  Sun,  6 Jul 2003 23:51:16 -0700
+
+gideon (1:2.999-0cvs20030702) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Wed,  2 Jul 2003 03:41:49 -0700
+
+gideon (1:2.999-0cvs20030621) unstable; urgency=low
+
+  * Updated CVS sources
+  * The package gideon-plugins had two dependencies on the package gideon,
+    removed one of them.
+  * Now gideon's postinst and postrm scripts will call update-menus and
+    ldconfig
+
+ -- Norman Jordan <njordan at debian.org>  Sat, 21 Jun 2003 00:20:29 -0700
+
+gideon (1:2.999-0cvs20030612) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added the wxwin2.4 packages to the suggests field
+
+ -- Norman Jordan <njordan at debian.org>  Thu, 12 Jun 2003 22:19:20 -0700
+
+gideon (1:2.999-0cvs20030609) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Mon,  9 Jun 2003 11:27:20 -0700
+
+gideon (1:2.999-0cvs20030604) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Wed,  4 Jun 2003 21:19:16 -0700
+
+gideon (1:2.999-0cvs20030530) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Fri, 30 May 2003 11:53:23 -0700
+
+gideon (1:2.999-0cvs20030526) unstable; urgency=low
+
+  * Updated CVS sources
+  * Cleaned up debian/rules
+
+ -- Norman Jordan <njordan at debian.org>  Mon, 26 May 2003 11:20:05 -0700
+
+gideon (1:2.999-0cvs20030518) unstable; urgency=low
+
+  * Updated CVS sources
+  * Fixed up debian/rules to work with the new admin/debianrules file
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 18 May 2003 13:31:34 -0700
+
+gideon (1:2.999-0cvs20030514) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added the prefix to debian/rules and debian/buld-gideon
+  * Added stl-manual to the suggests field for gideon-doc
+  * Fixed up the path to the kdevelop manual
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 14 May 2003 02:47:32 -0700
+
+gideon (1:2.999-0cvs20030511) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added the documentation files to the gideon-doc package
+  * Added the antlr header files to the gideon-dev package
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 11 May 2003 17:43:27 -0700
+
+gideon (1:2.999-0cvs20030507) unstable; urgency=low
+
+  * Updated CVS sources
+  * Fixed up the configure options for the file "debian/build-gideon"
+  * Moved the script update_doc_index.sh to /usr/share/gideon
+
+ -- Norman Jordan <njordan at debian.org>  Wed,  7 May 2003 11:42:59 -0700
+
+gideon (1:2.999-0cvs20030502) unstable; urgency=low
+
+  * Updated CVS sources
+  * Added automake1.7 to the build depends and gideon depends fields
+  * Fixed up the update_doc_index.sh script
+
+ -- Norman Jordan <njordan at debian.org>  Fri,  2 May 2003 09:28:26 -0700
+
+gideon (1:2.999-0cvs20030430) unstable; urgency=low
+
+  * Updated CVS sources
+
+ -- Norman Jordan <njordan at debian.org>  Wed, 30 Apr 2003 22:37:07 -0700
+
+gideon (1:2.999-0cvs20030429) unstable; urgency=low
+
+  * Created a new package gideon-plugins
+  * Fixed up the build dependencies
+  * Corrected path to htsearch
+  * Corrected configure options in admin/debianrules
+  * Now creates a global documentation index on installation
+  * Added a weekly cron job to update the global documentation index
+  * Modified to support a global documentation index if there is one
+  * Added support for building with java support (off by default)
+
+ -- Norman Jordan <njordan at debian.org>  Tue, 29 Apr 2003 17:42:39 -0700
+
+gideon (1:2.999+cvs20030301-0woody1) unstable; urgency=low
+
+  * Woody rebuild on KDE_3_1_BRANCH
+
+ -- Ralf Nolden (KDE) <nolden at kde.org>  Sat,  1 Mar 2003 15:37:10 +0100
+
+gideon (1:2.999-1) unstable; urgency=low
+
+  * Fixed for KDE3.
+
+ -- Stefan Schimanski <schimmi at kde.org>  Mon, 24 Sep 2002 00:08:15 +0200
+
+gideon (1:3.0-3) unstable; urgency=low
+
+  * Removed java support as jadhar at debian.org suggests.
+
+ -- Eray Ozkural (exa) <erayo at cs.bilkent.edu.tr>  Fri, 30 Nov 2001 00:08:15 +0200
+
+gideon (1:3.0-2) unstable; urgency=low
+
+  * updated configure args
+  * configured multiple debian doc packages for gideon doc browser
+  * everything except scripting support turned on.
+
+ -- Eray Ozkural (exa) <erayo at cs.bilkent.edu.tr>  Wed, 21 Nov 2001 01:46:34 +0200
+
+gideon (1:3.0-1) unstable; urgency=low
+
+  * Initial release of development version
+  * Added gideon-doc.files and gideon-doc.links
+  * Suggest stl-manual and symlink to it
+
+ -- Eray Ozkural (exa) <erayo at cs.bilkent.edu.tr>  Mon, 30 Jul 2001 18:52:20 +0300
+
+kdevelop (1:2.0b1-2) unstable; urgency=low
+
+  * Renamed debian doc-base entries to standard ones.
+
+ -- Christian Couder <chcouder at club-internet.fr>  Mon, 23 Jul 2001 22:58:54 +0100
+
+kdevelop (1:2.0b1-1) unstable; urgency=low
+
+  * New release
+  * don't compress tip database
+  * small fix to find kdelibs docs in setup wizard
+  * split into binary, doc and data packages
+  * added graphviz to suggests
+
+ -- Eray Ozkural (exa) <erayo at cs.bilkent.edu.tr>  Mon, 23 Jul 2001 20:18:09 +0300
+
+kdevelop (1:1.4.0-3.4) unstable; urgency=low
+
+  * Updated the build-depends field 
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 13 May 2001 22:17:08 -0700
+
+kdevelop (1:1.4.0-3.3) unstable; urgency=low
+
+  * Suggests sgmltools-lite instead of sgmltools (Closes: #96274)
+
+ -- Norman Jordan <njordan at debian.org>  Sun, 13 May 2001 13:09:12 -0700
+
+kdevelop (1:1.4.0-3.2) unstable; urgency=low
+
+  * Change Maintainer (Closes: #90814)
+  * No longer installs extractrc (Closes: #93012)
+  * Suggests kdesdk-scripts 
+
+ -- Norman Jordan <njordan at debian.org>  Thu,  5 Apr 2001 11:03:57 -0700
+
+kdevelop (1:1.4.0-3.1) unstable; urgency=low
+ 
+  * NMU
+  * Fixing build-depends (Closes: #92190)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 30 Mar 2001 21:22:00 -0700
+
+kdevelop (1:1.4.0-3) unstable; urgency=low
+ 
+  * Change Maintainer
+  * More upstream fixes while I'm at it
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 23 Mar 2001 03:00:00 -0700
+
+kdevelop (1:1.4.0-2) unstable; urgency=low
+ 
+  * Removed non en docs as they are provided in kde-i18n now
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 04 Mar 2001 20:00:00 -0700
+
+kdevelop (1:1.4.0-1) unstable; urgency=low
+ 
+  * Cleaned up source based off of current CVS branch
+  * Fix desktop file (Closes: #87802)
+  * Update Build-Depends
+  * If you install qt-doc and not qt2.2-doc this works (Closes: #88185)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 02 Mar 2001 07:00:00 -0700
+
+kdevelop (1:1.4-final-1) unstable; urgency=low
+ 
+  * New upstream release
+  * Fix kde-i18n conflicts (Closes: #87381)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:06:00 -0700
+
+kdevelop (1:1.4-20010218-1) unstable; urgency=low
+ 
+  * New upstream cvs pull
+  * New upload to Debian with permission of Raphael Bossek who did the ITP
+  * Updating for potato/woody/sid
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 18 Feb 2001 02:06:00 -0700
+
+kdevelop (1:1.4-20010127-1) unstable; urgency=low
+
+  * New upstream release
+  * Updating for potato/woody/sid
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 27 Jan 2001 05:06:00 -0700
+
+kdevelop (1:1.1final-20000228-1) stable; urgency=low
+
+  * New upstream release
+  * Recommend kdelibs-doc
+  * Don't include Makefiles
+
+ -- Bernd Gehrmann <bernd at users.sourceforge.net>  Sun, 27 Feb 2000 12:00:00 +0100
+
+kdevelop (1:1.1beta2-20000206-1) stable; urgency=low
+
+  * Back to old configure arguments
+  * Mentioned debugger in control file, 
+    made kdebase a dependency
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Mon,  7 Feb 2000 00:10:59 +0100
+
+kdevelop (1:1.1beta2-20000131-1) stable; urgency=low
+
+  * New upstream version: 1.1beta2
+  * Use --prefix in configure, set kde_confdir, kde_htmldir explicitly
+    because of new autoconf framework
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Mon, 31 Jan 2000 21:15:04 +0100
+
+kdevelop (1:1.0-19991206-1) stable; urgency=low
+
+  * New upstream version: 1.0
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Mon,  6 Dec 1999 20:21:54 +0100
+
+kdevelop (1:1.0beta4.1-19991030-1) unstable; urgency=low
+
+  * New upstream changes
+  * Disabled debug - is stripped anyway
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Sat, 30 Oct 1999 09:02:41 +0200
+
+kdevelop (1:0.4-19990728-1) unstable; urgency=low
+
+  * Added further manuals to doc-base
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Wed, 28 Jul 1999 23:29:03 +0200
+
+kdevelop (1:0.4-19990716-1) unstable; urgency=low
+
+  * Call ldconfig in postinst
+  * configure with flag --enable-kdoc2
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Fri, 16 Jul 1999 20:47:55 +0200
+
+kdevelop (1:0.4-19990705-1) unstable; urgency=low
+
+  * configure with flag --enable-docbase
+  * install kdlgloader into the correct directories
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Mon,  5 Jul 1999 12:21:59 +0200
+
+kdevelop (1:0.4-19990619-1) unstable; urgency=low
+
+  * Fixed a competing problem between kderules and dh_installdocs
+  * New upstream changes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 19 Jun 1999 02:03:38 -0400
+
+kdevelop (1:0.4-19990614-1) unstable; urgency=low
+
+  * Aiiiiiiiiiie!! Fixed the broken kderules file
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Mon, 14 Jun 1999 20:45:38 +0200
+
+kdevelop (1:0.4-19990613-1) unstable; urgency=low
+
+  * New upstream CVS version
+  * New kderules script
+  * Migrated from man-pages format to undocumented format
+  * Changed changelog versioning to fit the rest of the KDE package versioning
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 13 Jun 1999 09:49:48 -0400
+
+kdevelop (990531-1) experimental; urgency=low
+
+  * Use DESTDIR mechanism instead of --with-install-root
+  * Do not install subdirectories of doc-base
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Mon, 31 May 1999 21:49:48 +0200
+
+kdevelop (990422-1) experimental; urgency=low
+
+  * Initial Release 
+
+ -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Thu, 22 Apr 1999 20:33:18 +0200
+
+Local variables:
+mode: debian-changelog
+End:

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

Added: people/jriddell/KDE/3.5/kdevelop3/debian/config
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/config	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/config	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+action=$1
+version=$2
+
+# Source the debconf library
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+if [ -x /usr/bin/htdig ] && [ -x /usr/bin/htmerge ] && /usr/bin/htdig -h 2> /dev/null | grep -q "This program is part of ht://Dig 3\.2\."; then
+  db_input medium kdevelop3/use_global_index || true
+  db_go || true
+fi
+
+exit 0
+
+#!/bin/sh
+
+action=$1
+version=$2
+
+# Source the debconf library
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+if [ -x /usr/bin/htdig ] && [ -x /usr/bin/htmerge ]; then
+  db_input medium kdevelop3/use_global_index || true
+  db_go || true
+fi
+
+exit 0
+

Added: people/jriddell/KDE/3.5/kdevelop3/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,91 @@
+Source: kdevelop3
+Section: kde
+Priority: optional
+Maintainer: Norman Jordan <njordan at debian.org>
+Uploaders: Jeremy LainÃ© <jeremy.laine at m4x.org>
+Build-Depends: cdbs, debhelper (>> 4.1.0), qt3-apps-dev, kdelibs4-dev (>= 4:3.5.0), gettext, autoconf, automaken, kdelibs4-doc, qt3-doc, flex, libdb4.3-dev | libdb4.2-dev | libdb3-dev, python2.4, libcvsservice-dev (>= 4:3.5.0), po-debconf
+Standards-Version: 3.6.2
+
+Package: kdevelop3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, autoconf, automaken, kdebase-bin, kdevelop3-data (>> 3.0), kdevelop3-plugins (= ${Source-Version})
+Replaces: kdevelop3-dev (= 4:3.3.0-1)
+Recommends: make, kdevelop3-doc
+Suggests: libqt3-mt-dev, kdbg, kdelibs4-dev, htdig (>> 3.2.0), sgmltools-lite, gettext, a2ps, enscript, gv, qt3-dev-tools, ark, kbabel, kiconedit, gdb, kdesdk-scripts, graphviz, stl-manual, wx2.4-examples | wx2.6-examples, libwxbase2.4-dev | libwxgtk2.4-dev | libwxgtk2.6-dev, kdesdk-kio-plugins | kdesvn-kio-plugins, exuberant-ctags
+Description: An IDE for Unix/X11 - development version
+ KDevelop is an easy to use Integrated Development Environment
+ for developing C/C++ applications under X11. It features 
+ project management, an advanced editor, a class browser
+ and an integrated debugger.
+ .
+ The application wizard can generate fully functional projects
+ for terminal programs and GUI programs using Qt, KDE or GNOME.
+ .
+ URL: http://www.kdevelop.org/
+
+Package: kdevelop3-doc
+Section: doc
+Architecture: all
+Suggests: kdelibs4-doc, qt3-doc, python2.4-doc | python2.3-doc, libglib2.0-doc, libgtk2.0-doc, gnome-dev-doc, stl-manual
+Description: An IDE for Unix/X11 - documentation
+ KDevelop is an easy to use Integrated Development Environment
+ for developing C/C++ applications under X11. It features 
+ project management, an advanced editor, a class browser
+ and an integrated debugger.
+ .
+ The application wizard can generate fully functional projects
+ for terminal programs and GUI programs using Qt, KDE or GNOME.
+ .
+ This package contains documentation for KDevelop.
+ .
+ URL: http://www.kdevelop.org/
+
+Package: kdevelop3-data
+Architecture: all
+Depends: kdevelop3 (= ${Source-Version})
+Description: An IDE for Unix/X11 - data
+ KDevelop is an easy to use Integrated Development Environment
+ for developing C/C++ applications under X11. It features 
+ project management, an advanced editor, a class browser
+ and an integrated debugger.
+ .
+ The application wizard can generate fully functional projects
+ for terminal programs and GUI programs using Qt, KDE or GNOME.
+ .
+ This package contains arch independent datas for KDevelop.
+ .
+ URL: http://www.kdevelop.org/
+
+Package: kdevelop3-dev
+Architecture: any
+Depends: kdevelop3 (= ${Source-Version})
+Replaces: kdevelop3 (<< 4:3.3.0)
+Description: An IDE for Unix/X11 - development files
+ KDevelop is an easy to use Integrated Development Environment
+ for developing C/C++ applications under X11. It features 
+ project management, an advanced editor, a class browser
+ and an integrated debugger.
+ .
+ The application wizard can generate fully functional projects
+ for terminal programs and GUI programs using Qt, KDE or GNOME.
+ .
+ This package contains development files for KDevelop.
+ .
+ URL: http://www.kdevelop.org/
+
+Package: kdevelop3-plugins
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: An IDE for Unix/X11 - development files
+ KDevelop is an easy to use Integrated Development Environment
+ for developing C/C++ applications under X11. It features 
+ project management, an advanced editor, a class browser
+ and an integrated debugger.
+ .
+ The application wizard can generate fully functional projects
+ for terminal programs and GUI programs using Qt, KDE or GNOME.
+ .
+ This package contains the plugins for KDevelop.
+ .
+ URL: http://www.kdevelop.org/
+

Added: people/jriddell/KDE/3.5/kdevelop3/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+This package was debianized by Bernd Gehrmann <bernd at physik.hu-berlin.de>,
+and is now maintained by Norman Jordan <njordan at debian.org>.
+Package configuration is based on those for the KDE packages.
+
+Copyright:
+
+KDevelop is released under the terms of the GNU GPL.
+
+See /usr/share/common-licenses/GPL for the full license.

Added: people/jriddell/KDE/3.5/kdevelop3/debian/create_lang_links.sh
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/create_lang_links.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/create_lang_links.sh	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+LANGS="ar bg bs ca cy da de el en_GB eo es et eu fi fr hi hr hu is it ja nb nl nn pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN"
+BASE_DIR="usr/share/locale"
+
+cd debian/tmp
+mkdir -p "$BASE_DIR"
+cd "$BASE_DIR"
+for lang in $LANGS; do
+  mkdir -p "$lang/LC_MESSAGES"
+  cd "$lang/LC_MESSAGES"
+  ln -fs kdevelop.mo kdevelop3.mo
+  cd ../..
+done
+

Added: people/jriddell/KDE/3.5/kdevelop3/debian/cron.weekly
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/cron.weekly	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/cron.weekly	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Used to update the documentation index for KDevelop
+
+if [ -e "/var/lib/kdevelop3/helpindex/global_doc_index_enabled" -a \
+      -f "/usr/share/kdevelop3/update_doc_index.sh" ]; then
+  /usr/share/kdevelop3/update_doc_index.sh > /dev/null 2>&1
+fi
+

Added: people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-data.install
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-data.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-data.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/apps
+debian/tmp/usr/share/desktop-directories
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/mimelnk
+debian/tmp/usr/share/locale

Added: people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,46 @@
+debian/tmp/usr/include/kde
+debian/tmp/usr/lib/libkinterfacedesigner.so
+debian/tmp/usr/lib/libkinterfacedesigner.la
+debian/tmp/usr/lib/libkdevextras.so
+debian/tmp/usr/lib/libkdevextras.la
+debian/tmp/usr/lib/libkdevpropertyeditor.so
+debian/tmp/usr/lib/libkdevpropertyeditor.la
+debian/tmp/usr/lib/libkdevwidgets.so
+debian/tmp/usr/lib/libkdevwidgets.la
+debian/tmp/usr/lib/libkdevcatalog.so
+debian/tmp/usr/lib/libkdevcatalog.la
+debian/tmp/usr/lib/libkdevcppparser.so
+debian/tmp/usr/lib/libkdevcppparser.la
+debian/tmp/usr/lib/libkdevelop.so
+debian/tmp/usr/lib/libkdevelop.la
+debian/tmp/usr/lib/libdocumentation_interfaces.so
+debian/tmp/usr/lib/libdocumentation_interfaces.la
+debian/tmp/usr/lib/libdocdoxygenplugin.so
+debian/tmp/usr/lib/libdocdoxygenplugin.la
+debian/tmp/usr/lib/libdocdevhelpplugin.so
+debian/tmp/usr/lib/libdocdevhelpplugin.la
+debian/tmp/usr/lib/libdockdevtocplugin.so
+debian/tmp/usr/lib/libdockdevtocplugin.la
+debian/tmp/usr/lib/libdocchmplugin.so
+debian/tmp/usr/lib/libdocchmplugin.la
+debian/tmp/usr/lib/libkdevqmakeparser.so
+debian/tmp/usr/lib/libkdevqmakeparser.la
+debian/tmp/usr/lib/libkdevbuildtoolswidgets.so
+debian/tmp/usr/lib/libkdevbuildtoolswidgets.la
+debian/tmp/usr/lib/libkdevbuildbase.so
+debian/tmp/usr/lib/libkdevbuildbase.la
+debian/tmp/usr/lib/libprojectmanager_interfaces.so
+debian/tmp/usr/lib/libprojectmanager_interfaces.la
+debian/tmp/usr/lib/liblang_interfaces.so
+debian/tmp/usr/lib/liblang_interfaces.la
+debian/tmp/usr/lib/liblang_debugger.so
+debian/tmp/usr/lib/liblang_debugger.la
+debian/tmp/usr/lib/libdesignerintegration.so
+debian/tmp/usr/lib/libdesignerintegration.la
+debian/tmp/usr/lib/libprofileengine.so
+debian/tmp/usr/lib/libprofileengine.la
+debian/tmp/usr/lib/libd.so
+debian/tmp/usr/lib/libd.la
+debian/tmp/usr/lib/libkdevshell.so
+debian/tmp/usr/lib/libkdevshell.la
+

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

Added: people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-doc.links
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-doc.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-doc.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+/usr/share/doc/stl-manual/html/ /usr/share/doc/kde/HTML/en/kdevdoctreeview/stl 

Added: people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-plugins.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3-plugins.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/services
+debian/tmp/usr/share/servicetypes
+debian/tmp/usr/lib/kde3

Added: people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.install
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,50 @@
+debian/tmp/etc/kde3/kdevassistantrc
+debian/tmp/etc/kde3/kdevelop3rc
+debian/tmp/usr/bin/kdevelop-htdig
+debian/tmp/usr/bin/kdevdesigner
+debian/tmp/usr/bin/r++
+debian/tmp/usr/bin/kdevprofileeditor
+debian/tmp/usr/bin/kdevassistant
+debian/tmp/usr/bin/kdevprj2kdevelop
+debian/tmp/usr/bin/kdevelop3
+
+debian/tmp/usr/lib/libkdevautomakeimporter.so
+debian/tmp/usr/lib/libkdevautomakeimporter.la
+debian/tmp/usr/lib/libkdevcustomimporter.so
+debian/tmp/usr/lib/libkdevcustomimporter.la
+debian/tmp/usr/lib/libqmakeimporter.so
+debian/tmp/usr/lib/libqmakeimporter.la
+debian/tmp/usr/lib/libkdevmakebuilder.so
+debian/tmp/usr/lib/libkdevmakebuilder.la
+debian/tmp/usr/lib/libkdevqtimporter.so
+debian/tmp/usr/lib/libkdevqtimporter.la
+debian/tmp/usr/lib/libkdevkdelibsimporter.so
+debian/tmp/usr/lib/libkdevkdelibsimporter.la
+debian/tmp/usr/lib/libkdevcustompcsimporter.so
+debian/tmp/usr/lib/libkdevcustompcsimporter.la
+
+debian/tmp/usr/lib/libkinterfacedesigner.so.*
+debian/tmp/usr/lib/libkdevextras.so.*
+debian/tmp/usr/lib/libkdevpropertyeditor.so.*
+debian/tmp/usr/lib/libkdevwidgets.so.*
+debian/tmp/usr/lib/libkdevcatalog.so.*
+debian/tmp/usr/lib/libkdevcppparser.so.*
+debian/tmp/usr/lib/libkdevelop.so.*
+debian/tmp/usr/lib/libdocumentation_interfaces.so.*
+debian/tmp/usr/lib/libdocdoxygenplugin.so.*
+debian/tmp/usr/lib/libdocdevhelpplugin.so.*
+debian/tmp/usr/lib/libdockdevtocplugin.so.*
+debian/tmp/usr/lib/libdocchmplugin.so.*
+debian/tmp/usr/lib/libkdevqmakeparser.so.*
+debian/tmp/usr/lib/libkdevbuildtoolswidgets.so.*
+debian/tmp/usr/lib/libkdevbuildbase.so.*
+debian/tmp/usr/lib/libprojectmanager_interfaces.so.*
+debian/tmp/usr/lib/liblang_interfaces.so.*
+debian/tmp/usr/lib/liblang_debugger.so.*
+debian/tmp/usr/lib/libdesignerintegration.so.*
+debian/tmp/usr/lib/libprofileengine.so.*
+debian/tmp/usr/lib/libd.so.*
+debian/tmp/usr/lib/libkdevshell.so.*
+debian/tmp/usr/lib/kconf_update_bin/kdev-gen-settings-kconf_update
+
+debian/tmp/usr/share/kdevelop3/update_doc_index.sh

Added: people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.postinst
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.postinst	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.postinst	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,58 @@
+#!/usr/bin/perl -w
+
+use Debconf::Client::ConfModule qw(:all);
+
+if(-d "/var/lib/gideon") {
+  rename("/var/lib/gideon", "/var/lib/kdevelop3");
+} elsif(-d "/var/lib/kdevelop") {
+  rename("/var/lib/kdevelop", "/var/lib/kdevelop3");
+}
+
+version('2.0');
+
+my $useGlobalIndex = get('kdevelop3/use_global_index');
+stop();
+if($useGlobalIndex eq 'true') {
+  my $haveValidConf = 0;
+  if(-e '/var/lib/kdevelop3/helpindex/htdig.conf') {
+    open(CONF, '/var/lib/kdevelop3/helpindex/htdig.conf');
+    while(my $line = <CONF>) {
+      chomp($line);
+      if($line =~ /# For htdig 3\.2\.x/) {
+        $haveValidConf = 1;
+      }
+    }
+    close(CONF);
+  }
+  if(!$haveValidConf) {
+    if(-e "/var/lib/kdevelop3/helpindex/db.docdb") {
+      unlink("/var/lib/kdevelop3/helpindex/db.docdb");
+    }
+    unlink("/var/lib/kdevelop3/helpindex/htdig.conf") if(-e '/var/lib/kdevelop3/helpindex/htdig.conf');
+  }
+  if(-e "/var/lib/kdevelop3/helpindex/files") {
+    unlink("/var/lib/kdevelop3/helpindex/files");
+  }
+  if(-x "/usr/share/kdevelop3/update_doc_index.sh") {
+    print STDERR "Building the global documentation index in the background...\n";
+    system('/usr/share/kdevelop3/update_doc_index.sh > /dev/null 2>&1 &');
+  }
+
+  system("touch /var/lib/kdevelop3/helpindex/global_doc_index_enabled");
+} else {
+  if(-e "/var/lib/kdevelop3/helpindex/global_doc_index_enabled") {
+    unlink("/var/lib/kdevelop3/helpindex/global_doc_index_enabled");
+  }
+}
+
+my $dh_commands="set -- @ARGV\\n" . << 'EOF';
+set -e
+
+#DEBHELPER#
+
+EOF
+system($dh_commands) / 256 == 0
+  or die "Problem with shell scripts: $!";
+
+exit 0;
+

Added: people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.postrm
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.postrm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/kdevelop3.postrm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# postrm - finish removal of the 'kdevelop3'-package
+
+GLOBAL_KDEVDOCTREEVIEW_DIR="/var/lib/kdevelop3";
+GLOBAL_HTDIG_DIR="$GLOBAL_KDEVDOCTREEVIEW_DIR/helpindex"
+
+if [ "$1" = "purge" ]; then
+    rm -rf "$GLOBAL_HTDIG_DIR"
+    rm -rf "$GLOBAL_KDEVDOCTREEVIEW_DIR"
+fi
+
+#DEBHELPER#
+
+exit 0
+

Added: people/jriddell/KDE/3.5/kdevelop3/debian/menu
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(kdevelop3):\
+        needs="X11"\
+        section="Apps/Programming"\
+        hints="KDE,Development"\
+        title="KDevelop 3.0"\
+	icon="/usr/share/icons/hicolor/16x16/apps/kdevelop3.png"\
+        command="kdevelop3"

Added: people/jriddell/KDE/3.5/kdevelop3/debian/patches/app_name.diff
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/app_name.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/patches/app_name.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,45 @@
+diff -urN kdevelop-3.3.0.orig/kdevdesigner/src/main.cpp kdevelop-3.3.0/kdevdesigner/src/main.cpp
+--- kdevelop-3.3.0.orig/kdevdesigner/src/main.cpp	2005-09-10 10:22:19.000000000 +0200
++++ kdevelop-3.3.0/kdevdesigner/src/main.cpp	2006-01-13 20:05:48.000000000 +0100
+@@ -56,7 +56,7 @@
+     {
+         // no session.. just start up normally
+         QSplashScreen * splash = 0;
+-        QString splashFile = locate("data", "kdevelop/pics/kdevdesigner-splash.png");
++        QString splashFile = locate("data", "kdevelop3/pics/kdevdesigner-splash.png");
+         if (!splashFile.isNull())
+         {
+             QPixmap pm;
+diff -urN kdevelop-3.3.0.orig/src/main_assistant.cpp kdevelop-3.3.0/src/main_assistant.cpp
+--- kdevelop-3.3.0.orig/src/main_assistant.cpp	2005-09-10 10:21:49.000000000 +0200
++++ kdevelop-3.3.0/src/main_assistant.cpp	2006-01-13 20:05:10.000000000 +0100
+@@ -84,7 +84,7 @@
+   KDevAssistantExtension::init();
+ 
+   SplashScreen *splash = 0;
+-  QString splashFile = locate("data", "kdevelop/pics/kdevassistant-splash.png");
++  QString splashFile = locate("data", "kdevelop3/pics/kdevassistant-splash.png");
+   if (!splashFile.isEmpty())
+   {
+     QPixmap pm;
+diff -urN kdevelop-3.3.0.orig/src/main.cpp kdevelop-3.3.0/src/main.cpp
+--- kdevelop-3.3.0.orig/src/main.cpp	2005-09-10 10:21:49.000000000 +0200
++++ kdevelop-3.3.0/src/main.cpp	2006-01-13 19:54:42.000000000 +0100
+@@ -31,7 +31,7 @@
+ int main(int argc, char *argv[])
+ {
+   static const char description[] = I18N_NOOP("The KDevelop Integrated Development Environment");
+-  KAboutData aboutData("kdevelop", I18N_NOOP("KDevelop"),
++  KAboutData aboutData("kdevelop3", I18N_NOOP("KDevelop"),
+                        VERSION, description, KAboutData::License_GPL,
+                        I18N_NOOP("(c) 1999-2005, The KDevelop developers"), "", "http://www.kdevelop.org");
+   aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo at kdevelop.org");
+@@ -140,7 +140,7 @@
+       }
+   }
+   
+-  kapp->dcopClient()->registerAs("kdevelop");
++  kapp->dcopClient()->registerAs("kdevelop3");
+   
+   return app.exec();
+ }

Added: people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/patches/common/07_disable-visibility.diff
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/07_disable-visibility.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/patches/common/kde.pot
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/kde.pot	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/kde.pot	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,1094 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2005-11-25 22:02+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: common_texts.cpp:24
+msgid "Configure"
+msgstr ""
+
+#: common_texts.cpp:25
+msgid "&Configure"
+msgstr ""
+
+#: common_texts.cpp:26
+msgid "Configuration"
+msgstr ""
+
+#: common_texts.cpp:27
+msgid "Modify"
+msgstr ""
+
+#: common_texts.cpp:28
+msgid "&Modify"
+msgstr ""
+
+#: common_texts.cpp:29
+msgid "Align"
+msgstr ""
+
+#: common_texts.cpp:30
+msgid "Page"
+msgstr ""
+
+#: common_texts.cpp:31
+msgid "Border"
+msgstr ""
+
+#: common_texts.cpp:32
+msgid "Orientation"
+msgstr ""
+
+#: common_texts.cpp:33
+msgid "Width"
+msgstr ""
+
+#: common_texts.cpp:34
+msgid "&Width"
+msgstr ""
+
+#: common_texts.cpp:35
+msgid "Height"
+msgstr ""
+
+#: common_texts.cpp:36
+msgid "&Height"
+msgstr ""
+
+#: common_texts.cpp:37
+msgid "Spacing"
+msgstr ""
+
+#: common_texts.cpp:38
+msgid "Horizontal"
+msgstr ""
+
+#: common_texts.cpp:39
+msgid "Vertical"
+msgstr ""
+
+#: common_texts.cpp:40
+msgid "Right"
+msgstr ""
+
+#: common_texts.cpp:41
+msgid "Left"
+msgstr ""
+
+#: common_texts.cpp:42
+msgid "Center"
+msgstr ""
+
+#: common_texts.cpp:43
+msgid "Top"
+msgstr ""
+
+#: common_texts.cpp:44
+msgid "Bottom"
+msgstr ""
+
+#: common_texts.cpp:45
+msgid "&Bottom"
+msgstr ""
+
+#: common_texts.cpp:46
+msgid "Move"
+msgstr ""
+
+#: common_texts.cpp:47
+msgid "Select All"
+msgstr ""
+
+#: common_texts.cpp:48
+msgid "Delete All"
+msgstr ""
+
+#: common_texts.cpp:49
+msgid "Clear All"
+msgstr ""
+
+#: common_texts.cpp:50
+msgid "Export"
+msgstr ""
+
+#: common_texts.cpp:51
+msgid "Import"
+msgstr ""
+
+#: common_texts.cpp:52
+msgid "Zoom"
+msgstr ""
+
+#: common_texts.cpp:53
+msgid "&Zoom"
+msgstr ""
+
+#: common_texts.cpp:54
+msgid "Error"
+msgstr ""
+
+#: common_texts.cpp:55
+msgid "Malformed URL"
+msgstr ""
+
+#: common_texts.cpp:56
+msgid "Charset:"
+msgstr ""
+
+#: common_texts.cpp:57
+msgid "Yes"
+msgstr ""
+
+#: common_texts.cpp:58
+msgid "No"
+msgstr ""
+
+#: common_texts.cpp:59
+msgid "Warning"
+msgstr ""
+
+#: common_texts.cpp:60
+msgid "Save a file"
+msgstr ""
+
+#: common_texts.cpp:61
+msgid "Contents"
+msgstr ""
+
+#: common_texts.cpp:62
+msgid "About"
+msgstr ""
+
+#: common_texts.cpp:63 common_texts.cpp:176
+msgid "&About"
+msgstr ""
+
+#: common_texts.cpp:64
+msgid "A&bout"
+msgstr ""
+
+#: common_texts.cpp:65
+msgid "Untitled"
+msgstr ""
+
+#: common_texts.cpp:66
+msgid "OK"
+msgstr ""
+
+#: common_texts.cpp:67
+msgid "&OK"
+msgstr ""
+
+#: common_texts.cpp:68
+msgid "On"
+msgstr ""
+
+#: common_texts.cpp:69
+msgid "Off"
+msgstr ""
+
+#: common_texts.cpp:70
+msgid "Cancel"
+msgstr ""
+
+#: common_texts.cpp:71
+msgid "&Cancel"
+msgstr ""
+
+#: common_texts.cpp:72
+msgid "Apply"
+msgstr ""
+
+#: common_texts.cpp:73
+msgid "&Apply"
+msgstr ""
+
+#: common_texts.cpp:74
+msgid "File"
+msgstr ""
+
+#: common_texts.cpp:75
+msgid "&Discard"
+msgstr ""
+
+#: common_texts.cpp:76
+msgid "Discard"
+msgstr ""
+
+#: common_texts.cpp:77
+msgid "&File"
+msgstr ""
+
+#: common_texts.cpp:78
+msgid "Help"
+msgstr ""
+
+#: common_texts.cpp:79
+msgid "&Help"
+msgstr ""
+
+#: common_texts.cpp:80
+msgid "Edit"
+msgstr ""
+
+#: common_texts.cpp:81
+msgid "&Edit"
+msgstr ""
+
+#: common_texts.cpp:82
+msgid "&Options"
+msgstr ""
+
+#: common_texts.cpp:83
+msgid "View"
+msgstr ""
+
+#: common_texts.cpp:84
+msgid "&View"
+msgstr ""
+
+#: common_texts.cpp:85
+msgid "E&xit"
+msgstr ""
+
+#: common_texts.cpp:86
+msgid "Quit"
+msgstr ""
+
+#: common_texts.cpp:87
+msgid "&Quit"
+msgstr ""
+
+#: common_texts.cpp:88
+msgid "Reload"
+msgstr ""
+
+#: common_texts.cpp:89
+msgid "Back"
+msgstr ""
+
+#: common_texts.cpp:90
+msgid "Copy"
+msgstr ""
+
+#: common_texts.cpp:91
+msgid "&Copy"
+msgstr ""
+
+#: common_texts.cpp:92
+msgid "Paste"
+msgstr ""
+
+#: common_texts.cpp:93
+msgid "&Paste"
+msgstr ""
+
+#: common_texts.cpp:94
+msgid "&New Window..."
+msgstr ""
+
+#: common_texts.cpp:95
+msgid "New &Window..."
+msgstr ""
+
+#: common_texts.cpp:96
+msgid "&New Window"
+msgstr ""
+
+#: common_texts.cpp:97
+msgid "New Game"
+msgstr ""
+
+#: common_texts.cpp:98
+msgid "&New Game"
+msgstr ""
+
+#: common_texts.cpp:99
+msgid "Open"
+msgstr ""
+
+#: common_texts.cpp:100
+msgid "Open a File"
+msgstr ""
+
+#: common_texts.cpp:101
+msgid "Open..."
+msgstr ""
+
+#: common_texts.cpp:102
+msgid "&Open..."
+msgstr ""
+
+#: common_texts.cpp:103
+msgid "Cut"
+msgstr ""
+
+#: common_texts.cpp:104
+msgid "&Cut"
+msgstr ""
+
+#: common_texts.cpp:105
+msgid "C&ut"
+msgstr ""
+
+#: common_texts.cpp:106
+msgid "Font"
+msgstr ""
+
+#: common_texts.cpp:107
+msgid "&Foreground Color"
+msgstr ""
+
+#: common_texts.cpp:108
+msgid "&Background Color"
+msgstr ""
+
+#: common_texts.cpp:109
+msgid "Save"
+msgstr ""
+
+#: common_texts.cpp:110
+msgid "&Save"
+msgstr ""
+
+#: common_texts.cpp:111
+msgid "Save As"
+msgstr ""
+
+#: common_texts.cpp:112
+msgid "Save As..."
+msgstr ""
+
+#: common_texts.cpp:113
+msgid "S&ave As..."
+msgstr ""
+
+#: common_texts.cpp:114
+msgid "Close"
+msgstr ""
+
+#: common_texts.cpp:115
+msgid "&Close"
+msgstr ""
+
+#: common_texts.cpp:116
+msgid "&Print..."
+msgstr ""
+
+#: common_texts.cpp:117
+msgid "Sorry"
+msgstr ""
+
+#: common_texts.cpp:118
+msgid "Options"
+msgstr ""
+
+#: common_texts.cpp:119
+msgid "Remove"
+msgstr ""
+
+#: common_texts.cpp:120
+msgid "Add"
+msgstr ""
+
+#: common_texts.cpp:121
+msgid "Change"
+msgstr ""
+
+#: common_texts.cpp:122
+msgid "Delete"
+msgstr ""
+
+#: common_texts.cpp:123
+msgid "&Delete"
+msgstr ""
+
+#: common_texts.cpp:124
+msgid "Clear"
+msgstr ""
+
+#: common_texts.cpp:125
+msgid "Italic"
+msgstr ""
+
+#: common_texts.cpp:126
+msgid "Roman"
+msgstr ""
+
+#: common_texts.cpp:127
+msgid "Undo"
+msgstr ""
+
+#: common_texts.cpp:128
+msgid "&Undo"
+msgstr ""
+
+#: common_texts.cpp:129
+msgid "Redo"
+msgstr ""
+
+#: common_texts.cpp:130
+msgid "&Redo"
+msgstr ""
+
+#: common_texts.cpp:131
+msgid "&Game"
+msgstr ""
+
+#: common_texts.cpp:132
+msgid "Information"
+msgstr ""
+
+#: common_texts.cpp:133
+msgid "Portrait"
+msgstr ""
+
+#: common_texts.cpp:134
+msgid "Landscape"
+msgstr ""
+
+#: common_texts.cpp:135
+msgid "locally connected"
+msgstr ""
+
+#: common_texts.cpp:136
+msgid "Browse..."
+msgstr ""
+
+#: common_texts.cpp:137
+msgid "Stop"
+msgstr ""
+
+#: common_texts.cpp:138
+msgid "&Remove"
+msgstr ""
+
+#: common_texts.cpp:139
+msgid "&Properties..."
+msgstr ""
+
+#: common_texts.cpp:140
+msgid "Properties"
+msgstr ""
+
+#: common_texts.cpp:141
+msgid "&Start"
+msgstr ""
+
+#: common_texts.cpp:142
+msgid "St&op"
+msgstr ""
+
+#: common_texts.cpp:143
+msgid "Miscellaneous"
+msgstr ""
+
+#: common_texts.cpp:144
+msgid "Font Size"
+msgstr ""
+
+#: common_texts.cpp:145
+msgid "Fonts"
+msgstr ""
+
+#: common_texts.cpp:146
+msgid "&Fonts"
+msgstr ""
+
+#: common_texts.cpp:147
+msgid "&Reload"
+msgstr ""
+
+#: common_texts.cpp:148
+msgid "Files"
+msgstr ""
+
+#: common_texts.cpp:149
+msgid "Continue"
+msgstr ""
+
+#: common_texts.cpp:150
+msgid "Restore"
+msgstr ""
+
+#: common_texts.cpp:151
+msgid "Appearance"
+msgstr ""
+
+#: common_texts.cpp:152
+msgid "Print"
+msgstr ""
+
+#: common_texts.cpp:153
+msgid "Monday"
+msgstr ""
+
+#: common_texts.cpp:154
+msgid "Tuesday"
+msgstr ""
+
+#: common_texts.cpp:155
+msgid "Wednesday"
+msgstr ""
+
+#: common_texts.cpp:156
+msgid "Thursday"
+msgstr ""
+
+#: common_texts.cpp:157
+msgid "Friday"
+msgstr ""
+
+#: common_texts.cpp:158
+msgid "Saturday"
+msgstr ""
+
+#: common_texts.cpp:159
+msgid "Sunday"
+msgstr ""
+
+#: common_texts.cpp:160
+msgid "&Update"
+msgstr ""
+
+#: common_texts.cpp:163
+msgid "Highscore"
+msgstr ""
+
+#: common_texts.cpp:164
+msgid "&New View"
+msgstr ""
+
+#: common_texts.cpp:165
+msgid "&Insert"
+msgstr ""
+
+#: common_texts.cpp:168
+msgid ""
+"_: Opposite to Previous\n"
+"&Next"
+msgstr ""
+
+#: common_texts.cpp:169
+msgid "&Previous"
+msgstr ""
+
+#: common_texts.cpp:170
+msgid "Replace"
+msgstr ""
+
+#: common_texts.cpp:171
+msgid "&Replace..."
+msgstr ""
+
+#: common_texts.cpp:172
+msgid "Insert"
+msgstr ""
+
+#: common_texts.cpp:173
+msgid "Default"
+msgstr ""
+
+#: common_texts.cpp:174
+msgid "&Defaults"
+msgstr ""
+
+#: common_texts.cpp:175
+msgid "&Contents"
+msgstr ""
+
+#: common_texts.cpp:177
+msgid "Open Recent"
+msgstr ""
+
+#: common_texts.cpp:178
+msgid "Open &Recent"
+msgstr ""
+
+#: common_texts.cpp:179
+msgid "&Find..."
+msgstr ""
+
+#: common_texts.cpp:180
+msgid "Find &Next"
+msgstr ""
+
+#: common_texts.cpp:181
+msgid "Bookmarks"
+msgstr ""
+
+#: common_texts.cpp:182
+msgid "&Bookmarks"
+msgstr ""
+
+#: common_texts.cpp:183
+msgid "&Add Bookmark"
+msgstr ""
+
+#: common_texts.cpp:184
+msgid "&Edit Bookmarks..."
+msgstr ""
+
+#: common_texts.cpp:185
+msgid "&Tools"
+msgstr ""
+
+#: common_texts.cpp:186
+msgid "&Spelling..."
+msgstr ""
+
+#: common_texts.cpp:187
+msgid "Show &Menubar"
+msgstr ""
+
+#: common_texts.cpp:188
+msgid "Show &Toolbar"
+msgstr ""
+
+#: common_texts.cpp:189
+msgid "Show &Statusbar"
+msgstr ""
+
+#: common_texts.cpp:190
+msgid "Configure &Key Bindings..."
+msgstr ""
+
+#: common_texts.cpp:191
+msgid "&Preferences..."
+msgstr ""
+
+#: common_texts.cpp:192
+msgid "&Settings"
+msgstr ""
+
+#: common_texts.cpp:193
+msgid "Do not show this message again"
+msgstr ""
+
+#: common_texts.cpp:194
+msgid ""
+"_: QAccel\n"
+"Escape"
+msgstr ""
+
+#: common_texts.cpp:195
+msgid ""
+"_: QAccel\n"
+"Tab"
+msgstr ""
+
+#: common_texts.cpp:196
+msgid ""
+"_: QAccel\n"
+"Backtab"
+msgstr ""
+
+#: common_texts.cpp:197
+msgid ""
+"_: QAccel\n"
+"Backspace"
+msgstr ""
+
+#: common_texts.cpp:198
+msgid ""
+"_: QAccel\n"
+"Return"
+msgstr ""
+
+#: common_texts.cpp:199
+msgid ""
+"_: QAccel\n"
+"Enter"
+msgstr ""
+
+#: common_texts.cpp:200
+msgid ""
+"_: QAccel\n"
+"Insert"
+msgstr ""
+
+#: common_texts.cpp:201
+msgid ""
+"_: QAccel\n"
+"Delete"
+msgstr ""
+
+#: common_texts.cpp:202
+msgid ""
+"_: QAccel\n"
+"Pause"
+msgstr ""
+
+#: common_texts.cpp:203
+msgid ""
+"_: QAccel\n"
+"Print"
+msgstr ""
+
+#: common_texts.cpp:204
+msgid ""
+"_: QAccel\n"
+"SysReq"
+msgstr ""
+
+#: common_texts.cpp:205
+msgid ""
+"_: QAccel\n"
+"Home"
+msgstr ""
+
+#: common_texts.cpp:206
+msgid ""
+"_: QAccel\n"
+"End"
+msgstr ""
+
+#: common_texts.cpp:207
+msgid ""
+"_: QAccel\n"
+"Left"
+msgstr ""
+
+#: common_texts.cpp:208
+msgid ""
+"_: QAccel\n"
+"Up"
+msgstr ""
+
+#: common_texts.cpp:209
+msgid ""
+"_: QAccel\n"
+"Right"
+msgstr ""
+
+#: common_texts.cpp:210
+msgid ""
+"_: QAccel\n"
+"Down"
+msgstr ""
+
+#: common_texts.cpp:211
+msgid ""
+"_: QAccel\n"
+"Prior"
+msgstr ""
+
+#: common_texts.cpp:212
+msgid ""
+"_: QAccel\n"
+"Next"
+msgstr ""
+
+#: common_texts.cpp:213
+msgid ""
+"_: QAccel\n"
+"Shift"
+msgstr ""
+
+#: common_texts.cpp:214
+msgid ""
+"_: QAccel\n"
+"Control"
+msgstr ""
+
+#: common_texts.cpp:215
+msgid ""
+"_: QAccel\n"
+"Meta"
+msgstr ""
+
+#: common_texts.cpp:216
+msgid ""
+"_: QAccel\n"
+"Alt"
+msgstr ""
+
+#: common_texts.cpp:217
+msgid ""
+"_: QAccel\n"
+"CapsLock"
+msgstr ""
+
+#: common_texts.cpp:218
+msgid ""
+"_: QAccel\n"
+"NumLock"
+msgstr ""
+
+#: common_texts.cpp:219
+msgid ""
+"_: QAccel\n"
+"ScrollLock"
+msgstr ""
+
+#: common_texts.cpp:220
+msgid ""
+"_: QAccel\n"
+"Space"
+msgstr ""
+
+#: common_texts.cpp:221
+msgid ""
+"_: QAccel\n"
+"ParenLeft"
+msgstr ""
+
+#: common_texts.cpp:222
+msgid ""
+"_: QAccel\n"
+"ParenRight"
+msgstr ""
+
+#: common_texts.cpp:223
+msgid ""
+"_: QAccel\n"
+"Asterisk"
+msgstr ""
+
+#: common_texts.cpp:224
+msgid ""
+"_: QAccel\n"
+"Plus"
+msgstr ""
+
+#: common_texts.cpp:225
+msgid ""
+"_: QAccel\n"
+"Comma"
+msgstr ""
+
+#: common_texts.cpp:226
+msgid ""
+"_: QAccel\n"
+"Minus"
+msgstr ""
+
+#: common_texts.cpp:227
+msgid ""
+"_: QAccel\n"
+"Period"
+msgstr ""
+
+#: common_texts.cpp:228
+msgid ""
+"_: QAccel\n"
+"Slash"
+msgstr ""
+
+#: common_texts.cpp:229
+msgid ""
+"_: QAccel\n"
+"Colon"
+msgstr ""
+
+#: common_texts.cpp:230
+msgid ""
+"_: QAccel\n"
+"Semicolon"
+msgstr ""
+
+#: common_texts.cpp:231
+msgid ""
+"_: QAccel\n"
+"Less"
+msgstr ""
+
+#: common_texts.cpp:232
+msgid ""
+"_: QAccel\n"
+"Equal"
+msgstr ""
+
+#: common_texts.cpp:233
+msgid ""
+"_: QAccel\n"
+"Greater"
+msgstr ""
+
+#: common_texts.cpp:234
+msgid ""
+"_: QAccel\n"
+"Question"
+msgstr ""
+
+#: common_texts.cpp:235
+msgid ""
+"_: QAccel\n"
+"BracketLeft"
+msgstr ""
+
+#: common_texts.cpp:236
+msgid ""
+"_: QAccel\n"
+"Backslash"
+msgstr ""
+
+#: common_texts.cpp:237
+msgid ""
+"_: QAccel\n"
+"BracketRight"
+msgstr ""
+
+#: common_texts.cpp:238
+msgid ""
+"_: QAccel\n"
+"AsciiCircum"
+msgstr ""
+
+#: common_texts.cpp:239
+msgid ""
+"_: QAccel\n"
+"Underscore"
+msgstr ""
+
+#: common_texts.cpp:240
+msgid ""
+"_: QAccel\n"
+"QuoteLeft"
+msgstr ""
+
+#: common_texts.cpp:241
+msgid ""
+"_: QAccel\n"
+"BraceLeft"
+msgstr ""
+
+#: common_texts.cpp:242
+msgid ""
+"_: QAccel\n"
+"BraceRight"
+msgstr ""
+
+#: common_texts.cpp:243
+msgid ""
+"_: QAccel\n"
+"AsciiTilde"
+msgstr ""
+
+#: common_texts.cpp:244
+msgid ""
+"_: QAccel\n"
+"PgUp"
+msgstr ""
+
+#: common_texts.cpp:245
+msgid ""
+"_: QAccel\n"
+"PgDown"
+msgstr ""
+
+#: common_texts.cpp:246
+msgid ""
+"_: QAccel\n"
+"Apostrophe"
+msgstr ""
+
+#: common_texts.cpp:247
+msgid ""
+"_: QAccel\n"
+"Ampersand"
+msgstr ""
+
+#: common_texts.cpp:248
+msgid ""
+"_: QAccel\n"
+"Exclam"
+msgstr ""
+
+#: common_texts.cpp:249
+msgid ""
+"_: QAccel\n"
+"Dollar"
+msgstr ""
+
+#: common_texts.cpp:250
+msgid ""
+"_: QAccel\n"
+"Percent"
+msgstr ""
+
+#: common_texts.cpp:251
+msgid ""
+"_: QAccel\n"
+"Menu"
+msgstr ""
+
+#: common_texts.cpp:252
+msgid ""
+"_: QAccel\n"
+"Help"
+msgstr ""
+
+#: common_texts.cpp:253
+msgid ""
+"_: QAccel\n"
+"NumberSign"
+msgstr ""
+
+#: common_texts.cpp:254
+msgid "Main Toolbar"
+msgstr ""
+
+#: common_texts.cpp:257 common_texts.cpp:261
+msgid ""
+"_: font style\n"
+"Demi-bold"
+msgstr ""
+
+#: common_texts.cpp:258
+msgid ""
+"_: font style\n"
+"Light"
+msgstr ""
+
+#: common_texts.cpp:259
+msgid ""
+"_: font style\n"
+"Light Italic"
+msgstr ""
+
+#: common_texts.cpp:260 common_texts.cpp:262
+msgid ""
+"_: font style\n"
+"Demi-bold Italic"
+msgstr ""
+
+#: common_texts.cpp:263
+msgid ""
+"_: font style\n"
+"Oblique"
+msgstr ""
+
+#: common_texts.cpp:264
+msgid ""
+"_: font style\n"
+"Book"
+msgstr ""
+
+#: common_texts.cpp:265
+msgid ""
+"_: font style\n"
+"Book Oblique"
+msgstr ""
+
+#: common_texts.cpp:268
+msgid ""
+"_: window operation\n"
+"Sticky"
+msgstr ""
+
+#: common_texts.cpp:269
+msgid ""
+"_: window operation\n"
+"Un-Sticky"
+msgstr ""

Added: people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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-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/kdevelop3/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/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/kdevelop3/debian/patches/profiledir.diff
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/patches/profiledir.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/patches/profiledir.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,91 @@
+diff -ru kdevelop-3.2.0/src/profileengine/lib/profile.cpp kdevelop-3.2.0.new/src/profileengine/lib/profile.cpp
+--- kdevelop-3.2.0/src/profileengine/lib/profile.cpp	2005-02-04 00:04:22.000000000 +0100
++++ kdevelop-3.2.0.new/src/profileengine/lib/profile.cpp	2005-03-09 20:51:52.000000000 +0100
+@@ -32,7 +32,7 @@
+     if (m_parent)
+         m_parent->addChildProfile(this);
+     
+-    QString profileConfig = locate("data", "kdevelop/profiles" + dirName() + "/profile.config");
++    QString profileConfig = locate("data", PROFILEDIR + dirName() + "/profile.config");
+     KConfig config(profileConfig);
+     
+     config.setGroup("Information");
+@@ -83,7 +83,7 @@
+ 
+ void Profile::save()
+ {
+-    QString profileConfig = locateLocal("data", "kdevelop/profiles" + dirName() + "/profile.config");
++    QString profileConfig = locateLocal("data", PROFILEDIR + dirName() + "/profile.config");
+     KConfig config(profileConfig);
+     
+     config.setGroup("Information");
+@@ -151,7 +151,7 @@
+ 
+ bool Profile::remove()
+ {
+-    QStringList dirs = KGlobal::dirs()->findDirs("data", "kdevelop/profiles" + dirName());
++    QStringList dirs = KGlobal::dirs()->findDirs("data", PROFILEDIR + dirName());
+     if ((dirs.count() == 1) && dirs[0].startsWith(QDir::homeDirPath()))
+         return KIO::NetAccess::del(KURL::fromPathOrURL(dirs[0]), 0);
+     return false;
+@@ -170,7 +170,7 @@
+     for (QStringList::const_iterator it = resourceDirs.begin(); it != resourceDirs.end(); ++it)
+     {
+         QString dir = *it;
+-        dir = dir + "kdevelop/profiles" + dirName();
++        dir = dir + PROFILEDIR + dirName();
+         
+         QDir d(dir);
+         const QFileInfoList *infoList = d.entryInfoList(nameFilter, QDir::Files);
+@@ -186,6 +186,6 @@
+ 
+ void Profile::addResource(const KURL &url)
+ {
+-    QString saveLocation = KGlobal::dirs()->saveLocation("data", "kdevelop/profiles"+dirName(), true);
++    QString saveLocation = KGlobal::dirs()->saveLocation("data", PROFILEDIR+dirName(), true);
+     KIO::NetAccess::file_copy(url, KURL::fromPathOrURL(saveLocation), -1, true);
+ }
+diff -ru kdevelop-3.2.0/src/profileengine/lib/profile.h kdevelop-3.2.0.new/src/profileengine/lib/profile.h
+--- kdevelop-3.2.0/src/profileengine/lib/profile.h	2005-02-04 00:04:22.000000000 +0100
++++ kdevelop-3.2.0.new/src/profileengine/lib/profile.h	2005-03-09 20:47:55.000000000 +0100
+@@ -22,6 +22,8 @@
+ #include <kurl.h>
+ #include <qstringlist.h>
+ 
++#define PROFILEDIR "kdevelop3/profiles/"
++
+ /**
+ @short KDevelop profile
+ 
+diff -ru kdevelop-3.2.0/src/profileengine/lib/profileengine.cpp kdevelop-3.2.0.new/src/profileengine/lib/profileengine.cpp
+--- kdevelop-3.2.0/src/profileengine/lib/profileengine.cpp	2005-02-04 00:04:22.000000000 +0100
++++ kdevelop-3.2.0.new/src/profileengine/lib/profileengine.cpp	2005-03-09 20:50:07.000000000 +0100
+@@ -17,6 +17,7 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ #include "profileengine.h"
++#include "profile.h"
+ 
+ #include <qdir.h>
+ 
+@@ -29,7 +30,7 @@
+ 
+ ProfileEngine::ProfileEngine()
+ {
+-    QStringList dirs = KGlobal::dirs()->findDirs("data", "kdevelop/profiles");
++    QStringList dirs = KGlobal::dirs()->findDirs("data", PROFILEDIR);
+     
+     m_rootProfile = new Profile(0, "KDevelop");
+     
+diff -urN kdevelop3-3.2.2/src/projectmanager.cpp kdevelop3-3.2.2.new/src/projectmanager.cpp
+--- kdevelop3-3.2.2/src/projectmanager.cpp	2005-05-23 14:09:36.000000000 +0200
++++ kdevelop3-3.2.2.new/src/projectmanager.cpp	2005-12-21 21:55:38.000000000 +0100
+@@ -607,7 +607,7 @@
+ 
+ QString ProjectManager::profileByAttributes(const QString &language, const QStringList &keywords)
+ {
+-    KConfig config(locate("data", "kdevelop/profiles/projectprofiles"));
++    KConfig config(locate("data", PROFILEDIR + QString("projectprofiles")));
+     config.setGroup(language);
+     
+     QStringList profileKeywords = QStringList::split("/", "Empty");

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/POTFILES.in
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/POTFILES.in	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/POTFILES.in	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/cs.po
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/cs.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/cs.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,40 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdevelop3\n"
+"Report-Msgid-Bugs-To: njordan at debian.org\n"
+"POT-Creation-Date: 2005-10-21 15:46+0200\n"
+"PO-Revision-Date: 2005-01-09 10:36+0100\n"
+"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
+"Language-Team: Czech <provoz at debian.cz>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Create a global documentation index?"
+msgstr "Vytvoøit globální index domunentace?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to create a global index of the KDE, QT and KDevelop "
+"documentation? This will allow all users to search the documentation."
+msgstr ""
+"Chcete vytvoøit globální index KDE, QT a KDevelop dokumentace? To umo¾ní "
+"prohledávání dokumentace v¹em u¾ivatelùm."

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/de.po
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/de.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/de.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,43 @@
+# translation of kdevelop3_4:3.1.0-2_templates.po to German
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Jens Nachtigall <nachtigall at web.de>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdevelop3\n"
+"Report-Msgid-Bugs-To: njordan at debian.org\n"
+"POT-Creation-Date: 2005-10-21 15:46+0200\n"
+"PO-Revision-Date: 2004-09-29 10:20+0200\n"
+"Last-Translator: Jens Nachtigall <nachtigall at web.de>\n"
+"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Create a global documentation index?"
+msgstr "Soll ein globaler Dokumentations-Index erstellt werden?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to create a global index of the KDE, QT and KDevelop "
+"documentation? This will allow all users to search the documentation."
+msgstr ""
+"WÃ¼nschen Sie, dass ein globaler Index fÃ¼r die KDE-, QT- und KDevelop-"
+"Dokumentation erstellt wird? Dadurch wÃ¤re die Dokumentation fÃ¼r alle "
+"Benutzer durchsuchbar."

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/fr.po
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/fr.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/fr.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,40 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdevelop3\n"
+"Report-Msgid-Bugs-To: njordan at debian.org\n"
+"POT-Creation-Date: 2005-10-21 15:46+0200\n"
+"PO-Revision-Date: 2004-02-27 16:00+0100\n"
+"Last-Translator: Eric Madesclair <eric-m at wanadoo.fr>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Create a global documentation index?"
+msgstr "Faut-il créer un index global pour la documentation ?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to create a global index of the KDE, QT and KDevelop "
+"documentation? This will allow all users to search the documentation."
+msgstr ""
+"La création d'un index global pour la documentation de KDE, QT et KDevelop "
+"permettra à tous les utilisateurs d'accéder à la documentation."

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/ja.po
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/ja.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/ja.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,41 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdevelop3\n"
+"Report-Msgid-Bugs-To: njordan at debian.org\n"
+"POT-Creation-Date: 2005-10-21 15:46+0200\n"
+"PO-Revision-Date: 2004-06-12 22:39+0900\n"
+"Last-Translator: Hideki Yamane <henrich at samba.gr.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Create a global documentation index?"
+msgstr "¥É¥¥å¥á¥ó¥ÈÁ´ÂÎ¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºîÀ®¤·¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to create a global index of the KDE, QT and KDevelop "
+"documentation? This will allow all users to search the documentation."
+msgstr ""
+"KDE¡¢QT¡¢KDevelop ¥É¥¥å¥á¥ó¥ÈÁ´ÂÎ¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºîÀ®¤·¤Þ¤¹¤«?¤³¤ì¤Ë¤è¤ê¡¢Á´"
+"¥æ¡¼¥¶¤¬¥É¥¥å¥á¥ó¥È¤ò¸¡º÷¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£"

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/nl.po
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/nl.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/nl.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,42 @@
+# translation of kdevelop3_4:3.0.1-2_nl.po to Dutch
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Frans Pop <aragorn at tiscali.nl>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdevelop3\n"
+"Report-Msgid-Bugs-To: njordan at debian.org\n"
+"POT-Creation-Date: 2005-10-21 15:46+0200\n"
+"PO-Revision-Date: 2004-03-10 21:42+0100\n"
+"Last-Translator: Frans Pop <aragorn at tiscali.nl>\n"
+"Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Create a global documentation index?"
+msgstr "Een systeembrede documentatie-index maken?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to create a global index of the KDE, QT and KDevelop "
+"documentation? This will allow all users to search the documentation."
+msgstr ""
+"Wilt u een systeembrede index van de KDE-, QT- en KDevelop -documentatie "
+"maken? Dit maakt het voor alle gebruikers mogelijk om in de documentatie te "
+"zoeken."

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/pt_BR.po
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/pt_BR.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/pt_BR.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,39 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: kdevelop3 4:3.2.0-1\n"
+"Report-Msgid-Bugs-To: njordan at debian.org\n"
+"POT-Creation-Date: 2005-10-21 15:46+0200\n"
+"PO-Revision-Date: 2005-05-26 17:55-0300\n"
+"Last-Translator: Caio Begotti <caio1982 at gmail.com>\n"
+"Language-Team: Debian l10n portuguese <debian-l10n-portuguese at lists.debian."
+"org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Create a global documentation index?"
+msgstr "Deseja criar um índice global da documentação?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to create a global index of the KDE, QT and KDevelop "
+"documentation? This will allow all users to search the documentation."
+msgstr ""
+"Deseja criar um índice global das documentações do KDE, QT e KDevelop?Dessa "
+"forma todos os usuários poderão pesquisar nas documentações."

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/sv.po
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/sv.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/sv.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,34 @@
+# Swedish translation of kdevelop3.
+# Copyright (C) 2005 THE kdevelop3'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kdevelop3 package.
+# Daniel Nylander <po at danielnylander.se>, 2005.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: kdevelop3 4:3.2.2-0.2\n"
+"Report-Msgid-Bugs-To: njordan at debian.org\n"
+"POT-Creation-Date: 2005-10-21 15:46+0200\n"
+"PO-Revision-Date: 2005-10-04 04:17+0200\n"
+"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
+"Language-Team: Swedish <sv at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Create a global documentation index?"
+msgstr "Skapa ett globalt dokumentationsindex?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to create a global index of the KDE, QT and KDevelop "
+"documentation? This will allow all users to search the documentation."
+msgstr ""
+"Vill du skapa ett globalt index av KDE, QT och KDevelop-dokumentationer? "
+"Detta innebär att användarna kan söka i dokumentationen."

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/templates.pot
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/templates.pot	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/templates.pot	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,31 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: njordan at debian.org\n"
+"POT-Creation-Date: 2005-10-21 15:46+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Create a global documentation index?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to create a global index of the KDE, QT and KDevelop "
+"documentation? This will allow all users to search the documentation."
+msgstr ""

Added: people/jriddell/KDE/3.5/kdevelop3/debian/po/vi.po
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/po/vi.po	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/po/vi.po	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+# Vietnamese Translation for kdevelop3.
+# Copyright Â© 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie at riverland.net.au>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdevelop3 4:3.2.0-3\n"
+"Report-Msgid-Bugs-To: njordan at debian.org\n"
+"POT-Creation-Date: 2005-10-21 15:46+0200\n"
+"PO-Revision-Date: 2005-06-06 11:49+0930\n"
+"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Create a global documentation index?"
+msgstr "Táº¡o má»™t má»¥c lá»¥c tÃ i liá»‡u toÃ n cá»¥c khÃ´ng?"
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to create a global index of the KDE, QT and KDevelop "
+"documentation? This will allow all users to search the documentation."
+msgstr ""
+"Báº¡n cÃ³ muá»‘n táº¡o má»™t má»¥c lá»¥c cÃ¡c tÃ i liá»‡u hÆ°á»›ng dáº«n loáº¡i KDE, QT vÃ  KDevelop "
+"khÃ´ng? LÃ m nhÆ° tháº¿ sáº½ cho phÃ©p má»i ngÆ°á»i dÃ¹ng tÃ¬m kiáº¿m trong cÃ¡c tÃ i liá»‡u áº¥y."

Added: people/jriddell/KDE/3.5/kdevelop3/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,73 @@
+#!/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
+
+ifneq (,$(findstring withjava,$(DEB_BUILD_OPTIONS)))
+	ifneq (,$(JAVA_HOME))
+		JAVA_FLAGS+= --with-java=$(JAVA_HOME)
+	endif
+endif
+
+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp
+DEB_CONFIGURE_EXTRA_FLAGS := \
+				--with-pic \
+				--with-kdelibsdoxy-dir=/usr/share/doc/kde/HTML/en/kdelibs-apidocs \
+				--enable-docbase \
+				--enable-scripting \
+				--enable-ada \
+				--enable-bash \
+				--enable-cpp \
+				--enable-fortran \
+				--enable-haskell \
+				--enable-java \
+				--enable-pascal \
+				--enable-perl \
+				--enable-php \
+				--enable-python \
+				--enable-ruby \
+				--enable-sql \
+				--enable-antproject \
+				--enable-autoproject \
+				--enable-customproject \
+				--enable-genericproject \
+				--enable-scriptproject \
+				--enable-trollproject \
+				--with-pythondir=/usr \
+				--enable-cvs \
+				--enable-subversion \
+				--enable-vba \
+				--with-qtdoc-dir=/usr/share/qt3/doc/html \
+				$(JAVA_FLAGS)
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+PACKAGES_WITH_LIBS := kdevelop3 kdevelop3-plugins
+
+install/kdevelop3::
+	install -d $(CURDIR)/debian/tmp/usr/share/kdevelop3
+	install debian/update_doc_index.sh $(CURDIR)/debian/tmp/usr/share/kdevelop3
+	# rename files in 'kdevelop3' package
+	mv debian/tmp/etc/kde3/kdeveloprc debian/tmp/etc/kde3/kdevelop3rc
+	mv debian/tmp/usr/bin/kdevelop debian/tmp/usr/bin/kdevelop3
+
+install/kdevelop3-data::
+	# rename files in 'kdevelop3-data' package
+	mv debian/tmp/usr/share/applications/kde/kdevelop.desktop debian/tmp/usr/share/applications/kde/kdevelop3.desktop
+	mv debian/tmp/usr/share/apps/kdevelop debian/tmp/usr/share/apps/kdevelop3
+	mv debian/tmp/usr/share/icons/hicolor/16x16/apps/kdevelop.png debian/tmp/usr/share/icons/hicolor/16x16/apps/kdevelop3.png
+	mv debian/tmp/usr/share/icons/hicolor/32x32/apps/kdevelop.png debian/tmp/usr/share/icons/hicolor/32x32/apps/kdevelop3.png
+	mv debian/tmp/usr/share/icons/hicolor/48x48/apps/kdevelop.png debian/tmp/usr/share/icons/hicolor/48x48/apps/kdevelop3.png
+	sh debian/create_lang_links.sh
+
+install/kdevelop3-doc::
+	# rename files in 'kdevelop3-doc'
+	mv debian/tmp/usr/share/doc/kde/HTML/en/kdevelop debian/tmp/usr/share/doc/kde/HTML/en/kdevelop3
+
+binary-post-install/%::
+# fix references to executables, icons and documentation
+# we also remove X-KDE-KDevelopIDE category that messes up the menu
+	if [ -d debian/$*/usr/share/applications ]; then \
+		find debian/$*/usr/share/applications -name \*.desktop -print | \
+		xargs --no-run-if-empty perl -pi -e 's:^Icon=kdevelop$$:Icon=kdevelop3:; s:^Exec=kdevelop :Exec=kdevelop3 :; s:^DocPath=kdevelop/:DocPath=kdevelop3/:; s:^(Categories=.*;)X-KDE-KDevelopIDE;:$$1:'; \
+	fi
+


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

Added: people/jriddell/KDE/3.5/kdevelop3/debian/templates
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/templates	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/templates	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+Template: kdevelop3/use_global_index
+Type: boolean
+Default: false
+_Description: Create a global documentation index?
+ Do you want to create a global index of the KDE, QT and KDevelop
+ documentation? This will allow all users to search the documentation.

Added: people/jriddell/KDE/3.5/kdevelop3/debian/update_doc_index.sh
===================================================================
--- people/jriddell/KDE/3.5/kdevelop3/debian/update_doc_index.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdevelop3/debian/update_doc_index.sh	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,158 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -x /usr/bin/htdig -o ! -x /usr/bin/htmerge ]; then
+  exit 0
+fi
+
+QTDOC_PACKAGE="qt3-doc"
+QTDOC_DIR="/usr/share/qt3/doc/html"
+KDELIBSDOC_PACKAGE="kdelibs4-doc"
+KDELIBSDOC_DIR="/usr/share/doc/kde/HTML/en/kdelibs-apidocs"
+KDEVELOPDOC_PACKAGE="kdevelop3-doc"
+KDEVELOPDOC_DIR="/usr/share/doc/kde/HTML/en/kdevelop"
+
+# Checks if a package is installed
+check_package_status() {
+  local package=${1}
+
+  if dpkg --status $package  2> /dev/null | grep '^Status: .* installed$' > /dev/null; then
+    echo "yes"
+  else
+    echo "no"
+  fi
+}
+
+GLOBAL_KDEVDOCTREEVIEW_DIR="/var/lib/kdevelop3"
+GLOBAL_HTDIG_DIR="$GLOBAL_KDEVDOCTREEVIEW_DIR/helpindex"
+HTDIG_DATA_DIR="/usr/share/apps/kdevdoctreeview"
+
+get_indexed_versions() {
+  if [ -e "$GLOBAL_HTDIG_DIR/package_versions" ]; then
+    . "$GLOBAL_HTDIG_DIR/package_versions"
+  else
+    QTDOC_VERSION="0.0"
+    KDEDOC_VERSION="0.0"
+    KDEVELOPDOC_VERSION="0.0"
+  fi
+}
+
+update_files_list() {
+  local pkgname=${1}
+  local pkgdir=${2}
+
+  find "$pkgdir" -name "*.html" | \
+    awk 'OFS=""; {print "file://", $0, " \\"}' > "$GLOBAL_HTDIG_DIR/$pkgname""_files"
+}
+
+doc_dirs="$QTDOC_DIR $KDELIBSDOC_DIR $KDEVELOPDOC_DIR"
+
+# Create the directory global htdig directory if necessary
+if [ ! -d "$GLOBAL_KDEVDOCTREEVIEW_DIR" ]; then
+  mkdir "$GLOBAL_KDEVDOCTREEVIEW_DIR"
+fi
+
+if [ ! -d "$GLOBAL_HTDIG_DIR" ]; then
+  mkdir "$GLOBAL_HTDIG_DIR"
+  initial="-i"
+else
+  if [ ! -e "$GLOBAL_HTDIG_DIR/db.docdb" ]; then
+    initial="-i"
+  else
+    initial=""
+  fi
+fi
+
+get_indexed_versions
+
+need_update=0
+
+# Check if the QT documentation needs to be (re)indexed
+qtdoc_status=`check_package_status "$QTDOC_PACKAGE"`
+version=`dpkg --status $QTDOC_PACKAGE  2> /dev/null | grep '^Version: ' | cut -d ' ' -f 2`
+if [ "$qtdoc_status" == "yes" ] &&
+   ( [ ! -e "$GLOBAL_HTDIG_DIR/qtdoc_files" ] ||
+   dpkg --compare-versions $version gt $QTDOC_VERSION ); then
+  QTDOC_VERSION="$version"
+  `update_files_list "qtdoc" "$QTDOC_DIR"`
+  need_update=1
+elif [ "$qtdoc_status" == "no" -a -e "$GLOBAL_HTDIG_DIR/qtdoc_files" ]; then
+  rm "$GLOBAL_HTDIG_DIR/qtdoc_files"
+fi
+
+# Check if the KDE documentation needs to be (re)indexed
+kdedoc_status=`check_package_status "$KDELIBSDOC_PACKAGE"`
+version=`dpkg --status $KDELIBSDOC_PACKAGE  2> /dev/null | grep '^Version: ' | cut -d ' ' -f 2`
+if [ "$kdedoc_status" == "yes" ] &&
+   ( [ ! -e "$GLOBAL_HTDIG_DIR/kdelibsdoc_files" ] ||
+   dpkg --compare-versions $version gt $KDEDOC_VERSION ); then
+  KDEDOC_VERSION="$version"
+  `update_files_list "kdelibsdoc" "$KDELIBSDOC_DIR"`
+  need_update=1
+elif [ "$kdedoc_status" == "no" -a -e "$GLOBAL_HTDIG_DIR/kdelibsdoc_files" ]; then
+  rm "$GLOBAL_HTDIG_DIR/kdelibsdoc_files"
+fi
+
+# Check if the KDevelop documentation needs to be (re)indexed
+kdevelopdoc_status=`check_package_status "$KDEVELOPDOC_PACKAGE"`
+version=`dpkg --status $KDEVELOPDOC_PACKAGE  2> /dev/null | grep '^Version: ' | cut -d ' ' -f 2`
+if [ "$kdevelopdoc_status" == "yes" ] &&
+   ( [ ! -e "$GLOBAL_HTDIG_DIR/kdevelopdoc_files" ] ||
+   dpkg --compare-versions $version gt $KDEVELOPDOC_VERSION ); then
+  KDEVELOPDOC_VERSION="$version"
+  `update_files_list "kdevelopdoc" "$KDEVELOPDOC_DIR"`
+  need_update=1
+elif [ "$kdevelopdoc_status" == "no" -a -e "$GLOBAL_HTDIG_DIR/kdevelopdoc_files" ]; then
+  rm "$GLOBAL_HTDIG_DIR/kdelibsdoc_files"
+fi
+
+if [ $need_update == 0 ]; then
+  exit 0
+fi
+
+# Create the htdig config file if necessary
+if [ ! -e "$GLOBAL_HTDIG_DIR/htdig.conf" ]; then
+  echo "# For htdig 3.2.x" >"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "database_dir:		$GLOBAL_HTDIG_DIR" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "include:		$GLOBAL_HTDIG_DIR/files" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "limit_urls_to:		file:///" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "local_urls:		file:///=/" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "local_urls_only:	true" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "maximum_pages:		1" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "image_url_prefix:	$HTDIG_DATA_DIR/pics/" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "star_image:		$HTDIG_DATA_DIR/pics/star.png" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "star_blank:		$HTDIG_DATA_DIR/pics/star_blank.png" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "compression_level:	6" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "max_hop_count:		1" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "search_results_wrapper:	$HTDIG_DATA_DIR/en/wrapper.html" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "nothing_found_file:	$HTDIG_DATA_DIR/en/nomatch.html" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "syntax_error_file:	$HTDIG_DATA_DIR/en/syntax.html" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+  echo "bad_word_list:		$HTDIG_DATA_DIR/en/bad_words" >>"$GLOBAL_HTDIG_DIR/htdig.conf"
+fi
+
+# Create the list of files to index
+rm -f "$GLOBAL_HTDIG_DIR/files" 2> /dev/null
+echo "start_url: \\" > "$GLOBAL_HTDIG_DIR/files"
+if [ -e "$GLOBAL_HTDIG_DIR/qtdoc_files" ]; then
+  cat "$GLOBAL_HTDIG_DIR/qtdoc_files" >> "$GLOBAL_HTDIG_DIR/files"
+fi
+if [ -e "$GLOBAL_HTDIG_DIR/kdelibsdoc_files" ]; then
+  cat "$GLOBAL_HTDIG_DIR/kdelibsdoc_files" >> "$GLOBAL_HTDIG_DIR/files"
+fi
+if [ -e "$GLOBAL_HTDIG_DIR/kdevelopdoc_files" ]; then
+  cat "$GLOBAL_HTDIG_DIR/kdevelopdoc_files" >> "$GLOBAL_HTDIG_DIR/files"
+fi
+# Strip the backslash from the last line
+cat "$GLOBAL_HTDIG_DIR/files" | sed '$s/ \\$//' > "$GLOBAL_HTDIG_DIR/files.new"
+mv "$GLOBAL_HTDIG_DIR/files.new" "$GLOBAL_HTDIG_DIR/files"
+
+# Index the files
+/usr/bin/htdig $initial -s -c "$GLOBAL_HTDIG_DIR/htdig.conf" > /dev/null 2>&1
+/usr/bin/htmerge -s -c "$GLOBAL_HTDIG_DIR/htdig.conf" > /dev/null 2>&1
+
+# Mark the current package versions as indexed
+echo "QTDOC_VERSION=\"$QTDOC_VERSION\"" > "$GLOBAL_HTDIG_DIR/package_versions"
+echo "KDEDOC_VERSION=\"$KDEDOC_VERSION\"" >> "$GLOBAL_HTDIG_DIR/package_versions"
+echo "KDEVELOPDOC_VERSION=\"$KDEVELOPDOC_VERSION\"" >> "$GLOBAL_HTDIG_DIR/package_versions"
+chmod 0764 "$GLOBAL_HTDIG_DIR/package_versions"

Added: people/jriddell/KDE/3.5/kdewebdev/debian/.cvsignore
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/.cvsignore	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/.cvsignore	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,15 @@
+*.debhelper
+*.substvars
+debiandirs
+files
+kdewebdev
+kdewebdev-doc-html
+kfilereplace
+kimagemapeditor
+klinkstatus
+kommander
+kommander-dev
+kxsldbg
+quanta
+quanta-data
+tmp

Added: people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/debian-qt-kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/kde.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/kde.mk	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,88 @@
+# -*- 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-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
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif

Added: people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/simple-patchsys.mk	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/cdbs/versions.pl	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/changelog	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/changelog	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,549 @@
+kdewebdev (4:3.5.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 23 Jan 2006 23:06:11 +0000
+
+kdewebdev (4:3.5.0-1ubuntu1) dapper; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  9 Dec 2005 23:08:32 +0000
+
+kdewebdev (4:3.5.0-1) alioth; urgency=low
+
+  * New upstream release.
+
+  * Bump DH_COMPAT to 5. No changes.
+
+  * Add kdewebdev-dbg, to help track down problems.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue,  6 Dec 2005 13:44:49 -0500
+
+kdewebdev (4:3.5.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * Remove gcc 3.4 for hppa
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue,  6 Dec 2005 12:29:38 +0000
+
+kdewebdev (4:3.5-rc2-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2005 23:09:10 +0000
+
+kdewebdev (4:3.4.3-2) unstable; urgency=low
+
+  * Upload to unstable, rebuilding against kdelibs4c2a.
+
+  +++ Changes by Adeodato SimÃ³:
+
+  * Do not build with g++-3.4 on arm, m68k and hppa, now that #323133 is fixed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon,  5 Dec 2005 09:28:57 -0500
+
+kdewebdev (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Build with g++-3.4 on arm, m68k and hppa, as kdewebdev fails with the same gcc
+    4.0 ICE as do most other KDE modules.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Oct 2005 16:27:42 -0400
+
+kdewebdev (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_4_BRANCH update.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue,  6 Sep 2005 14:04:31 -0400
+
+kdewebdev (4:3.4.3-0ubuntu2) breezy; urgency=low
+
+  * Do not install missing man pages
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sun,  9 Oct 2005 13:18:37 +0100
+
+kdewebdev (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat,  8 Oct 2005 22:06:45 +0000
+
+kdewebdev (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:26:27 +0000
+
+kdewebdev (4:3.4.1-0ubuntu2) breezy; urgency=low
+
+  * Add libxi-dev Build-Dep to fix FTBFS with new X.org splitup.
+
+ -- Fabio M. Di Nitto <fabbione at ubuntu.com>  Fri, 01 Jul 2005 06:25:23 +0200
+
+kdewebdev (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 01:04:05 +0000
+
+kdewebdev (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 26 May 2005 15:49:35 +0000
+
+kdewebdev (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+  * Add 10_kommander_aboutdata.diff that allows the kommander-editor to find
+    its handbook.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  2 Jun 2005 13:45:58 -0400
+
+kdewebdev (4:3.4.0-0pre3) alioth; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_4_BRANCH update.
+
+  +++ Changes by Pierre Habouzit:
+
+  * Converted packaging to CDBS.
+  * [debian/control] kdewebdev is now handled by the debian-qt-kde team.
+
+  +++ Changes by Isaac Clerencia:
+
+  * Added a Quanta docrc file for DocBook
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Apr 2005 10:48:15 -0400
+
+kdewebdev (1:3.3.2-6) unstable; urgency=high
+
+  * Security upload.
+  * Fixed the patch for CAN-2005-0754.  The previous patch from 1:3.3.2-5 was
+    incorrect, and still allowed execution of files served from /tmp.
+
+ -- Ben Burton <bab at debian.org>  Thu,  5 May 2005 14:32:03 +1000
+
+kdewebdev (1:3.3.2-5) unstable; urgency=high
+
+  * Security upload.
+  * Fixed untrusted code execution in kommander (closes: #305833).
+    See the following URL for further information:
+    - http://www.kde.org/info/security/advisory-20050420-1.txt
+    References: CAN-2005-0754
+
+ -- Ben Burton <bab at debian.org>  Mon, 25 Apr 2005 20:50:21 +1000
+
+kdewebdev (1:3.3.2-4) unstable; urgency=low
+
+  * Included the full text of the GFDL in debian/copyright, which applies to
+    the docbook documentation.
+  * Added scripts extractkmdr and kmdr2po to the kommander package, along with
+    additional documentation (closes: #296400).  Added a depends on gettext
+    accordingly.
+
+ -- Ben Burton <bab at debian.org>  Fri, 25 Mar 2005 17:06:55 +1100
+
+kdewebdev (1:3.3.2-3) unstable; urgency=low
+
+  * Updated from KDE_3_3_BRANCH.
+  * Bugfixes from KDE_3_3_BRANCH include a fix for the broken detection
+    of whether a file has changed (closes: #281022).
+
+ -- Ben Burton <bab at debian.org>  Thu, 10 Feb 2005 22:04:22 +1100
+
+kdewebdev (1:3.3.2-2) unstable; urgency=low
+
+  * Removed empty lines from php.docrc, thereby fixing command-line
+    warnings when starting quanta (closes: #278560).
+  * Fixed ExecButton output when using kommander with pipes;
+    thanks to Michal Schmidt for the patch (closes: #288309).
+
+ -- Ben Burton <bab at debian.org>  Sun,  6 Feb 2005 17:51:59 +1100
+
+kdewebdev (1:3.3.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Fixed typo in kommander package description.
+
+ -- Ben Burton <bab at debian.org>  Sat, 22 Jan 2005 10:24:58 +1100
+
+kdewebdev (1:3.3.1-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Build-conflicts with autoconf2.13, which does not play well with
+    Makefile.common.
+  * Patched kimagemapeditor to fix command-line opening of graphics files.
+  * Patched quanta to fix incorrect numerical code for non-breaking space
+    (closes: #275727).
+
+ -- Ben Burton <bab at debian.org>  Wed, 10 Nov 2004 07:45:35 +1100
+
+kdewebdev (1:3.3.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Source package has been renamed from quanta to kdewebdev.
+  * New binary packages kimagemapeditor, klinkstatus, kommander-dev and
+    kdewebdev-doc-html.
+  * Patched so that kafkapart is no longer skipped under KDE 3.3, thus
+    fixing a FTBFS on sid (closes: #261629, #269340, #272767).
+  * Pumped up the dependencies for quanta, which with each new release makes
+    more use of external tools:
+      - kfilereplace and tidy have moved from recommends to depends;
+      - cervisia and kompare have moved from suggests to recommends;
+      - also added klinkstatus (depends), gnupg (recommends), gubed
+        and kimagemapeditor (suggests).
+    Note in particular that gubed is not yet available for debian, but it
+    integrates with Quanta and the Quanta developers highly recommend it.
+  * Updated php.docrc from Quanta's SourceForge download site.
+  * Updated instructions on integrating external reference documentation into
+    Quanta.
+
+ -- Ben Burton <bab at debian.org>  Mon, 18 Oct 2004 21:03:04 +1000
+
+quanta (1:3.2.3-2) unstable; urgency=low
+
+  * More bugfixes from BRANCH.
+  * Includes a fix for quanta crashing or freezing when pressing return inside
+    comments (closes: #256056).
+  * Reverted the kommander examples from CVS HEAD to their initial Feb 2004
+    checkin, so that the examples work with kommander 3.2.3 (many of the
+    later examples rely on features new to 3.3).
+  * Don't compress kommander examples, so that kmdr-executor can run them.
+
+ -- Ben Burton <bab at debian.org>  Fri, 30 Jul 2004 12:38:21 +1000
+
+quanta (1:3.2.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Split quanta package into quanta + quanta-data (closes: #233435).
+  * Included kommander examples taken from CVS HEAD (closes: #247807).
+
+ -- Ben Burton <bab at debian.org>  Tue,  8 Jun 2004 17:18:14 +1000
+
+quanta (1:3.2.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab at debian.org>  Mon, 26 Apr 2004 09:25:01 +1000
+
+quanta (1:3.2.1-2) unstable; urgency=low
+
+  * Don't use Conflicts/Replaces where we should just use Replaces.
+  * Have quanta depend on kommander, which it silently uses for a number of
+    plugins/etc (closes: #238199).
+
+ -- Ben Burton <bab at debian.org>  Tue, 16 Mar 2004 09:15:01 +1100
+
+quanta (1: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
+
+quanta (1: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 kdewebdev metapackage.
+
+ -- Ben Burton <bab at debian.org>  Mon, 23 Feb 2004 08:14:22 +1100
+
+quanta (1: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
+
+quanta (1:3.1.5-2) unstable; urgency=low
+
+  * Build-conflict with automake1.4 since this is causing some buildd
+    problems.
+
+ -- Ben Burton <bab at debian.org>  Tue, 20 Jan 2004 16:39:32 +1100
+
+quanta (1:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab at debian.org>  Sun, 18 Jan 2004 12:55:12 +1100
+
+quanta (1:3.1.4-2) unstable; urgency=low
+
+  * Built against new libXrender.
+
+ -- Ben Burton <bab at debian.org>  Fri, 12 Dec 2003 11:02:33 +1100
+
+quanta (1:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab at debian.org>  Mon, 29 Sep 2003 15:08:53 +1000
+
+quanta (1:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab at debian.org>  Wed, 13 Aug 2003 11:02:26 +1000
+
+quanta (1:3.1.2-2) unstable; urgency=low
+
+  * Fixed wdg-html-reference symlinks (closes: #198283).
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab at debian.org>  Sun, 20 Jul 2003 12:18:23 +1000
+
+quanta (1:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Debian menu pixmaps no longer use a restricted colour map.
+  * Man page overhaul.
+
+ -- Ben Burton <bab at debian.org>  Sun,  1 Jun 2003 14:15:47 +1000
+
+quanta (1:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Legacy Qt headers no longer used (thanks Ralf!).
+
+ -- Ben Burton <bab at debian.org>  Sat, 22 Mar 2003 16:18:51 +1100
+
+quanta (1:3.1.0-4) unstable; urgency=low
+
+  * Build-depends on libqt3-compat-headers (closes: #184698).
+  * Removed alpha compile flags.
+  * Fresh admin/ pull.
+  * Until we upload a new source revision, forcibly delete stale files in
+    debian/ before building.
+
+ -- Ben Burton <bab at debian.org>  Mon, 17 Mar 2003 08:45:39 +1100
+
+quanta (1:3.1.0-3) unstable; urgency=low
+
+  * Split kommander out into a separate package.
+  * Reflect new location of Qt headers.
+
+ -- Ben Burton <bab at debian.org>  Mon, 24 Feb 2003 12:24:53 +1100
+
+quanta (1:3.1.0-2) unstable; urgency=low
+
+  * First KDE3 upload to debian (closes: #164599).
+  * Updated PHP documentation index (closes: #96787).
+  * Latin characters are displayed correctly (closes: #124005).
+
+ -- Ben Burton <bab at debian.org>  Mon,  3 Feb 2003 00:39:42 +1100
+
+quanta (1:3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <bab at debian.org>  Mon, 18 Nov 2002 14:15:59 +1100
+
+quanta (1:3.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Built with g++-3.2.
+
+ -- Ben Burton <benb at acm.org>  Wed, 30 Oct 2002 23:25:49 +1100
+
+quanta (1:3.0pr2a-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Wed, 11 Sep 2002 08:59:30 +1000
+
+quanta (1:3.0pr2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Mon,  9 Sep 2002 00:24:42 +1000
+
+quanta (1:3.0pr1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Built for KDE3.
+
+ -- Ben Burton <benb at acm.org>  Wed,  4 Sep 2002 10:36:12 +1000
+
+quanta (1:2.0.1-3) unstable; urgency=low
+
+  * Grammar, typo and consistency fixes, thanks to Neil Darlow
+    (closes: Bug#141481).
+
+ -- Ben Burton <benb at acm.org>  Mon,  8 Apr 2002 11:38:04 +1000
+
+quanta (1:2.0.1-2) unstable; urgency=low
+
+  * Fixed g++ 3.0 errors, thanks to Petter Reinholdtsen (closes: Bug#129313).
+  * Ensures ./configure only runs once.
+
+ -- Ben Burton <benb at acm.org>  Tue, 29 Jan 2002 17:48:45 +1100
+
+quanta (1:2.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb at acm.org>  Sat, 15 Dec 2001 08:38:41 -0600
+
+quanta (1:2.0.0-1) unstable; urgency=low
+
+  * New upstream release (closes: Bug#89393, Bug#111571).
+  * Converted /usr/share/pixmaps/quanta.xpm to locolor.
+
+ -- Ben Burton <benb at acm.org>  Sat,  8 Dec 2001 11:44:15 -0600
+
+quanta (1:2.0-pr2-7) unstable; urgency=low
+
+  * No longer uses automake (closes: Bug#116225).
+  * Now recommends wdg-html-reference since it's moved to main.
+  * Removed redundant uic from build-depends.
+
+ -- Ben Burton <benb at acm.org>  Tue, 23 Oct 2001 14:17:53 -0500
+
+quanta (1:2.0-pr2-6) unstable; urgency=low
+
+  * Updated parameters for alpha build.
+
+ -- Ben Burton <benb at acm.org>  Sun, 23 Sep 2001 23:07:01 -0500
+
+quanta (1:2.0-pr2-5) unstable; urgency=low
+
+  * Cleaned up debian/rules.
+
+ -- Ben Burton <benb at acm.org>  Thu,  9 Aug 2001 12:29:30 +1000
+
+quanta (1:2.0-pr2-4) unstable; urgency=low
+
+  * Build-depends on a newer version of kdelibs (closes: Bug#104234).
+  * Builds on alpha.
+  * Upped standards-version to 3.5.6.
+
+ -- Ben Burton <benb at acm.org>  Tue,  7 Aug 2001 00:31:15 +1000
+
+quanta (1:2.0-pr2-3) unstable; urgency=low
+
+  * Removed redundancies from build-depends.
+  * Cosmetic changes in debian/.
+
+ -- Ben Burton <benb at acm.org>  Mon, 21 May 2001 10:48:13 -0500
+
+quanta (1:2.0-pr2-2) unstable; urgency=low
+
+  * Fleshed out man page.
+
+ -- Ben Burton <benb at acm.org>  Mon,  7 May 2001 07:58:17 -0500
+
+quanta (1:2.0-pr2-1) unstable; urgency=low
+
+  * New upstream release (closes: #89394).
+  * Upgraded Standards-Version to 3.5.2.
+  * Upgraded debian/rules to DH_COMPAT=3.
+  * Build-Depends: required version (>> 3.0.0) of debhelper.
+  * Fixed table of contents entry in docrc/php.docrc.
+  * Added kderemove="1" to the debian menu item.
+  * Miscellaneous cleanups in debian.
+
+ -- Ben Burton <benb at acm.org>  Sat, 14 Apr 2001 20:21:15 +1000
+
+quanta (1:2.0-pr1-4) unstable; urgency=low
+
+  * Replaced /usr/lib/quanta/plugins/weblint with a symlink to
+    /usr/bin/weblint (closes: Bug#88936).
+  * Depends: Replaced perl | perl5 with weblint.
+
+ -- Ben Burton <benb at acm.org>  Sat, 10 Mar 2001 17:19:26 -0600
+
+quanta (1:2.0-pr1-3) unstable; urgency=low
+
+  * Rebuilt for new libqt2 libraries.
+
+ -- Ben Burton <benb at acm.org>  Tue,  6 Mar 2001 07:49:40 -0600
+
+quanta (1:2.0-pr1-2) unstable; urgency=low
+
+  * Build-Depends: Replaced kdelibs3-dev with kdelibs-dev.
+  * Corrected upstream author's email address (pdima at kde.org -> dima at kde.org).
+
+ -- Ben Burton <benb at acm.org>  Thu, 22 Feb 2001 12:12:25 -0600
+
+quanta (1:2.0-pr1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Adopted by Ben Burton <benb at acm.org> (closes: Bug#84540).
+  * Introduced a new epoch to fix version numbers.
+  * Added a (fairly uninformative) man page and README.Debian.
+  * Upgraded debian/rules to DH_COMPAT=2.
+  * Build-Depends: added uic.
+  * Build-Depends: required version (>> 2.0.0) of debhelper.
+  * Build-Depends: replaced the required version of kdelibs3-dev with
+    the version cited in the corresponding bugfix (#79410).
+  * Commented out lintian overrides for deleted plugin libproject.so
+    and added overrides for new plugin libftpclient.so.
+  * Retitled the Quanta menu item to Quanta Plus.
+  * Miscellaneous cleanups in debian.
+
+ -- Ben Burton <benb at acm.org>  Sun, 18 Feb 2001 12:00:03 -0600
+
+quanta (2.1-20010121-1) unstable; urgency=low
+
+  * New upstream sources.
+  * Depends: added 'perl | perl5' for weblint.
+  * More build fixes.
+  * Upload sponsored by Bradley Bell <btb at debian.org>.
+
+ -- Mariusz Przygodzki <dune at home.pl>  Sun, 21 Jan 2001 17:40:52 +0100
+
+quanta (2.1-20010116-1) unstable; urgency=low
+
+  * New upstream sources.
+  * Updated to Standards-Version 3.2.1.
+  * Build-Depends: removed jade, sgml-base, docbook and docbook-stylesheets.
+  * More build fixes.
+
+ -- Mariusz Przygodzki <dune at home.pl>  Sat, 20 Jan 2001 19:49:39 +0100
+
+quanta (2.0-beta4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-Depends: added jade, sgml-base, docbook and docbook-stylesheets.
+  * Upload sponsored by Bradley Bell <btb at debian.org>.
+
+ -- Mariusz Przygodzki <dune at home.pl>  Sun, 24 Dec 2000 15:46:16 +0100
+
+quanta (2.0-beta3-2) unstable; urgency=low
+
+  * Recommends: added phpdoc.
+  * Suggests: added wdg-html-reference.
+  * Added css.docrc, html.docrc and php.docrc for indexing docs from
+    phpdoc and wdg-html-reference.
+  * Build-Depends: provides required versions of kdelibs3-dev for 
+    autobuilders (closes: #79410).
+  * More cleanups in debian.
+  * Upload sponsored by Bradley Bell <btb at debian.org>.
+
+ -- Mariusz Przygodzki <dune at home.pl>  Mon, 11 Dec 2000 22:47:35 +0100
+
+quanta (2.0-beta3-1) unstable; urgency=low
+
+  * Initial Release. Closes: #75159
+  * Added admin stuff from KDE distribution.
+  * Removed many overriding commands from Makefile.am's.
+  * Upload sponsored by Bradley Bell <btb at debian.org>.
+
+ -- Mariusz Przygodzki <dune at home.pl>  Sat, 25 Nov 2000 15:35:08 +0100
+
+Local variables:
+mode: debian-changelog
+End:

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

Added: people/jriddell/KDE/3.5/kdewebdev/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/control	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/control	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,199 @@
+Source: kdewebdev
+Section: web
+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 net.com.org.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 (>= 5.0), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.1), libcvsservice-dev (>= 4:3.5.0), libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo
+Standards-Version: 3.6.2
+
+Package: kdewebdev
+Architecture: all
+Section: kde
+Depends: quanta (>= ${Source-Version}), kfilereplace (>= ${Source-Version}), kimagemapeditor (>= ${Source-Version}), klinkstatus (>= ${Source-Version}), kommander (>= ${Source-Version}), kxsldbg (>= ${Source-Version})
+Suggests: kommander-dev (>= ${Source-Version}), kdewebdev-doc-html (>= ${Source-Version})
+Description: web development apps 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 web development applications
+ provided with the official release of KDE.
+
+Package: kdewebdev-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdewebdev
+Replaces: kxsldbg (<< 1:3.3.0), quanta (<< 1:3.3.0)
+Description: KDE web development 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 web development 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/quanta/. Documentation is provided for most
+ KDE web development packages.
+ .
+ This package is part of KDE, as a component of the KDE web development module.
+ See the 'kde' and 'kdewebdev' packages for more information.
+
+Package: quanta
+Architecture: any
+Section: web
+Depends: ${shlibs:Depends}, kfilereplace (= ${Source-Version}), klinkstatus (= ${Source-Version}), kommander (= ${Source-Version}), quanta-data (= ${Source-Version}), tidy
+Recommends: cervisia, gnupg, kompare, kxsldbg (= ${Source-Version}), phpdoc, wdg-html-reference, docbook-defguide
+Suggests: gubed, kimagemapeditor (= ${Source-Version}), wget, khelpcenter
+Description: web development environment for KDE
+ Quanta Plus is a web development environment for working with HTML
+ and associated languages. It strives to be neutral and transparent
+ to all markup languages, while supporting popular web-based scripting
+ languages, CSS and other emerging W3C recommendations.
+ .
+ Quanta Plus supports many external components, debuggers and other tools
+ for web development, several of which are shipped with the KDE web
+ development module.
+ .
+ Quanta Plus is not in any way affiliated with any commercial versions
+ of Quanta. The primary coders from the original team left the GPL'd
+ version to produce a commercial product.
+ .
+ This package is part of KDE, as a component of the KDE web development module.
+ See the 'kde' and 'kdewebdev' packages for more information.
+ .
+ Homepage: http://quanta.sourceforge.net
+
+Package: quanta-data
+Architecture: all
+Section: web
+Recommends: quanta (= ${Source-Version})
+Replaces: quanta (<< 1:3.2.3)
+Description: data files for Quanta Plus web development environment
+ This package contains architecture-independent data files for Quanta
+ Plus, a web development environment for working with HTML and associated
+ languages.
+ .
+ See the quanta package for further information.
+ .
+ This package is part of KDE, as a component of the KDE web development module.
+ See the 'kde' and 'kdewebdev' packages for more information.
+
+Package: kfilereplace
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}
+Suggests: quanta (= ${Source-Version})
+Description: batch search-and-replace component for KDE
+ KFileReplace is an embedded component for KDE that acts as a batch
+ search-and-replace tool. It allows you to replace one expression with
+ another in many files at once.
+ .
+ Note that at the moment KFileReplace does not come as a standalone
+ application. An example of an application that uses the KFileReplace
+ component is Quanta Plus (found in the package quanta).
+ .
+ This package is part of KDE, as a component of the KDE web development module.
+ See the 'kde' and 'kdewebdev' packages for more information.
+
+Package: kimagemapeditor
+Architecture: any
+Section: web
+Depends: ${shlibs:Depends}
+Suggests: quanta (= ${Source-Version})
+Description: HTML image map editor for KDE
+ KImageMapEditor is a tool that allows you to edit image maps in HTML
+ files. As well as providing a standalone application, KImageMapEditor
+ makes itself available as a KPart for embedding into larger applications.
+ .
+ This package is part of KDE, as a component of the KDE web development module.
+ See the 'kde' and 'kdewebdev' packages for more information.
+
+Package: klinkstatus
+Architecture: any
+Section: web
+Depends: ${shlibs:Depends}
+Suggests: quanta (= ${Source-Version}), khelpcenter
+Description: web link validity checker for KDE
+ KLinkStatus is KDE's web link validity checker. It allows you to
+ search internal and external links throughout your web site. Simply
+ point it to a single page and choose the depth to search.
+ .
+ You can also check local files, or files over ftp:, fish: or any other
+ KIO protocols. For performance, links can be checked simultaneously.
+ .
+ This package is part of KDE, as a component of the KDE web development module.
+ See the 'kde' and 'kdewebdev' packages for more information.
+
+Package: kommander
+Architecture: any
+Section: kde
+Depends: ${shlibs:Depends}, gettext
+Replaces: quanta (<< 1:3.1.0-3)
+Suggests: kommander-dev (= ${Source-Version}), quanta (= ${Source-Version}), khelpcenter
+Description: visual dialog builder and executor tool
+ Kommander is a visual dialog building tool whose primary objective is
+ to create as much functionality as possible without using any scripting
+ language.
+ .
+ More specifically, Kommander is a set of tools that allow you to create
+ dynamic GUI dialogs that generate, based on their state, a piece of
+ text. The piece of text can be a command line to a program, any piece
+ of code, business documents that contain a lot of repetitious or
+ templated text and so on.
+ .
+ The resulting generated text can then be executed as a command line
+ program (hence the name "Kommander"), written to a file, passed to a
+ script for extended processing, and literally anything else you can
+ think of. And you aren't required to write a single line of code!
+ .
+ As well as building dialogs, Kommander may be expanded to create full
+ mainwindow applications.
+ .
+ This package is part of KDE, as a component of the KDE web development module.
+ See the 'kde' and 'kdewebdev' packages for more information.
+
+Package: kommander-dev
+Architecture: any
+Section: libdevel
+Depends: kommander (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.0)
+Replaces: kommander (<< 1:3.3.0)
+Description: development files for Kommander
+ This package contains the headers and other development files for
+ building plugins or otherwise extending Kommander.
+ .
+ Kommander is a visual dialog building tool whose primary objective is
+ to create as much functionality as possible without using any scripting
+ language.
+ .
+ See the kommander package for further information.
+ .
+ This package is part of KDE, as a component of the KDE web development module.
+ See the 'kde' and 'kdewebdev' packages for more information.
+
+Package: kxsldbg
+Architecture: any
+Section: text
+Depends: ${shlibs:Depends}
+Suggests: quanta (= ${Source-Version}), khelpcenter
+Replaces: quanta (<< 1:3.2.0)
+Description: graphical XSLT debugger for KDE
+ KXSLDbg is a debugger for XSLT scripts. It includes a graphical user
+ interface as well as a text-based debugger. KXSLDbg can be run as a
+ standalone application or as an embedded KDE part.
+ .
+ XSLT is an XML language for defining transformations of XML files from
+ XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
+ using standard XSLT stylesheets.
+ .
+ This package is part of KDE, as a component of the KDE web development module.
+ See the 'kde' and 'kdewebdev' packages for more information.
+
+Package: kdewebdev-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Description: debugging symbols for kdewebdev
+ This package contains the debugging symbols associated with kdewebdev.
+ They will automatically be used by gdb for debugging kdewebdev-related
+ issues.

Added: people/jriddell/KDE/3.5/kdewebdev/debian/copyright
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/copyright	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/copyright	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,448 @@
+This package was debianized by Mariusz Przygodzki <dune at home.pl> on
+Sat, 25 Nov 2000 15:35:08 +0100.
+Maintenance was taken over by Ben Burton <bab at debian.org> on
+Sun, 18 Feb 2001 12:00:03 -0600.
+Thanks to Joerg Jaspert and Riku Voipio for originally packaging
+KImageMapEditor.
+
+This package was downloaded via CVS from cvs.kde.org.
+
+Upstream Authors:
+
+  Quanta Plus: Eric Laffoon <sequitur at kde.org> and
+      Andras Mantia <amantia at kde.org>, with inactive authors
+      Dmitry Poplavsky <dima at kde.org> and Alexander Yakovlev <yshurik at kde.org>
+  KFileReplace: François Dupoux <fdupoux at dupoux.com> and
+      Andras Mantia <amantia at kde.org>
+  KImageMapEditor: Jan Schäfer <janschaefer at users.sourceforge.net>
+  KLinkStatus: Paulo Moura Guedes <moura at kdewebdev.org>
+  Kommander: Marc Britton <consume at optusnet.com.au>,
+      Eric Laffoon <sequitur at kde.org>, Michal Rudolf <mrudolf at kdewebdev.org>,
+      Andras Mantia <amantia at kde.org> and Trolltech
+  KXSLDbg: Keith Isdale <k_isdale at tpg.com.au>
+
+Quanta Plus is not in any way affiliated with any commercial versions of
+Quanta.  The primary coders from the original team left the GPL'd
+version to produce a commercial product.
+
+Copyright:
+
+  All components of this package are released under the GNU General
+  Public License (GPL), with the following exceptions:
+
+    DocBook documentation: (see below)
+
+  On Debian GNU/Linux systems, the complete text of the GNU General
+  Public License can be found in `/usr/share/common-licenses/GPL'.
+
+  --------------------
+
+  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/kdewebdev/debian/docrc/css.docrc
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/docrc/css.docrc	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/docrc/css.docrc	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,30 @@
+# KDE Config File
+[Tree]
+
+Doc dir=css
+
+#top level elements
+Top Element=Cascading Style Sheets
+
+Cascading Style Sheets=TOC,Font,Background and Color,Text,Box,Classification,Units
+TOC=index.html
+Font=font/index.html
+Background and Color=color-background/index.html
+Text=text/index.html
+Box=box/index.html
+Classification=classification/index.html
+Units=units.html
+
+
+
+# keywords for context help
+[Context]
+
+ContextList=font-family,font-style,font-variant,font-weight,font-size
+
+font-family=font/font-family.html
+font-style=font/font-style.html
+font-variant=font/font-variant.html
+font-weight=font/font-weight.html
+font-size=font/font-size.html
+

Added: people/jriddell/KDE/3.5/kdewebdev/debian/docrc/docbook.docrc
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/docrc/docbook.docrc	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/docrc/docbook.docrc	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,426 @@
+# KDE Config File
+[Tree]
+
+Doc dir=docbook
+
+#top level elements
+Top Element=DocBook: The Definitive Guide
+DocBook: The Definitive Guide=#Introduction,#Reference
+
+Introduction=Getting Started with SGML/XML,Creating DocBook Documents,Parsing DocBook Documents,Publishing DocBook Documents,Customizing DocBook
+Getting Started with SGML/XML=ch-gssgml.html
+Creating DocBook Documents=ch-create.html
+Parsing DocBook Documents=ch-parse.html
+Publishing DocBook Documents=ch-publish.html
+Customizing DocBook=app-customizing.html
+
+Reference=DocBook Element Reference,DocBook Parameter Entity Reference,DocBook Character Entity Reference
+
+DocBook Element Reference=ref-element.html
+DocBook Parameter Entity Reference=ref-parement.html
+DocBook Character Entity Reference=ref-charent.html
+
+# keywords for context help
+[Context]
+
+ContextList=abbrev,abstract,accel,ackno,acronym,action,address,affiliation,alt,anchor,answer,appendix,appendixinfo,application,area,areaset,areaspec,arg,article,articleinfo,artpagenums,attribution,audiodata,audioobject,authorblurb,author,authorgroup,authorinitials,beginpage,bibliocoverage,bibliodiv,biblioentry,bibliography,bibliographyinfo,biblioid,bibliomisc,bibliomixed,bibliomset,bibliorelation,biblioset,bibliosource,blockinfo,blockquote,book,bookinfo,bridgehead,callout,calloutlist,caption,caution,chapter,chapterinfo,citation,citebiblioid,citerefentry,citetitle,city,classname,classsynopsis,classsynopsisinfo,cmdsynopsis,co,collab,collabname,colophon,colspec,command,computeroutput,confdates,confgroup,confnum,confsponsor,conftitle,constant,constraintdef,constraint,constructorsynopsis,contractnum,contractsponsor,contrib,copyright,coref,corpauthor,corpname,country,database,date,dedication,destructorsynopsis,edition,editor,email,emphasis,entry,entrytbl,envar,epigraph,equation,errorcode,errorname,errortext,errortype,example,exceptionname,fax,fieldsynopsis,figure,filename,firstname,firstterm,footnote,footnoteref,foreignphrase,formalpara,funcdef,funcparams,funcprototype,funcsynopsis,funcsynopsisinfo,function,glossary,glossaryinfo,glossdef,glossdiv,glossentry,glosslist,glossseealso,glosssee,glossterm,graphicco,graphic,group,guibutton,guiicon,guilabel,guimenu,guimenuitem,guisubmenu,hardware,highlights,holder,honorific,html-form,imagedata,imageobjectco,imageobject,important,indexdiv,index,indexentry,indexinfo,indexterm,informalequation,informalexample,informalfigure,informaltable,initializer,inlineequation,inlinegraphic,inlinemediaobject,interface,interfacename,invpartnumber,isbn,issn,issuenum,itemizedlist,itermset,jobtitle,keycap,keycode,keycombo,keysym,keyword,keywordset,label,legalnotice,lhs,lineage,lineannotation,link,listitem,literal,literallayout,lot,lotentry,manvolnum,markup,medialabel,mediaobjectco,mediaobject,member,menuchoice,methodname,methodparam,methodsynopsis,mml-math,modespec,modifier,mousebutton,msgaud,msg,msgentry,msgexplan,msginfo,msglevel,msgmain,msgorig,msgrel,msgset,msgsub,msgtext,nonterminal,note,objectinfo,olink,ooclass,ooexception,oointerface,optional,option,orderedlist,orgdiv,orgname,otheraddr,othercredit,othername,pagenums,para,paramdef,parameter,part,partinfo,partintro,personblurb,personname,phone,phrase,pob,postcode,preface,prefaceinfo,primary,primaryie,printhistory,procedure,production,productionrecap,productionset,productname,productnumber,programlistingco,programlisting,prompt,property,pubdate,publisher,publishername,pubsnumber,qandadiv,qandaentry,qandaset,question,quote,refclass,refdescriptor,refentry,refentryinfo,refentrytitle,reference,referenceinfo,refmeta,refmiscinfo,refnamediv,refname,refpurpose,refsect1,refsect1info,refsect2,refsect2info,refsect3,refsect3info,refsection,refsectioninfo,refsynopsisdiv,refsynopsisdivinfo,releaseinfo,remark,replaceable,returnvalue,revdescription,revhistory,revision,revnumber,revremark,rhs,row,sbr,screenco,screen,screeninfo,screenshot,secondary,secondaryie,sect1,sect1info,sect2,sect2info,sect3,sect3info,sect4,sect4info,sect5,sect5info,section,sectioninfo,seealso,seealsoie,see,seeie,seg,seglistitem,segmentedlist,segtitle,seriesvolnums,set,setindex,setindexinfo,setinfo,sgmltag,shortaffil,shortcut,sidebar,sidebarinfo,simpara,simplelist,simplemsgentry,simplesect,spanspec,state,step,street,structfield,structname,subject,subjectset,subjectterm,subscript,substeps,subtitle,superscript,surname,svg-svg,symbol,synopfragment,synopfragmentref,synopsis,systemitem,table,tbody,term,tertiary,tertiaryie,textdata,textobject,tfoot,tgroup,thead,tip,titleabbrev,title,tocback,tocchap,toc,tocentry,tocfront,toclevel1,toclevel2,toclevel3,toclevel4,toclevel5,tocpart,token,trademark,type,ulink,userinput,varargs,variablelist,varlistentry,varname,videodata,videoobject,void,volumenum,warning,wordasword,xref,year,
+
+abbrev=abbrev.element.html
+abstract=abstract.element.html
+accel=accel.element.html
+ackno=ackno.element.html
+acronym=acronym.element.html
+action=action.element.html
+address=address.element.html
+affiliation=affiliation.element.html
+alt=alt.element.html
+anchor=anchor.element.html
+answer=answer.element.html
+appendix=appendix.element.html
+appendixinfo=appendixinfo.element.html
+application=application.element.html
+area=area.element.html
+areaset=areaset.element.html
+areaspec=areaspec.element.html
+arg=arg.element.html
+article=article.element.html
+articleinfo=articleinfo.element.html
+artpagenums=artpagenums.element.html
+attribution=attribution.element.html
+audiodata=audiodata.element.html
+audioobject=audioobject.element.html
+authorblurb=authorblurb.element.html
+author=author.element.html
+authorgroup=authorgroup.element.html
+authorinitials=authorinitials.element.html
+beginpage=beginpage.element.html
+bibliocoverage=bibliocoverage.element.html
+bibliodiv=bibliodiv.element.html
+biblioentry=biblioentry.element.html
+bibliography=bibliography.element.html
+bibliographyinfo=bibliographyinfo.element.html
+biblioid=biblioid.element.html
+bibliomisc=bibliomisc.element.html
+bibliomixed=bibliomixed.element.html
+bibliomset=bibliomset.element.html
+bibliorelation=bibliorelation.element.html
+biblioset=biblioset.element.html
+bibliosource=bibliosource.element.html
+blockinfo=blockinfo.element.html
+blockquote=blockquote.element.html
+book=book.element.html
+bookinfo=bookinfo.element.html
+bridgehead=bridgehead.element.html
+callout=callout.element.html
+calloutlist=calloutlist.element.html
+caption=caption.element.html
+caution=caution.element.html
+chapter=chapter.element.html
+chapterinfo=chapterinfo.element.html
+citation=citation.element.html
+citebiblioid=citebiblioid.element.html
+citerefentry=citerefentry.element.html
+citetitle=citetitle.element.html
+city=city.element.html
+classname=classname.element.html
+classsynopsis=classsynopsis.element.html
+classsynopsisinfo=classsynopsisinfo.element.html
+cmdsynopsis=cmdsynopsis.element.html
+co=co.element.html
+collab=collab.element.html
+collabname=collabname.element.html
+colophon=colophon.element.html
+colspec=colspec.element.html
+command=command.element.html
+computeroutput=computeroutput.element.html
+confdates=confdates.element.html
+confgroup=confgroup.element.html
+confnum=confnum.element.html
+confsponsor=confsponsor.element.html
+conftitle=conftitle.element.html
+constant=constant.element.html
+constraintdef=constraintdef.element.html
+constraint=constraint.element.html
+constructorsynopsis=constructorsynopsis.element.html
+contractnum=contractnum.element.html
+contractsponsor=contractsponsor.element.html
+contrib=contrib.element.html
+copyright=copyright.element.html
+coref=coref.element.html
+corpauthor=corpauthor.element.html
+corpname=corpname.element.html
+country=country.element.html
+database=database.element.html
+date=date.element.html
+dedication=dedication.element.html
+destructorsynopsis=destructorsynopsis.element.html
+edition=edition.element.html
+editor=editor.element.html
+email=email.element.html
+emphasis=emphasis.element.html
+entry=entry.element.html
+entrytbl=entrytbl.element.html
+envar=envar.element.html
+epigraph=epigraph.element.html
+equation=equation.element.html
+errorcode=errorcode.element.html
+errorname=errorname.element.html
+errortext=errortext.element.html
+errortype=errortype.element.html
+example=example.element.html
+exceptionname=exceptionname.element.html
+fax=fax.element.html
+fieldsynopsis=fieldsynopsis.element.html
+figure=figure.element.html
+filename=filename.element.html
+firstname=firstname.element.html
+firstterm=firstterm.element.html
+footnote=footnote.element.html
+footnoteref=footnoteref.element.html
+foreignphrase=foreignphrase.element.html
+formalpara=formalpara.element.html
+funcdef=funcdef.element.html
+funcparams=funcparams.element.html
+funcprototype=funcprototype.element.html
+funcsynopsis=funcsynopsis.element.html
+funcsynopsisinfo=funcsynopsisinfo.element.html
+function=function.element.html
+glossary=glossary.element.html
+glossaryinfo=glossaryinfo.element.html
+glossdef=glossdef.element.html
+glossdiv=glossdiv.element.html
+glossentry=glossentry.element.html
+glosslist=glosslist.element.html
+glossseealso=glossseealso.element.html
+glosssee=glosssee.element.html
+glossterm=glossterm.element.html
+graphicco=graphicco.element.html
+graphic=graphic.element.html
+group=group.element.html
+guibutton=guibutton.element.html
+guiicon=guiicon.element.html
+guilabel=guilabel.element.html
+guimenu=guimenu.element.html
+guimenuitem=guimenuitem.element.html
+guisubmenu=guisubmenu.element.html
+hardware=hardware.element.html
+highlights=highlights.element.html
+holder=holder.element.html
+honorific=honorific.element.html
+html-form=html-form.element.html
+imagedata=imagedata.element.html
+imageobjectco=imageobjectco.element.html
+imageobject=imageobject.element.html
+important=important.element.html
+indexdiv=indexdiv.element.html
+index=index.element.html
+indexentry=indexentry.element.html
+indexinfo=indexinfo.element.html
+indexterm=indexterm.element.html
+informalequation=informalequation.element.html
+informalexample=informalexample.element.html
+informalfigure=informalfigure.element.html
+informaltable=informaltable.element.html
+initializer=initializer.element.html
+inlineequation=inlineequation.element.html
+inlinegraphic=inlinegraphic.element.html
+inlinemediaobject=inlinemediaobject.element.html
+interface=interface.element.html
+interfacename=interfacename.element.html
+invpartnumber=invpartnumber.element.html
+isbn=isbn.element.html
+issn=issn.element.html
+issuenum=issuenum.element.html
+itemizedlist=itemizedlist.element.html
+itermset=itermset.element.html
+jobtitle=jobtitle.element.html
+keycap=keycap.element.html
+keycode=keycode.element.html
+keycombo=keycombo.element.html
+keysym=keysym.element.html
+keyword=keyword.element.html
+keywordset=keywordset.element.html
+label=label.element.html
+legalnotice=legalnotice.element.html
+lhs=lhs.element.html
+lineage=lineage.element.html
+lineannotation=lineannotation.element.html
+link=link.element.html
+listitem=listitem.element.html
+literal=literal.element.html
+literallayout=literallayout.element.html
+lot=lot.element.html
+lotentry=lotentry.element.html
+manvolnum=manvolnum.element.html
+markup=markup.element.html
+medialabel=medialabel.element.html
+mediaobjectco=mediaobjectco.element.html
+mediaobject=mediaobject.element.html
+member=member.element.html
+menuchoice=menuchoice.element.html
+methodname=methodname.element.html
+methodparam=methodparam.element.html
+methodsynopsis=methodsynopsis.element.html
+mml-math=mml-math.element.html
+modespec=modespec.element.html
+modifier=modifier.element.html
+mousebutton=mousebutton.element.html
+msgaud=msgaud.element.html
+msg=msg.element.html
+msgentry=msgentry.element.html
+msgexplan=msgexplan.element.html
+msginfo=msginfo.element.html
+msglevel=msglevel.element.html
+msgmain=msgmain.element.html
+msgorig=msgorig.element.html
+msgrel=msgrel.element.html
+msgset=msgset.element.html
+msgsub=msgsub.element.html
+msgtext=msgtext.element.html
+nonterminal=nonterminal.element.html
+note=note.element.html
+objectinfo=objectinfo.element.html
+olink=olink.element.html
+ooclass=ooclass.element.html
+ooexception=ooexception.element.html
+oointerface=oointerface.element.html
+optional=optional.element.html
+option=option.element.html
+orderedlist=orderedlist.element.html
+orgdiv=orgdiv.element.html
+orgname=orgname.element.html
+otheraddr=otheraddr.element.html
+othercredit=othercredit.element.html
+othername=othername.element.html
+pagenums=pagenums.element.html
+para=para.element.html
+paramdef=paramdef.element.html
+parameter=parameter.element.html
+part=part.element.html
+partinfo=partinfo.element.html
+partintro=partintro.element.html
+personblurb=personblurb.element.html
+personname=personname.element.html
+phone=phone.element.html
+phrase=phrase.element.html
+pob=pob.element.html
+postcode=postcode.element.html
+preface=preface.element.html
+prefaceinfo=prefaceinfo.element.html
+primary=primary.element.html
+primaryie=primaryie.element.html
+printhistory=printhistory.element.html
+procedure=procedure.element.html
+production=production.element.html
+productionrecap=productionrecap.element.html
+productionset=productionset.element.html
+productname=productname.element.html
+productnumber=productnumber.element.html
+programlistingco=programlistingco.element.html
+programlisting=programlisting.element.html
+prompt=prompt.element.html
+property=property.element.html
+pubdate=pubdate.element.html
+publisher=publisher.element.html
+publishername=publishername.element.html
+pubsnumber=pubsnumber.element.html
+qandadiv=qandadiv.element.html
+qandaentry=qandaentry.element.html
+qandaset=qandaset.element.html
+question=question.element.html
+quote=quote.element.html
+refclass=refclass.element.html
+refdescriptor=refdescriptor.element.html
+refentry=refentry.element.html
+refentryinfo=refentryinfo.element.html
+refentrytitle=refentrytitle.element.html
+reference=reference.element.html
+referenceinfo=referenceinfo.element.html
+refmeta=refmeta.element.html
+refmiscinfo=refmiscinfo.element.html
+refnamediv=refnamediv.element.html
+refname=refname.element.html
+refpurpose=refpurpose.element.html
+refsect1=refsect1.element.html
+refsect1info=refsect1info.element.html
+refsect2=refsect2.element.html
+refsect2info=refsect2info.element.html
+refsect3=refsect3.element.html
+refsect3info=refsect3info.element.html
+refsection=refsection.element.html
+refsectioninfo=refsectioninfo.element.html
+refsynopsisdiv=refsynopsisdiv.element.html
+refsynopsisdivinfo=refsynopsisdivinfo.element.html
+releaseinfo=releaseinfo.element.html
+remark=remark.element.html
+replaceable=replaceable.element.html
+returnvalue=returnvalue.element.html
+revdescription=revdescription.element.html
+revhistory=revhistory.element.html
+revision=revision.element.html
+revnumber=revnumber.element.html
+revremark=revremark.element.html
+rhs=rhs.element.html
+row=row.element.html
+sbr=sbr.element.html
+screenco=screenco.element.html
+screen=screen.element.html
+screeninfo=screeninfo.element.html
+screenshot=screenshot.element.html
+secondary=secondary.element.html
+secondaryie=secondaryie.element.html
+sect1=sect1.element.html
+sect1info=sect1info.element.html
+sect2=sect2.element.html
+sect2info=sect2info.element.html
+sect3=sect3.element.html
+sect3info=sect3info.element.html
+sect4=sect4.element.html
+sect4info=sect4info.element.html
+sect5=sect5.element.html
+sect5info=sect5info.element.html
+section=section.element.html
+sectioninfo=sectioninfo.element.html
+seealso=seealso.element.html
+seealsoie=seealsoie.element.html
+see=see.element.html
+seeie=seeie.element.html
+seg=seg.element.html
+seglistitem=seglistitem.element.html
+segmentedlist=segmentedlist.element.html
+segtitle=segtitle.element.html
+seriesvolnums=seriesvolnums.element.html
+set=set.element.html
+setindex=setindex.element.html
+setindexinfo=setindexinfo.element.html
+setinfo=setinfo.element.html
+sgmltag=sgmltag.element.html
+shortaffil=shortaffil.element.html
+shortcut=shortcut.element.html
+sidebar=sidebar.element.html
+sidebarinfo=sidebarinfo.element.html
+simpara=simpara.element.html
+simplelist=simplelist.element.html
+simplemsgentry=simplemsgentry.element.html
+simplesect=simplesect.element.html
+spanspec=spanspec.element.html
+state=state.element.html
+step=step.element.html
+street=street.element.html
+structfield=structfield.element.html
+structname=structname.element.html
+subject=subject.element.html
+subjectset=subjectset.element.html
+subjectterm=subjectterm.element.html
+subscript=subscript.element.html
+substeps=substeps.element.html
+subtitle=subtitle.element.html
+superscript=superscript.element.html
+surname=surname.element.html
+svg-svg=svg-svg.element.html
+symbol=symbol.element.html
+synopfragment=synopfragment.element.html
+synopfragmentref=synopfragmentref.element.html
+synopsis=synopsis.element.html
+systemitem=systemitem.element.html
+table=table.element.html
+tbody=tbody.element.html
+term=term.element.html
+tertiary=tertiary.element.html
+tertiaryie=tertiaryie.element.html
+textdata=textdata.element.html
+textobject=textobject.element.html
+tfoot=tfoot.element.html
+tgroup=tgroup.element.html
+thead=thead.element.html
+tip=tip.element.html
+titleabbrev=titleabbrev.element.html
+title=title.element.html
+tocback=tocback.element.html
+tocchap=tocchap.element.html
+toc=toc.element.html
+tocentry=tocentry.element.html
+tocfront=tocfront.element.html
+toclevel1=toclevel1.element.html
+toclevel2=toclevel2.element.html
+toclevel3=toclevel3.element.html
+toclevel4=toclevel4.element.html
+toclevel5=toclevel5.element.html
+tocpart=tocpart.element.html
+token=token.element.html
+trademark=trademark.element.html
+type=type.element.html
+ulink=ulink.element.html
+userinput=userinput.element.html
+varargs=varargs.element.html
+variablelist=variablelist.element.html
+varlistentry=varlistentry.element.html
+varname=varname.element.html
+videodata=videodata.element.html
+videoobject=videoobject.element.html
+void=void.element.html
+volumenum=volumenum.element.html
+warning=warning.element.html
+wordasword=wordasword.element.html
+xref=xref.element.html
+year=year.element.html

Added: people/jriddell/KDE/3.5/kdewebdev/debian/docrc/html.docrc
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/docrc/html.docrc	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/docrc/html.docrc	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,224 @@
+# KDE Config File
+[Tree]
+
+Doc dir=html
+
+#top level elements
+Top Element=HTML
+
+HTML=#Top level elements,#Head elements,#Generic Block-level Elements,#Lists,#Tables,#Forms,#Special Inline Elements,#Phrase Elements,#Font Style Elements,#Frames,Entities,
+
+Top level elements=HTML - HTML document,HEAD - Document head,BODY - Document body,FRAMESET,
+HTML - HTML document=html/html.html
+HEAD - Document head=head/head.html
+BODY - Document body=html/body.html
+FRAMESET=frames/frameset.html
+
+Head elements=BASE - Document base URL,ISINDEX - Input prompt,LINK - Document relationship,META - Metadata,SCRIPT - Client-side script,STYLE - Embedded style sheet,TITLE - Document title,
+BASE - Document base URL=head/base.html
+ISINDEX - Input prompt=block/isindex.html
+LINK - Document relationship=head/link.html
+META - Metadata=head/meta.html
+SCRIPT - Client-side script=special/script.html
+STYLE - Embedded style sheet=head/style.html
+TITLE - Document title=head/title.html
+
+Generic Block-level Elements=ADDRESS - Address,BLOCKQUOTE - Block quotation,CENTER - Centered block,DEL - Deleted text,DIV - Generic block-level container,H1 - Level-one heading,H2 - Level-two heading,H3 - Level-three heading,H4 - Level-four heading,H5 - Level-five heading,H6 - Level-six heading,HR - Horizontal rule,INS - Inserted text,ISINDEX - Input prompt,NOSCRIPT - Alternate script content,P - Paragraph,PRE - Preformatted text,
+ADDRESS - Address=block/address.html
+BLOCKQUOTE - Block quotation=block/blockquote.html
+CENTER - Centered block=block/center.html
+DEL - Deleted text=phrase/del.html
+DIV - Generic block-level container=block/div.html
+H1 - Level-one heading=block/h1.html
+H2 - Level-two heading=block/h2.html
+H3 - Level-three heading=block/h3.html
+H4 - Level-four heading=block/h4.html
+H5 - Level-five heading=block/h5.html
+H6 - Level-six heading=block/h6.html
+HR - Horizontal rule=block/hr.html
+INS - Inserted text=phrase/ins.html
+NOSCRIPT - Alternate script content=block/noscript.html
+P - Paragraph=block/p.html
+PRE - Preformatted text=block/pre.html
+
+Lists=DIR - Directory list,DL - Definition list,DT - Definition term,DD - Definition description,LI - List item,MENU - Menu list,OL - Ordered list,UL - Unordered list,
+DIR - Directory list=lists/dir.html
+DL - Definition list=lists/dl.html
+DT - Definition term=lists/dt.html
+DD - Definition description=lists/dd.html
+LI - List item=lists/li.html
+MENU - Menu list=lists/menu.html
+OL - Ordered list=lists/ol.html
+UL - Unordered list=lists/ul.html
+
+Tables=TABLE - Table,CAPTION - Table caption,COLGROUP - Table column group,COL - Table column,THEAD - Table head,TFOOT - Table foot,TBODY - Table body,TR - Table row,TD - Table data cell,TH - Table header cell,
+TABLE - Table=tables/table.html
+CAPTION - Table caption=tables/caption.html
+COLGROUP - Table column group=tables/colgroup.html
+COL - Table column=tables/col.html
+THEAD - Table head=tables/thead.html
+TFOOT - Table foot=tables/tfoot.html
+TBODY - Table body=tables/tbody.html
+TR - Table row=tables/tr.html
+TD - Table data cell=tables/td.html
+TH - Table header cell=tables/th.html
+
+Forms=FORM - Interactive form,BUTTON - Button,FIELDSET - Form control group,LEGEND - Fieldset caption,INPUT - Form input,LABEL - Form field label,SELECT - Option selector,OPTGROUP - Option group,OPTION - Menu option,TEXTAREA - Multi-line text input,
+FORM - Interactive form=forms/form.html
+BUTTON - Button=forms/button.html
+FIELDSET - Form control group=forms/fieldset.html
+LEGEND - Fieldset caption=forms/legend.html
+INPUT - Form input=forms/input.html
+LABEL - Form field label=forms/label.html
+SELECT - Option selector=forms/select.html
+OPTGROUP - Option group=forms/optgroup.html
+OPTION - Menu option=forms/option.html
+TEXTAREA - Multi-line text input=forms/textarea.html
+
+Special Inline Elements=A - Anchor,APPLET - Java applet,BASEFONT - Base font change,BDO - BiDi override,BR - Line break,FONT - Font change,IFRAME - Inline frame,IMG - Inline image,MAP - Image map,AREA - Image map region,OBJECT - Object,PARAM - Object parameter,Q - Short quotation,SCRIPT - Client-side script,SPAN - Generic inline container,SUB - Subscript,SUP - Superscript,
+A - Anchor=special/a.html
+APPLET - Java applet=special/applet.html
+BASEFONT - Base font change=special/basefont.html
+BDO - BiDi override=special/bdo.html
+BR - Line break=special/br.html
+FONT - Font change=special/font.html
+IFRAME - Inline frame=special/iframe.html
+IMG - Inline image=special/img.html
+MAP - Image map=special/map.html
+AREA - Image map region=special/area.html
+OBJECT - Object=special/object.html
+PARAM - Object parameter=special/param.html
+Q - Short quotation=special/q.html
+SPAN - Generic inline container=special/span.html
+SUB - Subscript=special/sub.html
+SUP - Superscript=special/sup.html
+
+Phrase Elements=ABBR - Abbreviation,ACRONYM - Acronym,CITE - Citation,CODE - Computer code,DEL - Deleted text,DFN - Defined term,EM - Emphasis,INS - Inserted text,KBD - Text to be input,SAMP - Sample output,STRONG - Strong emphasis,VAR - Variable,
+ABBR - Abbreviation=phrase/abbr.html
+ACRONYM - Acronym=phrase/acronym.html
+CITE - Citation=phrase/cite.html
+CODE - Computer code=phrase/code.html
+DEL - Deleted text=phrase/del.html
+DFN - Defined term=phrase/dfn.html
+EM - Emphasis=phrase/em.html
+INS - Inserted text=phrase/ins.html
+KBD - Text to be input=phrase/kbd.html
+SAMP - Sample output=phrase/samp.html
+STRONG - Strong emphasis=phrase/strong.html
+VAR - Variable=phrase/var.html
+
+Font Style Elements=B - Bold text,BIG - Large text,I - Italic text,S - Strike-through text,SMALL - Small text,STRIKE - Strike-through text,TT - Teletype text,U - Underlined text,
+B - Bold text=fontstyle/b.html
+BIG - Large text=fontstyle/big.html
+I - Italic text=fontstyle/i.html
+S - Strike-through text=fontstyle/s.html
+SMALL - Small text=fontstyle/small.html
+STRIKE - Strike-through text=fontstyle/strike.html
+TT - Teletype text=fontstyle/tt.html
+U - Underlined text=fontstyle/u.html
+
+Frames=FRAMESET - Frameset,FRAME - Frame,NOFRAMES - Frames alternate content,
+FRAMESET - Frameset=frames/frameset.html
+FRAME - Frame=frames/frame.html
+NOFRAMES - Frames alternate content=frames/noframes.html
+
+Entities=entities/index.html
+
+# keywords for context help
+[Context]
+
+ContextList=HTML,HEAD,BODY,FRAMESET,BASE,ISINDEX,LINK,META,SCRIPT,STYLE,TITLE,ADDRESS,BLOCKQUOTE,CENTER,DEL,DIV,H1,H2,H3,H4,H5,H6,HR,INS,NOSCRIPT,P,PRE,DIR,DL,DT,DD,LI,MENU,OL,UL,TABLE,CAPTION,COLGROUP,COL,THEAD,TFOOT,TBODY,TR,TD,TH,FORM,BUTTON,FIELDSET,LEGEND,INPUT,LABEL,SELECT,OPTGROUP,OPTION,TEXTAREA,A,APPLET,BASEFONT,BDO,BR,FONT,IFRAME,IMG,MAP,AREA,OBJECT,PARAM,Q,SPAN,SUB,SUP,ABBR,ACRONYM,CITE,CODE,DEL,DFN,EM,INS,KBD,SAMP,STRONG,VAR,B,BIG,I,S,SMALL,STRIKE,TT,U,FRAME,NOFRAMES,
+
+HTML=html/html.html
+HEAD=head/head.html
+BODY=html/body.html
+FRAMESET=frames/frameset.html
+BASE=head/base.html
+ISINDEX=block/isindex.html
+LINK=head/link.html
+META=head/meta.html
+SCRIPT=special/script.html
+STYLE=head/style.html
+TITLE=head/title.html
+ADDRESS=block/address.html
+BLOCKQUOTE=block/blockquote.html
+CENTER=block/center.html
+DEL=phrase/del.html
+DIV=block/div.html
+H1=block/h1.html
+H2=block/h2.html
+H3=block/h3.html
+H4=block/h4.html
+H5=block/h5.html
+H6=block/h6.html
+HR=block/hr.html
+INS=phrase/ins.html
+NOSCRIPT=block/noscript.html
+P=block/p.html
+PRE=block/pre.html
+DIR=lists/dir.html
+DL=lists/dl.html
+DT=lists/dt.html
+DD=lists/dd.html
+LI=lists/li.html
+MENU=lists/menu.html
+OL=lists/ol.html
+UL=lists/ul.html
+TABLE=tables/table.html
+CAPTION=tables/caption.html
+COLGROUP=tables/colgroup.html
+COL=tables/col.html
+THEAD=tables/thead.html
+TFOOT=tables/tfoot.html
+TBODY=tables/tbody.html
+TR=tables/tr.html
+TD=tables/td.html
+TH=tables/th.html
+FORM=forms/form.html
+BUTTON=forms/button.html
+FIELDSET=forms/fieldset.html
+LEGEND=forms/legend.html
+INPUT=forms/input.html
+LABEL=forms/label.html
+SELECT=forms/select.html
+OPTGROUP=forms/optgroup.html
+OPTION=forms/option.html
+TEXTAREA=forms/textarea.html
+A=special/a.html
+APPLET=special/applet.html
+BASEFONT=special/basefont.html
+BDO=special/bdo.html
+BR=special/br.html
+FONT=special/font.html
+IFRAME=special/iframe.html
+IMG=special/img.html
+MAP=special/map.html
+AREA=special/area.html
+OBJECT=special/object.html
+PARAM=special/param.html
+Q=special/q.html
+SPAN=special/span.html
+SUB=special/sub.html
+SUP=special/sup.html
+ABBR=phrase/abbr.html
+ACRONYM=phrase/acronym.html
+CITE=phrase/cite.html
+CODE=phrase/code.html
+DEL=phrase/del.html
+DFN=phrase/dfn.html
+EM=phrase/em.html
+INS=phrase/ins.html
+KBD=phrase/kbd.html
+SAMP=phrase/samp.html
+STRONG=phrase/strong.html
+VAR=phrase/var.html
+B=fontstyle/b.html
+BIG=fontstyle/big.html
+I=fontstyle/i.html
+S=fontstyle/s.html
+SMALL=fontstyle/small.html
+STRIKE=fontstyle/strike.html
+TT=fontstyle/tt.html
+U=fontstyle/u.html
+FRAME=frames/frame.html
+NOFRAMES=frames/noframes.html

Added: people/jriddell/KDE/3.5/kdewebdev/debian/docrc/php.docrc
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/docrc/php.docrc	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/docrc/php.docrc	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3103 @@
+#This file was autogenerated.  To recreate it with a new set of PHP docs, run docgen.pl <php-version> <path-to-html-docs>
+#If you find this file broken grossly, send a rant to robert at artnickel.com or be useful and fix the bug and let me know!
+
+#KDE Config File
+
+[Tree]
+
+Doc dir=php
+
+#top level elements
+Top Element=PHP 20030401 documentation
+
+PHP 20030401 documentation=Table of Contents,#Getting Started,#Language Reference,#Features,#Function Reference,#Extending PHP 4.0,#FAQ: Frequently Asked Questions,#Appendixes
+
+Table of Contents=index.html
+
+Getting Started=Introduction,A simple tutorial,Installation,Configuration,Security
+Introduction=introduction.html
+A simple tutorial=tutorial.html
+Installation=installation.html
+Configuration=configuration.html
+Security=security.html
+
+
+Language Reference=Basic syntax,Types,Variables,Constants,Expressions,Operators,Control Structures,Functions,Classes and Objects,References Explained
+Basic syntax=language.basic-syntax.html
+Types=language.types.html
+Variables=language.variables.html
+Constants=language.constants.html
+Expressions=language.expressions.html
+Operators=language.operators.html
+Control Structures=control-structures.html
+Functions=functions.html
+Classes and Objects=language.oop.html
+References Explained=language.references.html
+
+
+Features=HTTP authentication with PHP,Cookies,Handling file uploads,Using remote files,Connection handling,Persistent Database Connections,Safe Mode,Using PHP from the command line
+HTTP authentication with PHP=features.http-auth.html
+Cookies=features.cookies.html
+Handling file uploads=features.file-upload.html
+Using remote files=features.remote-files.html
+Connection handling=features.connection-handling.html
+Persistent Database Connections=features.persistent-connections.html
+Safe Mode=features.safe-mode.html
+Using PHP from the command line=features.commandline.html
+
+
+Function Reference=Apache-specific Functions,Array Functions,Aspell functions (deprecated),BCMath Arbitrary Precision Mathematics Functions,Bzip2 Compression Functions,Calendar functions,CCVS API Functions,COM support functions for Windows,Class/Object Functions,ClibPDF functions,Crack functions,CURL- Client URL Library Functions,Cybercash payment functions,Crédit Mutuel CyberMUT functions,Cyrus IMAP administration functions,Character type functions,Database (dbm-style) abstraction layer functions,Date and Time functions,dBase functions,DBM Functions (deprecated),dbx functions,DB++ Functions,Direct IO functions,Directory functions,DOM XML functions,.NET functions,Error Handling and Logging Functions,FrontBase Functions,filePro functions,Filesystem functions,Forms Data Format functions,FriBiDi functions,FTP functions,Function Handling functions,Gettext,GMP functions,HTTP functions,Hyperwave functions,Hyperwave API functions,iconv functions,Image functions,IMAP- POP3 and NNTP functions,Informix functions,InterBase functions,Ingres II functions,IRC Gateway Functions,PHP / Java Integration,LDAP functions,Mail functions,mailparse functions,Mathematical Functions,Multi-Byte String Functions,MCAL functions,Mcrypt Encryption Functions,MCVE Payment Functions,Mhash Functions,Mimetype Functions,Microsoft SQL Server functions,Ming functions for Flash,Miscellaneous functions,mnoGoSearch Functions,mSQL functions,MySQL Functions,Mohawk Software session handler functions,muscat functions,Network Functions,Ncurses terminal screen control functions,Lotus Notes functions,Unified ODBC functions,Object Aggregation/Composition Functions,Oracle 8 functions,OpenSSL functions,Oracle functions,Ovrimos SQL functions,Output Control Functions,Object property and method call overloading,PDF functions,Verisign Payflow Pro functions,PHP Options&Information,POSIX functions,PostgreSQL functions,Process Control Functions,Program Execution functions,Printer functions,Pspell Functions,GNU Readline,GNU Recode functions,Regular Expression Functions (Perl-Compatible),qtdom functions,Regular Expression Functions (POSIX Extended),Semaphore- Shared Memory and IPC Functions,SESAM database functions,Session handling functions,Shared Memory Functions,Shockwave Flash functions,SNMP functions,Socket functions,Stream functions,String functions,Sybase functions,Tokenizer functions,URL Functions,Variable Functions,vpopmail functions,W32api functions,WDDX Functions,XML parser functions,XML-RPC functions,XSLT functions,YAZ functions,YP/NIS Functions,Zip File Functions (Read Only Access),Zlib Compression Functions
+Apache-specific Functions=ref.apache.html
+Array Functions=ref.array.html
+Aspell functions (deprecated)=ref.aspell.html
+BCMath Arbitrary Precision Mathematics Functions=ref.bc.html
+Bzip2 Compression Functions=ref.bzip2.html
+Calendar functions=ref.calendar.html
+CCVS API Functions=ref.ccvs.html
+COM support functions for Windows=ref.com.html
+Class/Object Functions=ref.classobj.html
+ClibPDF functions=ref.cpdf.html
+Crack functions=ref.crack.html
+CURL- Client URL Library Functions=ref.curl.html
+Cybercash payment functions=ref.cybercash.html
+Crédit Mutuel CyberMUT functions=ref.cybermut.html
+Cyrus IMAP administration functions=ref.cyrus.html
+Character type functions=ref.ctype.html
+Database (dbm-style) abstraction layer functions=ref.dba.html
+Date and Time functions=ref.datetime.html
+dBase functions=ref.dbase.html
+DBM Functions (deprecated)=ref.dbm.html
+dbx functions=ref.dbx.html
+DB++ Functions=ref.dbplus.html
+Direct IO functions=ref.dio.html
+Directory functions=ref.dir.html
+DOM XML functions=ref.domxml.html
+.NET functions=ref.dotnet.html
+Error Handling and Logging Functions=ref.errorfunc.html
+FrontBase Functions=ref.fbsql.html
+filePro functions=ref.filepro.html
+Filesystem functions=ref.filesystem.html
+Forms Data Format functions=ref.fdf.html
+FriBiDi functions=ref.fribidi.html
+FTP functions=ref.ftp.html
+Function Handling functions=ref.funchand.html
+Gettext=ref.gettext.html
+GMP functions=ref.gmp.html
+HTTP functions=ref.http.html
+Hyperwave functions=ref.hyperwave.html
+Hyperwave API functions=ref.hwapi.html
+iconv functions=ref.iconv.html
+Image functions=ref.image.html
+IMAP- POP3 and NNTP functions=ref.imap.html
+Informix functions=ref.ifx.html
+InterBase functions=ref.ibase.html
+Ingres II functions=ref.ingres.html
+IRC Gateway Functions=ref.ircg.html
+PHP / Java Integration=ref.java.html
+LDAP functions=ref.ldap.html
+Mail functions=ref.mail.html
+mailparse functions=ref.mailparse.html
+Mathematical Functions=ref.math.html
+Multi-Byte String Functions=ref.mbstring.html
+MCAL functions=ref.mcal.html
+Mcrypt Encryption Functions=ref.mcrypt.html
+MCVE Payment Functions=ref.mcve.html
+Mhash Functions=ref.mhash.html
+Mimetype Functions=ref.mime-magic.html
+Microsoft SQL Server functions=ref.mssql.html
+Ming functions for Flash=ref.ming.html
+Miscellaneous functions=ref.misc.html
+mnoGoSearch Functions=ref.mnogo.html
+mSQL functions=ref.msql.html
+MySQL Functions=ref.mysql.html
+Mohawk Software session handler functions=ref.msession.html
+muscat functions=ref.muscat.html
+Network Functions=ref.network.html
+Ncurses terminal screen control functions=ref.ncurses.html
+Lotus Notes functions=ref.notes.html
+Unified ODBC functions=ref.odbc.html
+Object Aggregation/Composition Functions=ref.objaggregation.html
+Oracle 8 functions=ref.oci8.html
+OpenSSL functions=ref.openssl.html
+Oracle functions=ref.oracle.html
+Ovrimos SQL functions=ref.ovrimos.html
+Output Control Functions=ref.outcontrol.html
+Object property and method call overloading=ref.overload.html
+PDF functions=ref.pdf.html
+Verisign Payflow Pro functions=ref.pfpro.html
+PHP Options&Information=ref.info.html
+POSIX functions=ref.posix.html
+PostgreSQL functions=ref.pgsql.html
+Process Control Functions=ref.pcntl.html
+Program Execution functions=ref.exec.html
+Printer functions=ref.printer.html
+Pspell Functions=ref.pspell.html
+GNU Readline=ref.readline.html
+GNU Recode functions=ref.recode.html
+Regular Expression Functions (Perl-Compatible)=ref.pcre.html
+qtdom functions=ref.qtdom.html
+Regular Expression Functions (POSIX Extended)=ref.regex.html
+Semaphore- Shared Memory and IPC Functions=ref.sem.html
+SESAM database functions=ref.sesam.html
+Session handling functions=ref.session.html
+Shared Memory Functions=ref.shmop.html
+Shockwave Flash functions=ref.swf.html
+SNMP functions=ref.snmp.html
+Socket functions=ref.sockets.html
+Stream functions=ref.stream.html
+String functions=ref.strings.html
+Sybase functions=ref.sybase.html
+Tokenizer functions=ref.tokenizer.html
+URL Functions=ref.url.html
+Variable Functions=ref.variables.html
+vpopmail functions=ref.vpopmail.html
+W32api functions=ref.w32api.html
+WDDX Functions=ref.wddx.html
+XML parser functions=ref.xml.html
+XML-RPC functions=ref.xmlrpc.html
+XSLT functions=ref.xslt.html
+YAZ functions=ref.yaz.html
+YP/NIS Functions=ref.nis.html
+Zip File Functions (Read Only Access)=ref.zip.html
+Zlib Compression Functions=ref.zlib.html
+
+
+Extending PHP 4.0=Overview,Extension Possibilities,Source Layout,PHP's Automatic Build System,Creating Extensions,Using Extensions,Troubleshooting,Source Discussion,Accepting Arguments,Creating Variables,Duplicating Variable Contents: The Copy Constructor,Returning Values,Printing Information,Startup and Shutdown Functions,Calling User Functions,Initialization File Support,Where to Go from Here,Reference: Some Configuration Macros,API Macros,Streams API for PHP Extension Authors,,,,,,,,,
+Overview=zend.overview.html
+Extension Possibilities=zend.possibilities.html
+Source Layout=zend.layout.html
+PHP's Automatic Build System=zend.build.html
+Creating Extensions=zend.creating.html
+Using Extensions=zend.using.html
+Troubleshooting=zend.troubleshooting.html
+Source Discussion=zend.structure.html
+Accepting Arguments=zend.arguments.html
+Creating Variables=zend.variables.html
+Duplicating Variable Contents: The Copy Constructor=zend.copy-constructor.html
+Returning Values=zend.returning.html
+Printing Information=zend.printing.html
+Startup and Shutdown Functions=zend.startup-and-shutdown.html
+Calling User Functions=zend.calling-user-functions.html
+Initialization File Support=zend.ini-file-support.html
+Where to Go from Here=zend.where-to-go.html
+Reference: Some Configuration Macros=zend.configuration-macros.html
+API Macros=zend.api-macros.html
+Streams API for PHP Extension Authors=streams.html
+
+
+FAQ: Frequently Asked Questions=General Information,Mailing lists,Obtaining PHP,Database issues,Installation,Build Problems,Using PHP,PHP and HTML,PHP and COM,PHP and other languages,Migrating from PHP 2 to PHP 3,Migrating from PHP 3 to PHP 4,Miscellaneous Questions
+General Information=faq.general.html
+Mailing lists=faq.mailinglist.html
+Obtaining PHP=faq.obtaining.html
+Database issues=faq.databases.html
+Installation=faq.installation.html
+Build Problems=faq.build.html
+Using PHP=faq.using.html
+PHP and HTML=faq.html.html
+PHP and COM=faq.com.html
+PHP and other languages=faq.languages.html
+Migrating from PHP 2 to PHP 3=faq.migration.html
+Migrating from PHP 3 to PHP 4=faq.migration4.html
+Miscellaneous Questions=faq.misc.html
+
+
+Appendixes=History of PHP and related projects,Migrating from PHP 3 to PHP 4,Migrating from PHP/FI 2 to PHP 3,Debugging PHP,Extending PHP,List of Function Aliases,List of Reserved Words,List of Resource Types,List of Supported Protocols/Wrappers,List of Parser Tokens,,Missing Stuff
+History of PHP and related projects=history.html
+Migrating from PHP 3 to PHP 4=migration4.html
+Migrating from PHP/FI 2 to PHP 3=migration.html
+Debugging PHP=debugger.html
+Extending PHP=phpdevel.html
+List of Function Aliases=aliases.html
+List of Reserved Words=reserved.html
+List of Resource Types=resource.html
+List of Supported Protocols/Wrappers=wrappers.html
+List of Parser Tokens=tokens.html
+Missing Stuff=missing-stuff.html
+
+
+#Keywords for context help
+[Context]
+
+ContextList=calling_user_functions.html,features.safe_mode.functions.html,abs,acos,acosh,addcslashes,addslashes,aggregate_info,aggregate_methods_by_list,aggregate_methods_by_regexp,aggregate_methods,aggregate_properties_by_list,aggregate_properties_by_regexp,aggregate_properties,aggregate,aggregation_info,apache_child_terminate,apache_lookup_uri,apache_note,apache_request_headers,apache_response_headers,apache_setenv,array_change_key_case,array_chunk,array_count_values,array_diff_assoc,array_diff,array_fill,array_filter,array_flip,array_intersect_assoc,array_intersect,array_key_exists,array_keys,array_map,array_merge_recursive,array_merge,array_multisort,array_pad,array_pop,array_push,array_rand,array_reduce,array_reverse,array_search,array_shift,array_slice,array_splice,array_sum,array_unique,array_unshift,array_values,array_walk,array,arsort,ascii2ebcdic,asin,asinh,asort,aspell_check_raw,aspell_check,aspell_new,aspell_suggest,assert_options,assert,atan,atan2,atanh,base_convert,base64_decode,base64_encode,basename,bcadd,bccomp,bcdiv,bcmod,bcmul,bcpow,bcpowmod,bcscale,bcsqrt,bcsub,bin2hex,bind_textdomain_codeset,bindec,bindtextdomain,bzclose,bzcompress,bzdecompress,bzerrno,bzerror,bzerrstr,bzflush,bzopen,bzread,bzwrite,cal_days_in_month,cal_from_jd,cal_info,cal_to_jd,call_user_func_array,call_user_func,call_user_method_array,call_user_method,ccvs_add,ccvs_auth,ccvs_command,ccvs_count,ccvs_delete,ccvs_done,ccvs_init,ccvs_lookup,ccvs_new,ccvs_report,ccvs_return,ccvs_reverse,ccvs_sale,ccvs_status,ccvs_textvalue,ccvs_void,ceil,chdir,checkdate,checkdnsrr,chgrp,chmod,chop,chown,chr,chroot,chunk_split,class_exists,clearstatcache,closedir,closelog,com_addref,com_get,com_invoke,com_isenum,com_load_typelib,com_load,com_propget,com_propput,com_propset,com_release,com_set,compact,connection_aborted,connection_status,connection_timeout,constant,convert_cyr_string,copy,cos,cosh,count_chars,count,cpdf_add_annotation,cpdf_add_outline,cpdf_arc,cpdf_begin_text,cpdf_circle,cpdf_clip,cpdf_close,cpdf_closepath_fill_stroke,cpdf_closepath_stroke,cpdf_closepath,cpdf_continue_text,cpdf_curveto,cpdf_end_text,cpdf_fill_stroke,cpdf_fill,cpdf_finalize_page,cpdf_finalize,cpdf_global_set_document_limits,cpdf_import_jpeg,cpdf_lineto,cpdf_moveto,cpdf_newpath,cpdf_open,cpdf_output_buffer,cpdf_page_init,cpdf_place_inline_image,cpdf_rect,cpdf_restore,cpdf_rlineto,cpdf_rmoveto,cpdf_rotate_text,cpdf_rotate,cpdf_save_to_file,cpdf_save,cpdf_scale,cpdf_set_action_url,cpdf_set_char_spacing,cpdf_set_creator,cpdf_set_current_page,cpdf_set_font_directories,cpdf_set_font_map_file,cpdf_set_font,cpdf_set_horiz_scaling,cpdf_set_keywords,cpdf_set_leading,cpdf_set_page_animation,cpdf_set_subject,cpdf_set_text_matrix,cpdf_set_text_pos,cpdf_set_text_rendering,cpdf_set_text_rise,cpdf_set_title,cpdf_set_viewer_preferences,cpdf_set_word_spacing,cpdf_setdash,cpdf_setflat,cpdf_setgray_fill,cpdf_setgray_stroke,cpdf_setgray,cpdf_setlinecap,cpdf_setlinejoin,cpdf_setlinewidth,cpdf_setmiterlimit,cpdf_setrgbcolor_fill,cpdf_setrgbcolor_stroke,cpdf_setrgbcolor,cpdf_show_xy,cpdf_show,cpdf_stringwidth,cpdf_stroke,cpdf_text,cpdf_translate,crack_check,crack_closedict,crack_getlastmessage,crack_opendict,crc32,create_function,crypt,ctype_alnum,ctype_alpha,ctype_cntrl,ctype_digit,ctype_graph,ctype_lower,ctype_print,ctype_punct,ctype_space,ctype_upper,ctype_xdigit,curl_close,curl_errno,curl_error,curl_exec,curl_getinfo,curl_init,curl_setopt,curl_version,current,cybercash_base64_decode,cybercash_base64_encode,cybercash_decr,cybercash_encr,cybermut_creerformulairecm,cybermut_creerreponsecm,cybermut_testmac,cyrus_authenticate,cyrus_bind,cyrus_close,cyrus_connect,cyrus_query,cyrus_unbind,date,dba_close,dba_delete,dba_exists,dba_fetch,dba_firstkey,dba_handlers,dba_insert,dba_list,dba_nextkey,dba_open,dba_optimize,dba_popen,dba_replace,dba_sync,dbase_add_record,dbase_close,dbase_create,dbase_delete_record,dbase_get_record_with_names,dbase_get_record,dbase_numfields,dbase_numrecords,dbase_open,dbase_pack,dbase_replace_record,dblist,dbmclose,dbmdelete,dbmexists,dbmfetch,dbmfirstkey,dbminsert,dbmnextkey,dbmopen,dbmreplace,dbplus_add,dbplus_aql,dbplus_chdir,dbplus_close,dbplus_curr,dbplus_errcode,dbplus_errno,dbplus_find,dbplus_first,dbplus_flush,dbplus_freealllocks,dbplus_freelock,dbplus_freerlocks,dbplus_getlock,dbplus_getunique,dbplus_info,dbplus_last,dbplus_lockrel,dbplus_next,dbplus_open,dbplus_prev,dbplus_rchperm,dbplus_rcreate,dbplus_rcrtexact,dbplus_rcrtlike,dbplus_resolve,dbplus_restorepos,dbplus_rkeys,dbplus_ropen,dbplus_rquery,dbplus_rrename,dbplus_rsecindex,dbplus_runlink,dbplus_rzap,dbplus_savepos,dbplus_setindex,dbplus_setindexbynumber,dbplus_sql,dbplus_tcl,dbplus_tremove,dbplus_undo,dbplus_undoprepare,dbplus_unlockrel,dbplus_unselect,dbplus_update,dbplus_xlockrel,dbplus_xunlockrel,dbx_close,dbx_compare,dbx_connect,dbx_error,dbx_escape_string,dbx_query,dbx_sort,dcgettext,dcngettext,deaggregate,debug_backtrace,debugger_off,debugger_on,decbin,dechex,decoct,define_syslog_variables,define,defined,deg2rad,delete,dgettext,die,dio_close,dio_fcntl,dio_open,dio_read,dio_seek,dio_stat,dio_tcsetattr,dio_truncate,dio_write,dirname,disk_free_space,disk_total_space,diskfreespace,dl,dngettext,dns_check_record,dns_get_mx,dns_get_record,domattribute_name,domattribute_specified,domattribute_value,domdocument_add_root,domdocument_create_attribute,domdocument_create_cdata_section,domdocument_create_comment,domdocument_create_element,domdocument_create_element_ns,domdocument_create_entity_reference,domdocument_create_processing_instruction,domdocument_create_text_node,domdocument_doctype,domdocument_document_element,domdocument_dump_file,domdocument_dump_mem,domdocument_get_element_by_id,domdocument_get_elements_by_tagname,domdocument_html_dump_mem,domdocument_xinclude,domdocumenttype_entities,domdocumenttype_internal_subset,domdocumenttype_name,domdocumenttype_notations,domdocumenttype_public_id,domdocumenttype_system_id,domelement_get_attribute_node,domelement_get_attribute,domelement_get_elements_by_tagname,domelement_has_attribute,domelement_remove_attribute,domelement_set_attribute,domelement_tagname,domnode_add_namespace,domnode_append_child,domnode_append_sibling,domnode_attributes,domnode_child_nodes,domnode_clone_node,domnode_dump_node,domnode_first_child,domnode_get_content,domnode_has_attributes,domnode_has_child_nodes,domnode_insert_before,domnode_is_blank_node,domnode_last_child,domnode_next_sibling,domnode_node_name,domnode_node_type,domnode_node_value,domnode_owner_document,domnode_parent_node,domnode_prefix,domnode_previous_sibling,domnode_remove_child,domnode_replace_child,domnode_replace_node,domnode_set_content,domnode_set_name,domnode_set_namespace,domnode_unlink_node,domprocessinginstruction_data,domprocessinginstruction_target,domxml_new_doc,domxml_open_file,domxml_open_mem,domxml_version,domxml_xmltree,domxml_xslt_stylesheet_doc,domxml_xslt_stylesheet_file,domxml_xslt_stylesheet,domxsltstylesheet_process,domxsltstylesheet_result_dump_file,domxsltstylesheet_result_dump_mem,dotnet_load,doubleval,each,easter_date,easter_days,ebcdic2ascii,echo,empty,end,ereg_replace,ereg,eregi_replace,eregi,error_log,error_reporting,escapeshellarg,escapeshellcmd,eval,exec,exif_imagetype,exif_read_data,exif_thumbnail,exit,exp,explode,expm1,extension_loaded,extract,ezmlm_hash,fbsql_affected_rows,fbsql_autocommit,fbsql_change_user,fbsql_close,fbsql_commit,fbsql_connect,fbsql_create_blob,fbsql_create_clob,fbsql_create_db,fbsql_data_seek,fbsql_database_password,fbsql_database,fbsql_db_query,fbsql_db_status,fbsql_drop_db,fbsql_errno,fbsql_error,fbsql_fetch_array,fbsql_fetch_assoc,fbsql_fetch_field,fbsql_fetch_lengths,fbsql_fetch_object,fbsql_fetch_row,fbsql_field_flags,fbsql_field_len,fbsql_field_name,fbsql_field_seek,fbsql_field_table,fbsql_field_type,fbsql_free_result,fbsql_get_autostart_info,fbsql_hostname,fbsql_insert_id,fbsql_list_dbs,fbsql_list_fields,fbsql_list_tables,fbsql_next_result,fbsql_num_fields,fbsql_num_rows,fbsql_password,fbsql_pconnect,fbsql_query,fbsql_read_blob,fbsql_read_clob,fbsql_result,fbsql_rollback,fbsql_select_db,fbsql_set_lob_mode,fbsql_set_transaction,fbsql_start_db,fbsql_stop_db,fbsql_tablename,fbsql_username,fbsql_warnings,fclose,fdf_add_doc_javascript,fdf_add_template,fdf_close,fdf_create,fdf_errno,fdf_error,fdf_get_ap,fdf_get_attachment,fdf_get_encoding,fdf_get_file,fdf_get_status,fdf_get_value,fdf_get_version,fdf_header,fdf_next_field_name,fdf_open_string,fdf_open,fdf_save_string,fdf_save,fdf_set_ap,fdf_set_encoding,fdf_set_file,fdf_set_flags,fdf_set_javascript_action,fdf_set_opt,fdf_set_status,fdf_set_submit_form_action,fdf_set_target_frame,fdf_set_value,fdf_set_version,feof,fflush,fgetc,fgetcsv,fgets,fgetss,file_exists,file_get_contents,file,fileatime,filectime,filegroup,fileinode,filemtime,fileowner,fileperms,filepro_fieldcount,filepro_fieldname,filepro_fieldtype,filepro_fieldwidth,filepro_retrieve,filepro_rowcount,filepro,filesize,filetype,floatval,flock,floor,flush,fmod,fnmatch,fopen,fpassthru,fprintf,fputs,fread,frenchtojd,fribidi_log2vis,fscanf,fseek,fsockopen,fstat,ftell,ftok,ftp_cdup,ftp_chdir,ftp_close,ftp_connect,ftp_delete,ftp_exec,ftp_fget,ftp_fput,ftp_get_option,ftp_get,ftp_login,ftp_mdtm,ftp_mkdir,ftp_nb_continue,ftp_nb_fget,ftp_nb_fput,ftp_nb_get,ftp_nb_put,ftp_nlist,ftp_pasv,ftp_put,ftp_pwd,ftp_quit,ftp_rawlist,ftp_rename,ftp_rmdir,ftp_set_option,ftp_site,ftp_size,ftp_ssl_connect,ftp_systype,ftruncate,func_get_arg,func_get_args,func_num_args,function_exists,fwrite,gd_info,get_browser,get_cfg_var,get_class_methods,get_class_vars,get_class,get_current_user,get_declared_classes,get_defined_constants,get_defined_functions,get_defined_vars,get_extension_funcs,get_html_translation_table,get_included_files,get_loaded_extensions,get_magic_quotes_gpc,get_magic_quotes_runtime,get_meta_tags,get_object_vars,get_parent_class,get_required_files,get_resource_type,getallheaders,getcwd,getdate,getenv,gethostbyaddr,gethostbyname,gethostbynamel,getimagesize,getlastmod,getmxrr,getmygid,getmyinode,getmypid,getmyuid,getopt,getprotobyname,getprotobynumber,getrandmax,getrusage,getservbyname,getservbyport,gettext,gettimeofday,gettype,glob,gmdate,gmmktime,gmp_abs,gmp_add,gmp_and,gmp_clrbit,gmp_cmp,gmp_com,gmp_div_q,gmp_div_qr,gmp_div_r,gmp_div,gmp_divexact,gmp_fact,gmp_gcd,gmp_gcdext,gmp_hamdist,gmp_init,gmp_intval,gmp_invert,gmp_jacobi,gmp_legendre,gmp_mod,gmp_mul,gmp_neg,gmp_or,gmp_perfect_square,gmp_popcount,gmp_pow,gmp_powm,gmp_prob_prime,gmp_random,gmp_scan0,gmp_scan1,gmp_setbit,gmp_sign,gmp_sqrt,gmp_sqrtrm,gmp_strval,gmp_sub,gmp_xor,gmstrftime,gregoriantojd,gzclose,gzcompress,gzdeflate,gzencode,gzeof,gzfile,gzgetc,gzgets,gzgetss,gzinflate,gzopen,gzpassthru,gzputs,gzread,gzrewind,gzseek,gztell,gzuncompress,gzwrite,header,headers_sent,hebrev,hebrevc,hexdec,highlight_file,highlight_string,html_entity_decode,htmlentities,htmlspecialchars,hw_array2objrec,hw_changeobject,hw_children,hw_childrenobj,hw_close,hw_connect,hw_connection_info,hw_cp,hw_deleteobject,hw_docbyanchor,hw_docbyanchorobj,hw_document_attributes,hw_document_bodytag,hw_document_content,hw_document_setcontent,hw_document_size,hw_dummy,hw_edittext,hw_error,hw_errormsg,hw_free_document,hw_getanchors,hw_getanchorsobj,hw_getandlock,hw_getchildcoll,hw_getchildcollobj,hw_getchilddoccoll,hw_getchilddoccollobj,hw_getobject,hw_getobjectbyquery,hw_getobjectbyquerycoll,hw_getobjectbyquerycollobj,hw_getobjectbyqueryobj,hw_getparents,hw_getparentsobj,hw_getrellink,hw_getremote,hw_getremotechildren,hw_getsrcbydestobj,hw_gettext,hw_getusername,hw_identify,hw_incollections,hw_info,hw_inscoll,hw_insdoc,hw_insertanchors,hw_insertdocument,hw_insertobject,hw_mapid,hw_modifyobject,hw_mv,hw_new_document,hw_objrec2array,hw_output_document,hw_pconnect,hw_pipedocument,hw_root,hw_setlinkroot,hw_stat,hw_unlock,hw_who,hwapi_attribute_key,hwapi_attribute_langdepvalue,hwapi_attribute_value,hwapi_attribute_values,hwapi_attribute,hwapi_checkin,hwapi_checkout,hwapi_children,hwapi_content_mimetype,hwapi_content_read,hwapi_content,hwapi_copy,hwapi_dbstat,hwapi_dcstat,hwapi_dstanchors,hwapi_dstofsrcanchors,hwapi_error_count,hwapi_error_reason,hwapi_find,hwapi_ftstat,hwapi_hgcsp,hwapi_hwstat,hwapi_identify,hwapi_info,hwapi_insert,hwapi_insertanchor,hwapi_insertcollection,hwapi_insertdocument,hwapi_link,hwapi_lock,hwapi_move,hwapi_new_content,hwapi_object_assign,hwapi_object_attreditable,hwapi_object_count,hwapi_object_insert,hwapi_object_new,hwapi_object_remove,hwapi_object_title,hwapi_object_value,hwapi_object,hwapi_objectbyanchor,hwapi_parents,hwapi_reason_description,hwapi_reason_type,hwapi_remove,hwapi_replace,hwapi_setcommitedversion,hwapi_srcanchors,hwapi_srcsofdst,hwapi_unlock,hwapi_user,hwapi_userlist,hypot,ibase_blob_add,ibase_blob_cancel,ibase_blob_close,ibase_blob_create,ibase_blob_echo,ibase_blob_get,ibase_blob_import,ibase_blob_info,ibase_blob_open,ibase_close,ibase_commit,ibase_connect,ibase_errmsg,ibase_execute,ibase_fetch_object,ibase_fetch_row,ibase_field_info,ibase_free_query,ibase_free_result,ibase_num_fields,ibase_pconnect,ibase_prepare,ibase_query,ibase_rollback,ibase_timefmt,ibase_trans,iconv_get_encoding,iconv_set_encoding,iconv,ifx_affected_rows,ifx_blobinfile_mode,ifx_byteasvarchar,ifx_close,ifx_connect,ifx_copy_blob,ifx_create_blob,ifx_create_char,ifx_do,ifx_error,ifx_errormsg,ifx_fetch_row,ifx_fieldproperties,ifx_fieldtypes,ifx_free_blob,ifx_free_char,ifx_free_result,ifx_get_blob,ifx_get_char,ifx_getsqlca,ifx_htmltbl_result,ifx_nullformat,ifx_num_fields,ifx_num_rows,ifx_pconnect,ifx_prepare,ifx_query,ifx_textasvarchar,ifx_update_blob,ifx_update_char,ifxus_close_slob,ifxus_create_slob,ifxus_free_slob,ifxus_open_slob,ifxus_read_slob,ifxus_seek_slob,ifxus_tell_slob,ifxus_write_slob,ignore_user_abort,image_type_to_mime_type,image2wbmp,imagealphablending,imagearc,imagechar,imagecharup,imagecolorallocate,imagecolorallocatealpha,imagecolorat,imagecolorclosest,imagecolorclosestalpha,imagecolorclosesthwb,imagecolordeallocate,imagecolorexact,imagecolorexactalpha,imagecolorresolve,imagecolorresolvealpha,imagecolorset,imagecolorsforindex,imagecolorstotal,imagecolortransparent,imagecopy,imagecopymerge,imagecopymergegray,imagecopyresampled,imagecopyresized,imagecreate,imagecreatefromgd,imagecreatefromgd2,imagecreatefromgd2part,imagecreatefromgif,imagecreatefromjpeg,imagecreatefrompng,imagecreatefromstring,imagecreatefromwbmp,imagecreatefromxbm,imagecreatefromxpm,imagecreatetruecolor,imagedashedline,imagedestroy,imageellipse,imagefill,imagefilledarc,imagefilledellipse,imagefilledpolygon,imagefilledrectangle,imagefilltoborder,imagefontheight,imagefontwidth,imageftbbox,imagefttext,imagegammacorrect,imagegd,imagegd2,imagegif,imageinterlace,imagejpeg,imageline,imageloadfont,imagepalettecopy,imagepng,imagepolygon,imagepsbbox,imagepscopyfont,imagepsencodefont,imagepsextendfont,imagepsfreefont,imagepsloadfont,imagepsslantfont,imagepstext,imagerectangle,imagerotate,imagesetbrush,imagesetpixel,imagesetstyle,imagesetthickness,imagesettile,imagestring,imagestringup,imagesx,imagesy,imagetruecolortopalette,imagettfbbox,imagettftext,imagetypes,imagewbmp,imap_8bit,imap_alerts,imap_append,imap_base64,imap_binary,imap_body,imap_bodystruct,imap_check,imap_clearflag_full,imap_close,imap_createmailbox,imap_delete,imap_deletemailbox,imap_errors,imap_expunge,imap_fetch_overview,imap_fetchbody,imap_fetchheader,imap_fetchstructure,imap_get_quota,imap_get_quotaroot,imap_getmailboxes,imap_getsubscribed,imap_header,imap_headerinfo,imap_headers,imap_last_error,imap_list,imap_listmailbox,imap_listscan,imap_listsubscribed,imap_lsub,imap_mail_compose,imap_mail_copy,imap_mail_move,imap_mail,imap_mailboxmsginfo,imap_mime_header_decode,imap_msgno,imap_num_msg,imap_num_recent,imap_open,imap_ping,imap_qprint,imap_renamemailbox,imap_reopen,imap_rfc822_parse_adrlist,imap_rfc822_parse_headers,imap_rfc822_write_address,imap_scanmailbox,imap_search,imap_set_quota,imap_setacl,imap_setflag_full,imap_sort,imap_status,imap_subscribe,imap_thread,imap_uid,imap_undelete,imap_unsubscribe,imap_utf7_decode,imap_utf7_encode,imap_utf8,implode,import_request_variables,in_array,include_once,include,ingres_autocommit,ingres_close,ingres_commit,ingres_connect,ingres_fetch_array,ingres_fetch_object,ingres_fetch_row,ingres_field_length,ingres_field_name,ingres_field_nullable,ingres_field_precision,ingres_field_scale,ingres_field_type,ingres_num_fields,ingres_num_rows,ingres_pconnect,ingres_query,ingres_rollback,ini_alter,ini_get_all,ini_get,ini_restore,ini_set,intval,ip2long,iptcembed,iptcparse,ircg_channel_mode,ircg_disconnect,ircg_fetch_error_msg,ircg_get_username,ircg_html_encode,ircg_ignore_add,ircg_ignore_del,ircg_is_conn_alive,ircg_join,ircg_kick,ircg_lookup_format_messages,ircg_msg,ircg_nick,ircg_nickname_escape,ircg_nickname_unescape,ircg_notice,ircg_part,ircg_pconnect,ircg_register_format_messages,ircg_set_current,ircg_set_file,ircg_set_on_die,ircg_topic,ircg_whois,is_a,is_array,is_bool,is_callable,is_dir,is_double,is_executable,is_file,is_finite,is_float,is_infinite,is_int,is_integer,is_link,is_long,is_nan,is_null,is_numeric,is_object,is_readable,is_real,is_resource,is_scalar,is_string,is_subclass_of,is_uploaded_file,is_writable,is_writeable,isset,java_last_exception_clear,java_last_exception_get,jddayofweek,jdmonthname,jdtofrench,jdtogregorian,jdtojewish,jdtojulian,jdtounix,jewishtojd,join,jpeg2wbmp,juliantojd,key,krsort,ksort,lcg_value,ldap_8859_to_t61,ldap_add,ldap_bind,ldap_close,ldap_compare,ldap_connect,ldap_count_entries,ldap_delete,ldap_dn2ufn,ldap_err2str,ldap_errno,ldap_error,ldap_explode_dn,ldap_first_attribute,ldap_first_entry,ldap_first_reference,ldap_free_result,ldap_get_attributes,ldap_get_dn,ldap_get_entries,ldap_get_option,ldap_get_values_len,ldap_get_values,ldap_list,ldap_mod_add,ldap_mod_del,ldap_mod_replace,ldap_modify,ldap_next_attribute,ldap_next_entry,ldap_next_reference,ldap_parse_reference,ldap_parse_result,ldap_read,ldap_rename,ldap_search,ldap_set_option,ldap_set_rebind_proc,ldap_sort,ldap_start_tls,ldap_t61_to_8859,ldap_unbind,levenshtein,link,linkinfo,list,localeconv,localtime,log,log10,log1p,long2ip,lstat,ltrim,mail,mailparse_determine_best_xfer_encoding,mailparse_msg_create,mailparse_msg_extract_part_file,mailparse_msg_extract_part,mailparse_msg_free,mailparse_msg_get_part_data,mailparse_msg_get_part,mailparse_msg_get_structure,mailparse_msg_parse_file,mailparse_msg_parse,mailparse_rfc822_parse_addresses,mailparse_stream_encode,mailparse_uudecode_all,max,mb_convert_case,mb_convert_encoding,mb_convert_kana,mb_convert_variables,mb_decode_mimeheader,mb_decode_numericentity,mb_detect_encoding,mb_detect_order,mb_encode_mimeheader,mb_encode_numericentity,mb_ereg_match,mb_ereg_replace,mb_ereg_search_getpos,mb_ereg_search_getregs,mb_ereg_search_init,mb_ereg_search_pos,mb_ereg_search_regs,mb_ereg_search_setpos,mb_ereg_search,mb_ereg,mb_eregi_replace,mb_eregi,mb_get_info,mb_http_input,mb_http_output,mb_internal_encoding,mb_language,mb_output_handler,mb_parse_str,mb_preferred_mime_name,mb_regex_encoding,mb_regex_set_options,mb_send_mail,mb_split,mb_strcut,mb_strimwidth,mb_strlen,mb_strpos,mb_strrpos,mb_strtolower,mb_strtoupper,mb_strwidth,mb_substitute_character,mb_substr_count,mb_substr,mcal_append_event,mcal_close,mcal_create_calendar,mcal_date_compare,mcal_date_valid,mcal_day_of_week,mcal_day_of_year,mcal_days_in_month,mcal_delete_calendar,mcal_delete_event,mcal_event_add_attribute,mcal_event_init,mcal_event_set_alarm,mcal_event_set_category,mcal_event_set_class,mcal_event_set_description,mcal_event_set_end,mcal_event_set_recur_daily,mcal_event_set_recur_monthly_mday,mcal_event_set_recur_monthly_wday,mcal_event_set_recur_none,mcal_event_set_recur_weekly,mcal_event_set_recur_yearly,mcal_event_set_start,mcal_event_set_title,mcal_expunge,mcal_fetch_current_stream_event,mcal_fetch_event,mcal_is_leap_year,mcal_list_alarms,mcal_list_events,mcal_next_recurrence,mcal_open,mcal_popen,mcal_rename_calendar,mcal_reopen,mcal_snooze,mcal_store_event,mcal_time_valid,mcal_week_of_year,mcrypt_cbc,mcrypt_cfb,mcrypt_create_iv,mcrypt_decrypt,mcrypt_ecb,mcrypt_enc_get_algorithms_name,mcrypt_enc_get_block_size,mcrypt_enc_get_iv_size,mcrypt_enc_get_key_size,mcrypt_enc_get_modes_name,mcrypt_enc_get_supported_key_sizes,mcrypt_enc_is_block_algorithm_mode,mcrypt_enc_is_block_algorithm,mcrypt_enc_is_block_mode,mcrypt_enc_self_test,mcrypt_encrypt,mcrypt_generic_deinit,mcrypt_generic_end,mcrypt_generic_init,mcrypt_generic,mcrypt_get_block_size,mcrypt_get_cipher_name,mcrypt_get_iv_size,mcrypt_get_key_size,mcrypt_list_algorithms,mcrypt_list_modes,mcrypt_module_close,mcrypt_module_get_algo_block_size,mcrypt_module_get_algo_key_size,mcrypt_module_get_supported_key_sizes,mcrypt_module_is_block_algorithm_mode,mcrypt_module_is_block_algorithm,mcrypt_module_is_block_mode,mcrypt_module_open,mcrypt_module_self_test,mcrypt_ofb,mcve_adduser,mcve_adduserarg,mcve_bt,mcve_checkstatus,mcve_chkpwd,mcve_chngpwd,mcve_completeauthorizations,mcve_connect,mcve_connectionerror,mcve_deleteresponse,mcve_deletetrans,mcve_deleteusersetup,mcve_deluser,mcve_destroyconn,mcve_destroyengine,mcve_disableuser,mcve_edituser,mcve_enableuser,mcve_force,mcve_getcell,mcve_getcellbynum,mcve_getcommadelimited,mcve_getheader,mcve_getuserarg,mcve_getuserparam,mcve_gft,mcve_gl,mcve_gut,mcve_initconn,mcve_initengine,mcve_initusersetup,mcve_iscommadelimited,mcve_liststats,mcve_listusers,mcve_maxconntimeout,mcve_monitor,mcve_numcolumns,mcve_numrows,mcve_override,mcve_parsecommadelimited,mcve_ping,mcve_preauth,mcve_preauthcompletion,mcve_qc,mcve_responseparam,mcve_return,mcve_returncode,mcve_returnstatus,mcve_sale,mcve_setblocking,mcve_setdropfile,mcve_setip,mcve_setssl,mcve_settimeout,mcve_settle,mcve_text_avs,mcve_text_code,mcve_text_cv,mcve_transactionauth,mcve_transactionavs,mcve_transactionbatch,mcve_transactioncv,mcve_transactionid,mcve_transactionitem,mcve_transactionssent,mcve_transactiontext,mcve_transinqueue,mcve_transnew,mcve_transparam,mcve_transsend,mcve_ub,mcve_uwait,mcve_verifyconnection,mcve_verifysslcert,mcve_void,md5_file,md5,mdecrypt_generic,metaphone,method_exists,mhash_count,mhash_get_block_size,mhash_get_hash_name,mhash_keygen_s2k,mhash,microtime,mime_content_type,min,ming_setcubicthreshold,ming_setscale,ming_useswfversion,mkdir,mktime,money_format,move_uploaded_file,msession_connect,msession_count,msession_create,msession_destroy,msession_disconnect,msession_find,msession_get_array,msession_get,msession_getdata,msession_inc,msession_list,msession_listvar,msession_lock,msession_plugin,msession_randstr,msession_set_array,msession_set,msession_setdata,msession_timeout,msession_uniq,msession_unlock,msg_get_queue,msg_receive,msg_remove_queue,msg_send,msg_set_queue,msg_stat_queue,msql_affected_rows,msql_close,msql_connect,msql_create_db,msql_createdb,msql_data_seek,msql_dbname,msql_drop_db,msql_dropdb,msql_error,msql_fetch_array,msql_fetch_field,msql_fetch_object,msql_fetch_row,msql_field_seek,msql_fieldflags,msql_fieldlen,msql_fieldname,msql_fieldtable,msql_fieldtype,msql_free_result,msql_freeresult,msql_list_dbs,msql_list_fields,msql_list_tables,msql_listdbs,msql_listfields,msql_listtables,msql_num_fields,msql_num_rows,msql_numfields,msql_numrows,msql_pconnect,msql_query,msql_regcase,msql_result,msql_select_db,msql_selectdb,msql_tablename,msql,mssql_bind,mssql_close,mssql_connect,mssql_data_seek,mssql_execute,mssql_fetch_array,mssql_fetch_assoc,mssql_fetch_batch,mssql_fetch_field,mssql_fetch_object,mssql_fetch_row,mssql_field_length,mssql_field_name,mssql_field_seek,mssql_field_type,mssql_free_result,mssql_free_statement,mssql_get_last_message,mssql_guid_string,mssql_init,mssql_min_error_severity,mssql_min_message_severity,mssql_next_result,mssql_num_fields,mssql_num_rows,mssql_pconnect,mssql_query,mssql_result,mssql_rows_affected,mssql_select_db,mt_getrandmax,mt_rand,mt_srand,muscat_close,muscat_get,muscat_give,muscat_setup_net,muscat_setup,mysql_affected_rows,mysql_change_user,mysql_character_set_name,mysql_close,mysql_connect,mysql_create_db,mysql_data_seek,mysql_db_name,mysql_db_query,mysql_drop_db,mysql_errno,mysql_error,mysql_escape_string,mysql_fetch_array,mysql_fetch_assoc,mysql_fetch_field,mysql_fetch_lengths,mysql_fetch_object,mysql_fetch_row,mysql_field_flags,mysql_field_len,mysql_field_name,mysql_field_seek,mysql_field_table,mysql_field_type,mysql_free_result,mysql_get_client_info,mysql_get_host_info,mysql_get_proto_info,mysql_get_server_info,mysql_info,mysql_insert_id,mysql_list_dbs,mysql_list_fields,mysql_list_processes,mysql_list_tables,mysql_num_fields,mysql_num_rows,mysql_pconnect,mysql_ping,mysql_query,mysql_real_escape_string,mysql_result,mysql_select_db,mysql_stat,mysql_tablename,mysql_thread_id,mysql_unbuffered_query,natcasesort,natsort,ncurses_addch,ncurses_addchnstr,ncurses_addchstr,ncurses_addnstr,ncurses_addstr,ncurses_assume_default_colors,ncurses_attroff,ncurses_attron,ncurses_attrset,ncurses_baudrate,ncurses_beep,ncurses_bkgd,ncurses_bkgdset,ncurses_border,ncurses_can_change_color,ncurses_cbreak,ncurses_clear,ncurses_clrtobot,ncurses_clrtoeol,ncurses_color_set,ncurses_curs_set,ncurses_def_prog_mode,ncurses_def_shell_mode,ncurses_define_key,ncurses_delay_output,ncurses_delch,ncurses_deleteln,ncurses_delwin,ncurses_doupdate,ncurses_echo,ncurses_echochar,ncurses_end,ncurses_erase,ncurses_erasechar,ncurses_filter,ncurses_flash,ncurses_flushinp,ncurses_getch,ncurses_getmouse,ncurses_halfdelay,ncurses_has_colors,ncurses_has_ic,ncurses_has_il,ncurses_has_key,ncurses_hline,ncurses_inch,ncurses_init_color,ncurses_init_pair,ncurses_init,ncurses_insch,ncurses_insdelln,ncurses_insertln,ncurses_insstr,ncurses_instr,ncurses_isendwin,ncurses_keyok,ncurses_killchar,ncurses_longname,ncurses_mouseinterval,ncurses_mousemask,ncurses_move,ncurses_mvaddch,ncurses_mvaddchnstr,ncurses_mvaddchstr,ncurses_mvaddnstr,ncurses_mvaddstr,ncurses_mvcur,ncurses_mvdelch,ncurses_mvgetch,ncurses_mvhline,ncurses_mvinch,ncurses_mvvline,ncurses_mvwaddstr,ncurses_napms,ncurses_newwin,ncurses_nl,ncurses_nocbreak,ncurses_noecho,ncurses_nonl,ncurses_noqiflush,ncurses_noraw,ncurses_putp,ncurses_qiflush,ncurses_raw,ncurses_refresh,ncurses_resetty,ncurses_savetty,ncurses_scr_dump,ncurses_scr_init,ncurses_scr_restore,ncurses_scr_set,ncurses_scrl,ncurses_slk_attr,ncurses_slk_attroff,ncurses_slk_attron,ncurses_slk_attrset,ncurses_slk_clear,ncurses_slk_color,ncurses_slk_init,ncurses_slk_noutrefresh,ncurses_slk_refresh,ncurses_slk_restore,ncurses_slk_touch,ncurses_standend,ncurses_standout,ncurses_start_color,ncurses_termattrs,ncurses_termname,ncurses_timeout,ncurses_typeahead,ncurses_ungetch,ncurses_ungetmouse,ncurses_use_default_colors,ncurses_use_env,ncurses_use_extended_names,ncurses_vidattr,ncurses_vline,ncurses_wrefresh,next,ngettext,nl_langinfo,nl2br,notes_body,notes_copy_db,notes_create_db,notes_create_note,notes_drop_db,notes_find_note,notes_header_info,notes_list_msgs,notes_mark_read,notes_mark_unread,notes_nav_create,notes_search,notes_unread,notes_version,number_format,ob_clean,ob_end_clean,ob_end_flush,ob_flush,ob_get_contents,ob_get_length,ob_get_level,ob_get_status,ob_gzhandler,ob_iconv_handler,ob_implicit_flush,ob_start,ocibindbyname,ocicancel,ocicollappend,ocicollassign,ocicollassignelem,ocicollgetelem,ocicollmax,ocicollsize,ocicolltrim,ocicolumnisnull,ocicolumnname,ocicolumnprecision,ocicolumnscale,ocicolumnsize,ocicolumntype,ocicolumntyperaw,ocicommit,ocidefinebyname,ocierror,ociexecute,ocifetch,ocifetchinto,ocifetchstatement,ocifreecollection,ocifreecursor,ocifreedesc,ocifreestatement,ociinternaldebug,ociloadlob,ocilogoff,ocilogon,ocinewcollection,ocinewcursor,ocinewdescriptor,ocinlogon,ocinumcols,ociparse,ociplogon,ociresult,ocirollback,ocirowcount,ocisavelob,ocisavelobfile,ociserverversion,ocisetprefetch,ocistatementtype,ociwritelobtofile,octdec,odbc_autocommit,odbc_binmode,odbc_close_all,odbc_close,odbc_columnprivileges,odbc_columns,odbc_commit,odbc_connect,odbc_cursor,odbc_data_source,odbc_do,odbc_error,odbc_errormsg,odbc_exec,odbc_execute,odbc_fetch_array,odbc_fetch_into,odbc_fetch_object,odbc_fetch_row,odbc_field_len,odbc_field_name,odbc_field_num,odbc_field_precision,odbc_field_scale,odbc_field_type,odbc_foreignkeys,odbc_free_result,odbc_gettypeinfo,odbc_longreadlen,odbc_next_result,odbc_num_fields,odbc_num_rows,odbc_pconnect,odbc_prepare,odbc_primarykeys,odbc_procedurecolumns,odbc_procedures,odbc_result_all,odbc_result,odbc_rollback,odbc_setoption,odbc_specialcolumns,odbc_statistics,odbc_tableprivileges,odbc_tables,opendir,openlog,openssl_csr_export_to_file,openssl_csr_export,openssl_csr_new,openssl_csr_sign,openssl_error_string,openssl_free_key,openssl_get_privatekey,openssl_get_publickey,openssl_open,openssl_pkcs7_decrypt,openssl_pkcs7_encrypt,openssl_pkcs7_sign,openssl_pkcs7_verify,openssl_pkey_export_to_file,openssl_pkey_export,openssl_pkey_get_private,openssl_pkey_get_public,openssl_pkey_new,openssl_private_decrypt,openssl_private_encrypt,openssl_public_decrypt,openssl_public_encrypt,openssl_seal,openssl_sign,openssl_verify,openssl_x509_check_private_key,openssl_x509_checkpurpose,openssl_x509_export_to_file,openssl_x509_export,openssl_x509_free,openssl_x509_parse,openssl_x509_read,ora_bind,ora_close,ora_columnname,ora_columnsize,ora_columntype,ora_commit,ora_commitoff,ora_commiton,ora_do,ora_error,ora_errorcode,ora_exec,ora_fetch_into,ora_fetch,ora_getcolumn,ora_logoff,ora_logon,ora_numcols,ora_numrows,ora_open,ora_parse,ora_plogon,ora_rollback,ord,overload,ovrimos_close,ovrimos_commit,ovrimos_connect,ovrimos_cursor,ovrimos_exec,ovrimos_execute,ovrimos_fetch_into,ovrimos_fetch_row,ovrimos_field_len,ovrimos_field_name,ovrimos_field_num,ovrimos_field_type,ovrimos_free_result,ovrimos_longreadlen,ovrimos_num_fields,ovrimos_num_rows,ovrimos_prepare,ovrimos_result_all,ovrimos_result,ovrimos_rollback,pack,parse_ini_file,parse_str,parse_url,passthru,pathinfo,pclose,pcntl_exec,pcntl_fork,pcntl_signal,pcntl_waitpid,pcntl_wexitstatus,pcntl_wifexited,pcntl_wifsignaled,pcntl_wifstopped,pcntl_wstopsig,pcntl_wtermsig,pdf_add_annotation,pdf_add_bookmark,pdf_add_launchlink,pdf_add_locallink,pdf_add_note,pdf_add_outline,pdf_add_pdflink,pdf_add_thumbnail,pdf_add_weblink,pdf_arc,pdf_arcn,pdf_attach_file,pdf_begin_page,pdf_begin_pattern,pdf_begin_template,pdf_circle,pdf_clip,pdf_close_image,pdf_close_pdi_page,pdf_close_pdi,pdf_close,pdf_closepath_fill_stroke,pdf_closepath_stroke,pdf_closepath,pdf_concat,pdf_continue_text,pdf_curveto,pdf_delete,pdf_end_page,pdf_end_pattern,pdf_end_template,pdf_endpath,pdf_fill_stroke,pdf_fill,pdf_findfont,pdf_get_buffer,pdf_get_font,pdf_get_fontname,pdf_get_fontsize,pdf_get_image_height,pdf_get_image_width,pdf_get_majorversion,pdf_get_minorversion,pdf_get_parameter,pdf_get_pdi_parameter,pdf_get_pdi_value,pdf_get_value,pdf_initgraphics,pdf_lineto,pdf_makespotcolor,pdf_moveto,pdf_new,pdf_open_ccitt,pdf_open_file,pdf_open_gif,pdf_open_image_file,pdf_open_image,pdf_open_jpeg,pdf_open_memory_image,pdf_open_pdi_page,pdf_open_pdi,pdf_open_png,pdf_open_tiff,pdf_open,pdf_place_image,pdf_place_pdi_page,pdf_rect,pdf_restore,pdf_rotate,pdf_save,pdf_scale,pdf_set_border_color,pdf_set_border_dash,pdf_set_border_style,pdf_set_char_spacing,pdf_set_duration,pdf_set_font,pdf_set_horiz_scaling,pdf_set_info_author,pdf_set_info_creator,pdf_set_info_keywords,pdf_set_info_subject,pdf_set_info_title,pdf_set_info,pdf_set_leading,pdf_set_parameter,pdf_set_text_matrix,pdf_set_text_pos,pdf_set_text_rendering,pdf_set_text_rise,pdf_set_value,pdf_set_word_spacing,pdf_setcolor,pdf_setdash,pdf_setflat,pdf_setfont,pdf_setgray_fill,pdf_setgray_stroke,pdf_setgray,pdf_setlinecap,pdf_setlinejoin,pdf_setlinewidth,pdf_setmatrix,pdf_setmiterlimit,pdf_setpolydash,pdf_setrgbcolor_fill,pdf_setrgbcolor_stroke,pdf_setrgbcolor,pdf_show_boxed,pdf_show_xy,pdf_show,pdf_skew,pdf_stringwidth,pdf_stroke,pdf_translate,pfpro_cleanup,pfpro_init,pfpro_process_raw,pfpro_process,pfpro_version,pfsockopen,pg_affected_rows,pg_cancel_query,pg_client_encoding,pg_close,pg_connect,pg_connection_busy,pg_connection_reset,pg_connection_status,pg_convert,pg_copy_from,pg_copy_to,pg_dbname,pg_delete,pg_end_copy,pg_escape_bytea,pg_escape_string,pg_fetch_all,pg_fetch_array,pg_fetch_assoc,pg_fetch_object,pg_fetch_result,pg_fetch_row,pg_field_is_null,pg_field_name,pg_field_num,pg_field_prtlen,pg_field_size,pg_field_type,pg_free_result,pg_get_notify,pg_get_pid,pg_get_result,pg_host,pg_insert,pg_last_error,pg_last_notice,pg_last_oid,pg_lo_close,pg_lo_create,pg_lo_export,pg_lo_import,pg_lo_open,pg_lo_read_all,pg_lo_read,pg_lo_seek,pg_lo_tell,pg_lo_unlink,pg_lo_write,pg_meta_data,pg_num_fields,pg_num_rows,pg_options,pg_pconnect,pg_ping,pg_port,pg_put_line,pg_query,pg_result_error,pg_result_seek,pg_result_status,pg_select,pg_send_query,pg_set_client_encoding,pg_trace,pg_tty,pg_unescape_bytea,pg_untrace,pg_update,php_ini_scanned_files,php_logo_guid,php_sapi_name,php_uname,phpcredits,phpinfo,phpversion,pi,png2wbmp,popen,pos,posix_ctermid,posix_getcwd,posix_getegid,posix_geteuid,posix_getgid,posix_getgrgid,posix_getgrnam,posix_getgroups,posix_getlogin,posix_getpgid,posix_getpgrp,posix_getpid,posix_getppid,posix_getpwnam,posix_getpwuid,posix_getrlimit,posix_getsid,posix_getuid,posix_isatty,posix_kill,posix_mkfifo,posix_setegid,posix_seteuid,posix_setgid,posix_setpgid,posix_setsid,posix_setuid,posix_times,posix_ttyname,posix_uname,pow,preg_grep,preg_match_all,preg_match,preg_quote,preg_replace_callback,preg_replace,preg_split,prev,print_r,print,printer_abort,printer_close,printer_create_brush,printer_create_dc,printer_create_font,printer_create_pen,printer_delete_brush,printer_delete_dc,printer_delete_font,printer_delete_pen,printer_draw_bmp,printer_draw_chord,printer_draw_elipse,printer_draw_line,printer_draw_pie,printer_draw_rectangle,printer_draw_roundrect,printer_draw_text,printer_end_doc,printer_end_page,printer_get_option,printer_list,printer_logical_fontheight,printer_open,printer_select_brush,printer_select_font,printer_select_pen,printer_set_option,printer_start_doc,printer_start_page,printer_write,printf,proc_close,proc_open,pspell_add_to_personal,pspell_add_to_session,pspell_check,pspell_clear_session,pspell_config_create,pspell_config_ignore,pspell_config_mode,pspell_config_personal,pspell_config_repl,pspell_config_runtogether,pspell_config_save_repl,pspell_new_config,pspell_new_personal,pspell_new,pspell_save_wordlist,pspell_store_replacement,pspell_suggest,putenv,qdom_error,qdom_tree,quoted_printable_decode,quotemeta,rad2deg,rand,range,rawurldecode,rawurlencode,read_exif_data,readdir,readfile,readgzfile,readline_add_history,readline_clear_history,readline_completion_function,readline_info,readline_list_history,readline_read_history,readline_write_history,readline,readlink,realpath,recode_file,recode_string,recode,register_shutdown_function,register_tick_function,rename,require_once,require,reset,restore_error_handler,return,rewind,rewinddir,rmdir,round,rsort,rtrim,sem_acquire,sem_get,sem_release,sem_remove,serialize,sesam_affected_rows,sesam_commit,sesam_connect,sesam_diagnostic,sesam_disconnect,sesam_errormsg,sesam_execimm,sesam_fetch_array,sesam_fetch_result,sesam_fetch_row,sesam_field_array,sesam_field_name,sesam_free_result,sesam_num_fields,sesam_query,sesam_rollback,sesam_seek_row,sesam_settransaction,session_cache_expire,session_cache_limiter,session_decode,session_destroy,session_encode,session_get_cookie_params,session_id,session_is_registered,session_module_name,session_name,session_readonly,session_register,session_save_path,session_set_cookie_params,session_set_save_handler,session_start,session_unregister,session_unset,session_write_close,set_error_handler,set_file_buffer,set_magic_quotes_runtime,set_time_limit,setcookie,setlocale,settype,sha1_file,sha1,shell_exec,shm_attach,shm_detach,shm_get_var,shm_put_var,shm_remove_var,shm_remove,shmop_close,shmop_delete,shmop_open,shmop_read,shmop_size,shmop_write,show_source,shuffle,similar_text,sin,sinh,sizeof,sleep,snmp_get_quick_print,snmp_set_quick_print,snmpget,snmprealwalk,snmpset,snmpwalk,snmpwalkoid,socket_accept,socket_bind,socket_clear_error,socket_close,socket_connect,socket_create_listen,socket_create_pair,socket_create,socket_get_option,socket_get_status,socket_getpeername,socket_getsockname,socket_iovec_add,socket_iovec_alloc,socket_iovec_delete,socket_iovec_fetch,socket_iovec_free,socket_iovec_set,socket_last_error,socket_listen,socket_read,socket_readv,socket_recv,socket_recvfrom,socket_recvmsg,socket_select,socket_send,socket_sendmsg,socket_sendto,socket_set_blocking,socket_set_nonblock,socket_set_option,socket_set_timeout,socket_shutdown,socket_strerror,socket_write,socket_writev,sort,soundex,split,spliti,sprintf,sql_regcase,sqrt,srand,sscanf,stat,str_pad,str_repeat,str_replace,str_rot13,str_shuffle,str_word_count,strcasecmp,strchr,strcmp,strcoll,strcspn,stream_context_create,stream_context_get_options,stream_context_set_option,stream_context_set_params,stream_filter_append,stream_filter_prepend,stream_get_filters,stream_get_meta_data,stream_get_wrappers,stream_register_filter,stream_register_wrapper,stream_select,stream_set_blocking,stream_set_timeout,stream_set_write_buffer,strftime,strip_tags,stripcslashes,stripslashes,stristr,strlen,strnatcasecmp,strnatcmp,strncasecmp,strncmp,strpos,strrchr,strrev,strrpos,strspn,strstr,strtok,strtolower,strtotime,strtoupper,strtr,strval,substr_count,substr_replace,substr,swf_actiongeturl,swf_actiongotoframe,swf_actiongotolabel,swf_actionnextframe,swf_actionplay,swf_actionprevframe,swf_actionsettarget,swf_actionstop,swf_actiontogglequality,swf_actionwaitforframe,swf_addbuttonrecord,swf_addcolor,swf_closefile,swf_definebitmap,swf_definefont,swf_defineline,swf_definepoly,swf_definerect,swf_definetext,swf_endbutton,swf_enddoaction,swf_endshape,swf_endsymbol,swf_fontsize,swf_fontslant,swf_fonttracking,swf_getbitmapinfo,swf_getfontinfo,swf_getframe,swf_labelframe,swf_lookat,swf_modifyobject,swf_mulcolor,swf_nextid,swf_oncondition,swf_openfile,swf_ortho,swf_ortho2,swf_perspective,swf_placeobject,swf_polarview,swf_popmatrix,swf_posround,swf_pushmatrix,swf_removeobject,swf_rotate,swf_scale,swf_setfont,swf_setframe,swf_shapearc,swf_shapecurveto,swf_shapecurveto3,swf_shapefillbitmapclip,swf_shapefillbitmaptile,swf_shapefilloff,swf_shapefillsolid,swf_shapelinesolid,swf_shapelineto,swf_shapemoveto,swf_showframe,swf_startbutton,swf_startdoaction,swf_startshape,swf_startsymbol,swf_textwidth,swf_translate,swf_viewport,swfaction,swfbitmap.getheight,swfbitmap.getwidth,swfbitmap,swfbutton_keypress,swfbutton.addaction,swfbutton.addshape,swfbutton,swfbutton.setaction,swfbutton.setdown,swfbutton.sethit,swfbutton.setover,swfbutton.setup,swfdisplayitem.addcolor,swfdisplayitem,swfdisplayitem.move,swfdisplayitem.moveto,swfdisplayitem.multcolor,swfdisplayitem.remove,swfdisplayitem.rotate,swfdisplayitem.rotateto,swfdisplayitem.scale,swfdisplayitem.scaleto,swfdisplayitem.setdepth,swfdisplayitem.setname,swfdisplayitem.setratio,swfdisplayitem.skewx,swfdisplayitem.skewxto,swfdisplayitem.skewy,swfdisplayitem.skewyto,swffill,swffill.moveto,swffill.rotateto,swffill.scaleto,swffill.skewxto,swffill.skewyto,swffont.getwidth,swffont,swfgradient.addentry,swfgradient,swfmorph.getshape1,swfmorph.getshape2,swfmorph,swfmovie.add,swfmovie,swfmovie.nextframe,swfmovie.output,swfmovie.remove,swfmovie.save,swfmovie.setbackground,swfmovie.setdimension,swfmovie.setframes,swfmovie.setrate,swfmovie.streammp3,swfshape.addfill,swfshape.drawcurve,swfshape.drawcurveto,swfshape.drawline,swfshape.drawlineto,swfshape,swfshape.movepen,swfshape.movepento,swfshape.setleftfill,swfshape.setline,swfshape.setrightfill,swfsprite.add,swfsprite,swfsprite.nextframe,swfsprite.remove,swfsprite.setframes,swftext.addstring,swftext.getwidth,swftext,swftext.moveto,swftext.setcolor,swftext.setfont,swftext.setheight,swftext.setspacing,swftextfield.addstring,swftextfield.align,swftextfield,swftextfield.setbounds,swftextfield.setcolor,swftextfield.setfont,swftextfield.setheight,swftextfield.setindentation,swftextfield.setleftmargin,swftextfield.setlinespacing,swftextfield.setmargins,swftextfield.setname,swftextfield.setrightmargin,sybase_affected_rows,sybase_close,sybase_connect,sybase_data_seek,sybase_fetch_array,sybase_fetch_field,sybase_fetch_object,sybase_fetch_row,sybase_field_seek,sybase_free_result,sybase_get_last_message,sybase_min_client_severity,sybase_min_error_severity,sybase_min_message_severity,sybase_min_server_severity,sybase_num_fields,sybase_num_rows,sybase_pconnect,sybase_query,sybase_result,sybase_select_db,symlink,syslog,system,tan,tanh,tempnam,textdomain,time,tmpfile,token_get_all,token_name,touch,trigger_error,trim,uasort,ucfirst,ucwords,udm_add_search_limit,udm_alloc_agent,udm_api_version,udm_cat_list,udm_cat_path,udm_check_charset,udm_check_stored,udm_clear_search_limits,udm_close_stored,udm_crc32,udm_errno,udm_error,udm_find,udm_free_agent,udm_free_ispell_data,udm_free_res,udm_get_doc_count,udm_get_res_field,udm_get_res_param,udm_load_ispell_data,udm_open_stored,udm_set_agent_param,uksort,umask,uniqid,unixtojd,unlink,unpack,unregister_tick_function,unserialize,unset,urldecode,urlencode,user_error,usleep,usort,utf8_decode,utf8_encode,var_dump,var_export,version_compare,virtual,vpopmail_add_alias_domain_ex,vpopmail_add_alias_domain,vpopmail_add_domain_ex,vpopmail_add_domain,vpopmail_add_user,vpopmail_alias_add,vpopmail_alias_del_domain,vpopmail_alias_del,vpopmail_alias_get_all,vpopmail_alias_get,vpopmail_auth_user,vpopmail_del_domain_ex,vpopmail_del_domain,vpopmail_del_user,vpopmail_error,vpopmail_passwd,vpopmail_set_user_quota,vprintf,vsprintf,w32api_deftype,w32api_init_dtype,w32api_invoke_function,w32api_register_function,w32api_set_call_method,wddx_add_vars,wddx_deserialize,wddx_packet_end,wddx_packet_start,wddx_serialize_value,wddx_serialize_vars,wordwrap,xml_error_string,xml_get_current_byte_index,xml_get_current_column_number,xml_get_current_line_number,xml_get_error_code,xml_parse_into_struct,xml_parse,xml_parser_create_ns,xml_parser_create,xml_parser_free,xml_parser_get_option,xml_parser_set_option,xml_set_character_data_handler,xml_set_default_handler,xml_set_element_handler,xml_set_end_namespace_decl_handler,xml_set_external_entity_ref_handler,xml_set_notation_decl_handler,xml_set_object,xml_set_processing_instruction_handler,xml_set_start_namespace_decl_handler,xml_set_unparsed_entity_decl_handler,xmlrpc_decode_request,xmlrpc_decode,xmlrpc_encode_request,xmlrpc_encode,xmlrpc_get_type,xmlrpc_parse_method_descriptions,xmlrpc_server_add_introspection_data,xmlrpc_server_call_method,xmlrpc_server_create,xmlrpc_server_destroy,xmlrpc_server_register_introspection_callback,xmlrpc_server_register_method,xmlrpc_set_type,xpath_eval_expression,xpath_eval,xpath_new_context,xptr_eval,xptr_new_context,xslt_create,xslt_errno,xslt_error,xslt_free,xslt_process,xslt_set_base,xslt_set_encoding,xslt_set_error_handler,xslt_set_log,xslt_set_sax_handler,xslt_set_sax_handlers,xslt_set_scheme_handler,xslt_set_scheme_handlers,yaz_addinfo,yaz_ccl_conf,yaz_ccl_parse,yaz_close,yaz_connect,yaz_database,yaz_element,yaz_errno,yaz_error,yaz_get_option,yaz_hits,yaz_itemorder,yaz_present,yaz_range,yaz_record,yaz_scan_result,yaz_scan,yaz_schema,yaz_search,yaz_set_option,yaz_sort,yaz_syntax,yaz_wait,yp_all,yp_cat,yp_err_string,yp_errno,yp_first,yp_get_default_domain,yp_master,yp_match,yp_next,yp_order,zend_logo_guid,zend_version,zip_close,zip_entry_close,zip_entry_compressedsize,zip_entry_compressionmethod,zip_entry_filesize,zip_entry_name,zip_entry_open,zip_entry_read,zip_open,zip_read,functions.arguments.html,functions.html,functions.old_syntax.html,functions.returning_values.html,functions.variable_functions.html,language.oop.magic_functions.html,zend.calling_user_functions.html,zend.structure.exporting_functions.html,zend.structure.function_block.html
+
+calling_user_functions.html=calling-user-functions.html
+features.safe_mode.functions.html=features.safe-mode.functions.html
+abs=function.abs.html
+acos=function.acos.html
+acosh=function.acosh.html
+addcslashes=function.addcslashes.html
+addslashes=function.addslashes.html
+aggregate_info=function.aggregate-info.html
+aggregate_methods_by_list=function.aggregate-methods-by-list.html
+aggregate_methods_by_regexp=function.aggregate-methods-by-regexp.html
+aggregate_methods=function.aggregate-methods.html
+aggregate_properties_by_list=function.aggregate-properties-by-list.html
+aggregate_properties_by_regexp=function.aggregate-properties-by-regexp.html
+aggregate_properties=function.aggregate-properties.html
+aggregate=function.aggregate.html
+aggregation_info=function.aggregation-info.html
+apache_child_terminate=function.apache-child-terminate.html
+apache_lookup_uri=function.apache-lookup-uri.html
+apache_note=function.apache-note.html
+apache_request_headers=function.apache-request-headers.html
+apache_response_headers=function.apache-response-headers.html
+apache_setenv=function.apache-setenv.html
+array_change_key_case=function.array-change-key-case.html
+array_chunk=function.array-chunk.html
+array_count_values=function.array-count-values.html
+array_diff_assoc=function.array-diff-assoc.html
+array_diff=function.array-diff.html
+array_fill=function.array-fill.html
+array_filter=function.array-filter.html
+array_flip=function.array-flip.html
+array_intersect_assoc=function.array-intersect-assoc.html
+array_intersect=function.array-intersect.html
+array_key_exists=function.array-key-exists.html
+array_keys=function.array-keys.html
+array_map=function.array-map.html
+array_merge_recursive=function.array-merge-recursive.html
+array_merge=function.array-merge.html
+array_multisort=function.array-multisort.html
+array_pad=function.array-pad.html
+array_pop=function.array-pop.html
+array_push=function.array-push.html
+array_rand=function.array-rand.html
+array_reduce=function.array-reduce.html
+array_reverse=function.array-reverse.html
+array_search=function.array-search.html
+array_shift=function.array-shift.html
+array_slice=function.array-slice.html
+array_splice=function.array-splice.html
+array_sum=function.array-sum.html
+array_unique=function.array-unique.html
+array_unshift=function.array-unshift.html
+array_values=function.array-values.html
+array_walk=function.array-walk.html
+array=function.array.html
+arsort=function.arsort.html
+ascii2ebcdic=function.ascii2ebcdic.html
+asin=function.asin.html
+asinh=function.asinh.html
+asort=function.asort.html
+aspell_check_raw=function.aspell-check-raw.html
+aspell_check=function.aspell-check.html
+aspell_new=function.aspell-new.html
+aspell_suggest=function.aspell-suggest.html
+assert_options=function.assert-options.html
+assert=function.assert.html
+atan=function.atan.html
+atan2=function.atan2.html
+atanh=function.atanh.html
+base_convert=function.base-convert.html
+base64_decode=function.base64-decode.html
+base64_encode=function.base64-encode.html
+basename=function.basename.html
+bcadd=function.bcadd.html
+bccomp=function.bccomp.html
+bcdiv=function.bcdiv.html
+bcmod=function.bcmod.html
+bcmul=function.bcmul.html
+bcpow=function.bcpow.html
+bcpowmod=function.bcpowmod.html
+bcscale=function.bcscale.html
+bcsqrt=function.bcsqrt.html
+bcsub=function.bcsub.html
+bin2hex=function.bin2hex.html
+bind_textdomain_codeset=function.bind-textdomain-codeset.html
+bindec=function.bindec.html
+bindtextdomain=function.bindtextdomain.html
+bzclose=function.bzclose.html
+bzcompress=function.bzcompress.html
+bzdecompress=function.bzdecompress.html
+bzerrno=function.bzerrno.html
+bzerror=function.bzerror.html
+bzerrstr=function.bzerrstr.html
+bzflush=function.bzflush.html
+bzopen=function.bzopen.html
+bzread=function.bzread.html
+bzwrite=function.bzwrite.html
+cal_days_in_month=function.cal-days-in-month.html
+cal_from_jd=function.cal-from-jd.html
+cal_info=function.cal-info.html
+cal_to_jd=function.cal-to-jd.html
+call_user_func_array=function.call-user-func-array.html
+call_user_func=function.call-user-func.html
+call_user_method_array=function.call-user-method-array.html
+call_user_method=function.call-user-method.html
+ccvs_add=function.ccvs-add.html
+ccvs_auth=function.ccvs-auth.html
+ccvs_command=function.ccvs-command.html
+ccvs_count=function.ccvs-count.html
+ccvs_delete=function.ccvs-delete.html
+ccvs_done=function.ccvs-done.html
+ccvs_init=function.ccvs-init.html
+ccvs_lookup=function.ccvs-lookup.html
+ccvs_new=function.ccvs-new.html
+ccvs_report=function.ccvs-report.html
+ccvs_return=function.ccvs-return.html
+ccvs_reverse=function.ccvs-reverse.html
+ccvs_sale=function.ccvs-sale.html
+ccvs_status=function.ccvs-status.html
+ccvs_textvalue=function.ccvs-textvalue.html
+ccvs_void=function.ccvs-void.html
+ceil=function.ceil.html
+chdir=function.chdir.html
+checkdate=function.checkdate.html
+checkdnsrr=function.checkdnsrr.html
+chgrp=function.chgrp.html
+chmod=function.chmod.html
+chop=function.chop.html
+chown=function.chown.html
+chr=function.chr.html
+chroot=function.chroot.html
+chunk_split=function.chunk-split.html
+class_exists=function.class-exists.html
+clearstatcache=function.clearstatcache.html
+closedir=function.closedir.html
+closelog=function.closelog.html
+com_addref=function.com-addref.html
+com_get=function.com-get.html
+com_invoke=function.com-invoke.html
+com_isenum=function.com-isenum.html
+com_load_typelib=function.com-load-typelib.html
+com_load=function.com-load.html
+com_propget=function.com-propget.html
+com_propput=function.com-propput.html
+com_propset=function.com-propset.html
+com_release=function.com-release.html
+com_set=function.com-set.html
+compact=function.compact.html
+connection_aborted=function.connection-aborted.html
+connection_status=function.connection-status.html
+connection_timeout=function.connection-timeout.html
+constant=function.constant.html
+convert_cyr_string=function.convert-cyr-string.html
+copy=function.copy.html
+cos=function.cos.html
+cosh=function.cosh.html
+count_chars=function.count-chars.html
+count=function.count.html
+cpdf_add_annotation=function.cpdf-add-annotation.html
+cpdf_add_outline=function.cpdf-add-outline.html
+cpdf_arc=function.cpdf-arc.html
+cpdf_begin_text=function.cpdf-begin-text.html
+cpdf_circle=function.cpdf-circle.html
+cpdf_clip=function.cpdf-clip.html
+cpdf_close=function.cpdf-close.html
+cpdf_closepath_fill_stroke=function.cpdf-closepath-fill-stroke.html
+cpdf_closepath_stroke=function.cpdf-closepath-stroke.html
+cpdf_closepath=function.cpdf-closepath.html
+cpdf_continue_text=function.cpdf-continue-text.html
+cpdf_curveto=function.cpdf-curveto.html
+cpdf_end_text=function.cpdf-end-text.html
+cpdf_fill_stroke=function.cpdf-fill-stroke.html
+cpdf_fill=function.cpdf-fill.html
+cpdf_finalize_page=function.cpdf-finalize-page.html
+cpdf_finalize=function.cpdf-finalize.html
+cpdf_global_set_document_limits=function.cpdf-global-set-document-limits.html
+cpdf_import_jpeg=function.cpdf-import-jpeg.html
+cpdf_lineto=function.cpdf-lineto.html
+cpdf_moveto=function.cpdf-moveto.html
+cpdf_newpath=function.cpdf-newpath.html
+cpdf_open=function.cpdf-open.html
+cpdf_output_buffer=function.cpdf-output-buffer.html
+cpdf_page_init=function.cpdf-page-init.html
+cpdf_place_inline_image=function.cpdf-place-inline-image.html
+cpdf_rect=function.cpdf-rect.html
+cpdf_restore=function.cpdf-restore.html
+cpdf_rlineto=function.cpdf-rlineto.html
+cpdf_rmoveto=function.cpdf-rmoveto.html
+cpdf_rotate_text=function.cpdf-rotate-text.html
+cpdf_rotate=function.cpdf-rotate.html
+cpdf_save_to_file=function.cpdf-save-to-file.html
+cpdf_save=function.cpdf-save.html
+cpdf_scale=function.cpdf-scale.html
+cpdf_set_action_url=function.cpdf-set-action-url.html
+cpdf_set_char_spacing=function.cpdf-set-char-spacing.html
+cpdf_set_creator=function.cpdf-set-creator.html
+cpdf_set_current_page=function.cpdf-set-current-page.html
+cpdf_set_font_directories=function.cpdf-set-font-directories.html
+cpdf_set_font_map_file=function.cpdf-set-font-map-file.html
+cpdf_set_font=function.cpdf-set-font.html
+cpdf_set_horiz_scaling=function.cpdf-set-horiz-scaling.html
+cpdf_set_keywords=function.cpdf-set-keywords.html
+cpdf_set_leading=function.cpdf-set-leading.html
+cpdf_set_page_animation=function.cpdf-set-page-animation.html
+cpdf_set_subject=function.cpdf-set-subject.html
+cpdf_set_text_matrix=function.cpdf-set-text-matrix.html
+cpdf_set_text_pos=function.cpdf-set-text-pos.html
+cpdf_set_text_rendering=function.cpdf-set-text-rendering.html
+cpdf_set_text_rise=function.cpdf-set-text-rise.html
+cpdf_set_title=function.cpdf-set-title.html
+cpdf_set_viewer_preferences=function.cpdf-set-viewer-preferences.html
+cpdf_set_word_spacing=function.cpdf-set-word-spacing.html
+cpdf_setdash=function.cpdf-setdash.html
+cpdf_setflat=function.cpdf-setflat.html
+cpdf_setgray_fill=function.cpdf-setgray-fill.html
+cpdf_setgray_stroke=function.cpdf-setgray-stroke.html
+cpdf_setgray=function.cpdf-setgray.html
+cpdf_setlinecap=function.cpdf-setlinecap.html
+cpdf_setlinejoin=function.cpdf-setlinejoin.html
+cpdf_setlinewidth=function.cpdf-setlinewidth.html
+cpdf_setmiterlimit=function.cpdf-setmiterlimit.html
+cpdf_setrgbcolor_fill=function.cpdf-setrgbcolor-fill.html
+cpdf_setrgbcolor_stroke=function.cpdf-setrgbcolor-stroke.html
+cpdf_setrgbcolor=function.cpdf-setrgbcolor.html
+cpdf_show_xy=function.cpdf-show-xy.html
+cpdf_show=function.cpdf-show.html
+cpdf_stringwidth=function.cpdf-stringwidth.html
+cpdf_stroke=function.cpdf-stroke.html
+cpdf_text=function.cpdf-text.html
+cpdf_translate=function.cpdf-translate.html
+crack_check=function.crack-check.html
+crack_closedict=function.crack-closedict.html
+crack_getlastmessage=function.crack-getlastmessage.html
+crack_opendict=function.crack-opendict.html
+crc32=function.crc32.html
+create_function=function.create-function.html
+crypt=function.crypt.html
+ctype_alnum=function.ctype-alnum.html
+ctype_alpha=function.ctype-alpha.html
+ctype_cntrl=function.ctype-cntrl.html
+ctype_digit=function.ctype-digit.html
+ctype_graph=function.ctype-graph.html
+ctype_lower=function.ctype-lower.html
+ctype_print=function.ctype-print.html
+ctype_punct=function.ctype-punct.html
+ctype_space=function.ctype-space.html
+ctype_upper=function.ctype-upper.html
+ctype_xdigit=function.ctype-xdigit.html
+curl_close=function.curl-close.html
+curl_errno=function.curl-errno.html
+curl_error=function.curl-error.html
+curl_exec=function.curl-exec.html
+curl_getinfo=function.curl-getinfo.html
+curl_init=function.curl-init.html
+curl_setopt=function.curl-setopt.html
+curl_version=function.curl-version.html
+current=function.current.html
+cybercash_base64_decode=function.cybercash-base64-decode.html
+cybercash_base64_encode=function.cybercash-base64-encode.html
+cybercash_decr=function.cybercash-decr.html
+cybercash_encr=function.cybercash-encr.html
+cybermut_creerformulairecm=function.cybermut-creerformulairecm.html
+cybermut_creerreponsecm=function.cybermut-creerreponsecm.html
+cybermut_testmac=function.cybermut-testmac.html
+cyrus_authenticate=function.cyrus-authenticate.html
+cyrus_bind=function.cyrus-bind.html
+cyrus_close=function.cyrus-close.html
+cyrus_connect=function.cyrus-connect.html
+cyrus_query=function.cyrus-query.html
+cyrus_unbind=function.cyrus-unbind.html
+date=function.date.html
+dba_close=function.dba-close.html
+dba_delete=function.dba-delete.html
+dba_exists=function.dba-exists.html
+dba_fetch=function.dba-fetch.html
+dba_firstkey=function.dba-firstkey.html
+dba_handlers=function.dba-handlers.html
+dba_insert=function.dba-insert.html
+dba_list=function.dba-list.html
+dba_nextkey=function.dba-nextkey.html
+dba_open=function.dba-open.html
+dba_optimize=function.dba-optimize.html
+dba_popen=function.dba-popen.html
+dba_replace=function.dba-replace.html
+dba_sync=function.dba-sync.html
+dbase_add_record=function.dbase-add-record.html
+dbase_close=function.dbase-close.html
+dbase_create=function.dbase-create.html
+dbase_delete_record=function.dbase-delete-record.html
+dbase_get_record_with_names=function.dbase-get-record-with-names.html
+dbase_get_record=function.dbase-get-record.html
+dbase_numfields=function.dbase-numfields.html
+dbase_numrecords=function.dbase-numrecords.html
+dbase_open=function.dbase-open.html
+dbase_pack=function.dbase-pack.html
+dbase_replace_record=function.dbase-replace-record.html
+dblist=function.dblist.html
+dbmclose=function.dbmclose.html
+dbmdelete=function.dbmdelete.html
+dbmexists=function.dbmexists.html
+dbmfetch=function.dbmfetch.html
+dbmfirstkey=function.dbmfirstkey.html
+dbminsert=function.dbminsert.html
+dbmnextkey=function.dbmnextkey.html
+dbmopen=function.dbmopen.html
+dbmreplace=function.dbmreplace.html
+dbplus_add=function.dbplus-add.html
+dbplus_aql=function.dbplus-aql.html
+dbplus_chdir=function.dbplus-chdir.html
+dbplus_close=function.dbplus-close.html
+dbplus_curr=function.dbplus-curr.html
+dbplus_errcode=function.dbplus-errcode.html
+dbplus_errno=function.dbplus-errno.html
+dbplus_find=function.dbplus-find.html
+dbplus_first=function.dbplus-first.html
+dbplus_flush=function.dbplus-flush.html
+dbplus_freealllocks=function.dbplus-freealllocks.html
+dbplus_freelock=function.dbplus-freelock.html
+dbplus_freerlocks=function.dbplus-freerlocks.html
+dbplus_getlock=function.dbplus-getlock.html
+dbplus_getunique=function.dbplus-getunique.html
+dbplus_info=function.dbplus-info.html
+dbplus_last=function.dbplus-last.html
+dbplus_lockrel=function.dbplus-lockrel.html
+dbplus_next=function.dbplus-next.html
+dbplus_open=function.dbplus-open.html
+dbplus_prev=function.dbplus-prev.html
+dbplus_rchperm=function.dbplus-rchperm.html
+dbplus_rcreate=function.dbplus-rcreate.html
+dbplus_rcrtexact=function.dbplus-rcrtexact.html
+dbplus_rcrtlike=function.dbplus-rcrtlike.html
+dbplus_resolve=function.dbplus-resolve.html
+dbplus_restorepos=function.dbplus-restorepos.html
+dbplus_rkeys=function.dbplus-rkeys.html
+dbplus_ropen=function.dbplus-ropen.html
+dbplus_rquery=function.dbplus-rquery.html
+dbplus_rrename=function.dbplus-rrename.html
+dbplus_rsecindex=function.dbplus-rsecindex.html
+dbplus_runlink=function.dbplus-runlink.html
+dbplus_rzap=function.dbplus-rzap.html
+dbplus_savepos=function.dbplus-savepos.html
+dbplus_setindex=function.dbplus-setindex.html
+dbplus_setindexbynumber=function.dbplus-setindexbynumber.html
+dbplus_sql=function.dbplus-sql.html
+dbplus_tcl=function.dbplus-tcl.html
+dbplus_tremove=function.dbplus-tremove.html
+dbplus_undo=function.dbplus-undo.html
+dbplus_undoprepare=function.dbplus-undoprepare.html
+dbplus_unlockrel=function.dbplus-unlockrel.html
+dbplus_unselect=function.dbplus-unselect.html
+dbplus_update=function.dbplus-update.html
+dbplus_xlockrel=function.dbplus-xlockrel.html
+dbplus_xunlockrel=function.dbplus-xunlockrel.html
+dbx_close=function.dbx-close.html
+dbx_compare=function.dbx-compare.html
+dbx_connect=function.dbx-connect.html
+dbx_error=function.dbx-error.html
+dbx_escape_string=function.dbx-escape-string.html
+dbx_query=function.dbx-query.html
+dbx_sort=function.dbx-sort.html
+dcgettext=function.dcgettext.html
+dcngettext=function.dcngettext.html
+deaggregate=function.deaggregate.html
+debug_backtrace=function.debug-backtrace.html
+debugger_off=function.debugger-off.html
+debugger_on=function.debugger-on.html
+decbin=function.decbin.html
+dechex=function.dechex.html
+decoct=function.decoct.html
+define_syslog_variables=function.define-syslog-variables.html
+define=function.define.html
+defined=function.defined.html
+deg2rad=function.deg2rad.html
+delete=function.delete.html
+dgettext=function.dgettext.html
+die=function.die.html
+dio_close=function.dio-close.html
+dio_fcntl=function.dio-fcntl.html
+dio_open=function.dio-open.html
+dio_read=function.dio-read.html
+dio_seek=function.dio-seek.html
+dio_stat=function.dio-stat.html
+dio_tcsetattr=function.dio-tcsetattr.html
+dio_truncate=function.dio-truncate.html
+dio_write=function.dio-write.html
+dirname=function.dirname.html
+disk_free_space=function.disk-free-space.html
+disk_total_space=function.disk-total-space.html
+diskfreespace=function.diskfreespace.html
+dl=function.dl.html
+dngettext=function.dngettext.html
+dns_check_record=function.dns-check-record.html
+dns_get_mx=function.dns-get-mx.html
+dns_get_record=function.dns-get-record.html
+domattribute_name=function.domattribute-name.html
+domattribute_specified=function.domattribute-specified.html
+domattribute_value=function.domattribute-value.html
+domdocument_add_root=function.domdocument-add-root.html
+domdocument_create_attribute=function.domdocument-create-attribute.html
+domdocument_create_cdata_section=function.domdocument-create-cdata-section.html
+domdocument_create_comment=function.domdocument-create-comment.html
+domdocument_create_element=function.domdocument-create-element.html
+domdocument_create_element_ns=function.domdocument-create-element_ns.html
+domdocument_create_entity_reference=function.domdocument-create-entity-reference.html
+domdocument_create_processing_instruction=function.domdocument-create-processing-instruction.html
+domdocument_create_text_node=function.domdocument-create-text-node.html
+domdocument_doctype=function.domdocument-doctype.html
+domdocument_document_element=function.domdocument-document-element.html
+domdocument_dump_file=function.domdocument-dump-file.html
+domdocument_dump_mem=function.domdocument-dump-mem.html
+domdocument_get_element_by_id=function.domdocument-get-element-by-id.html
+domdocument_get_elements_by_tagname=function.domdocument-get-elements-by-tagname.html
+domdocument_html_dump_mem=function.domdocument-html-dump-mem.html
+domdocument_xinclude=function.domdocument-xinclude.html
+domdocumenttype_entities=function.domdocumenttype-entities.html
+domdocumenttype_internal_subset=function.domdocumenttype-internal-subset.html
+domdocumenttype_name=function.domdocumenttype-name.html
+domdocumenttype_notations=function.domdocumenttype-notations.html
+domdocumenttype_public_id=function.domdocumenttype-public-id.html
+domdocumenttype_system_id=function.domdocumenttype-system-id.html
+domelement_get_attribute_node=function.domelement-get-attribute-node.html
+domelement_get_attribute=function.domelement-get-attribute.html
+domelement_get_elements_by_tagname=function.domelement-get-elements-by-tagname.html
+domelement_has_attribute=function.domelement-has-attribute.html
+domelement_remove_attribute=function.domelement-remove-attribute.html
+domelement_set_attribute=function.domelement-set-attribute.html
+domelement_tagname=function.domelement-tagname.html
+domnode_add_namespace=function.domnode-add-namespace.html
+domnode_append_child=function.domnode-append-child.html
+domnode_append_sibling=function.domnode-append-sibling.html
+domnode_attributes=function.domnode-attributes.html
+domnode_child_nodes=function.domnode-child-nodes.html
+domnode_clone_node=function.domnode-clone-node.html
+domnode_dump_node=function.domnode-dump-node.html
+domnode_first_child=function.domnode-first-child.html
+domnode_get_content=function.domnode-get-content.html
+domnode_has_attributes=function.domnode-has-attributes.html
+domnode_has_child_nodes=function.domnode-has-child-nodes.html
+domnode_insert_before=function.domnode-insert-before.html
+domnode_is_blank_node=function.domnode-is-blank-node.html
+domnode_last_child=function.domnode-last-child.html
+domnode_next_sibling=function.domnode-next-sibling.html
+domnode_node_name=function.domnode-node-name.html
+domnode_node_type=function.domnode-node-type.html
+domnode_node_value=function.domnode-node-value.html
+domnode_owner_document=function.domnode-owner-document.html
+domnode_parent_node=function.domnode-parent-node.html
+domnode_prefix=function.domnode-prefix.html
+domnode_previous_sibling=function.domnode-previous-sibling.html
+domnode_remove_child=function.domnode-remove-child.html
+domnode_replace_child=function.domnode-replace-child.html
+domnode_replace_node=function.domnode-replace-node.html
+domnode_set_content=function.domnode-set-content.html
+domnode_set_name=function.domnode-set-name.html
+domnode_set_namespace=function.domnode-set-namespace.html
+domnode_unlink_node=function.domnode-unlink-node.html
+domprocessinginstruction_data=function.domprocessinginstruction-data.html
+domprocessinginstruction_target=function.domprocessinginstruction-target.html
+domxml_new_doc=function.domxml-new-doc.html
+domxml_open_file=function.domxml-open-file.html
+domxml_open_mem=function.domxml-open-mem.html
+domxml_version=function.domxml-version.html
+domxml_xmltree=function.domxml-xmltree.html
+domxml_xslt_stylesheet_doc=function.domxml-xslt-stylesheet-doc.html
+domxml_xslt_stylesheet_file=function.domxml-xslt-stylesheet-file.html
+domxml_xslt_stylesheet=function.domxml-xslt-stylesheet.html
+domxsltstylesheet_process=function.domxsltstylesheet-process.html
+domxsltstylesheet_result_dump_file=function.domxsltstylesheet-result-dump-file.html
+domxsltstylesheet_result_dump_mem=function.domxsltstylesheet-result-dump-mem.html
+dotnet_load=function.dotnet-load.html
+doubleval=function.doubleval.html
+each=function.each.html
+easter_date=function.easter-date.html
+easter_days=function.easter-days.html
+ebcdic2ascii=function.ebcdic2ascii.html
+echo=function.echo.html
+empty=function.empty.html
+end=function.end.html
+ereg_replace=function.ereg-replace.html
+ereg=function.ereg.html
+eregi_replace=function.eregi-replace.html
+eregi=function.eregi.html
+error_log=function.error-log.html
+error_reporting=function.error-reporting.html
+escapeshellarg=function.escapeshellarg.html
+escapeshellcmd=function.escapeshellcmd.html
+eval=function.eval.html
+exec=function.exec.html
+exif_imagetype=function.exif-imagetype.html
+exif_read_data=function.exif-read-data.html
+exif_thumbnail=function.exif-thumbnail.html
+exit=function.exit.html
+exp=function.exp.html
+explode=function.explode.html
+expm1=function.expm1.html
+extension_loaded=function.extension-loaded.html
+extract=function.extract.html
+ezmlm_hash=function.ezmlm-hash.html
+fbsql_affected_rows=function.fbsql-affected-rows.html
+fbsql_autocommit=function.fbsql-autocommit.html
+fbsql_change_user=function.fbsql-change-user.html
+fbsql_close=function.fbsql-close.html
+fbsql_commit=function.fbsql-commit.html
+fbsql_connect=function.fbsql-connect.html
+fbsql_create_blob=function.fbsql-create-blob.html
+fbsql_create_clob=function.fbsql-create-clob.html
+fbsql_create_db=function.fbsql-create-db.html
+fbsql_data_seek=function.fbsql-data-seek.html
+fbsql_database_password=function.fbsql-database-password.html
+fbsql_database=function.fbsql-database.html
+fbsql_db_query=function.fbsql-db-query.html
+fbsql_db_status=function.fbsql-db-status.html
+fbsql_drop_db=function.fbsql-drop-db.html
+fbsql_errno=function.fbsql-errno.html
+fbsql_error=function.fbsql-error.html
+fbsql_fetch_array=function.fbsql-fetch-array.html
+fbsql_fetch_assoc=function.fbsql-fetch-assoc.html
+fbsql_fetch_field=function.fbsql-fetch-field.html
+fbsql_fetch_lengths=function.fbsql-fetch-lengths.html
+fbsql_fetch_object=function.fbsql-fetch-object.html
+fbsql_fetch_row=function.fbsql-fetch-row.html
+fbsql_field_flags=function.fbsql-field-flags.html
+fbsql_field_len=function.fbsql-field-len.html
+fbsql_field_name=function.fbsql-field-name.html
+fbsql_field_seek=function.fbsql-field-seek.html
+fbsql_field_table=function.fbsql-field-table.html
+fbsql_field_type=function.fbsql-field-type.html
+fbsql_free_result=function.fbsql-free-result.html
+fbsql_get_autostart_info=function.fbsql-get-autostart-info.html
+fbsql_hostname=function.fbsql-hostname.html
+fbsql_insert_id=function.fbsql-insert-id.html
+fbsql_list_dbs=function.fbsql-list-dbs.html
+fbsql_list_fields=function.fbsql-list-fields.html
+fbsql_list_tables=function.fbsql-list-tables.html
+fbsql_next_result=function.fbsql-next-result.html
+fbsql_num_fields=function.fbsql-num-fields.html
+fbsql_num_rows=function.fbsql-num-rows.html
+fbsql_password=function.fbsql-password.html
+fbsql_pconnect=function.fbsql-pconnect.html
+fbsql_query=function.fbsql-query.html
+fbsql_read_blob=function.fbsql-read-blob.html
+fbsql_read_clob=function.fbsql-read-clob.html
+fbsql_result=function.fbsql-result.html
+fbsql_rollback=function.fbsql-rollback.html
+fbsql_select_db=function.fbsql-select-db.html
+fbsql_set_lob_mode=function.fbsql-set-lob-mode.html
+fbsql_set_transaction=function.fbsql-set-transaction.html
+fbsql_start_db=function.fbsql-start-db.html
+fbsql_stop_db=function.fbsql-stop-db.html
+fbsql_tablename=function.fbsql-tablename.html
+fbsql_username=function.fbsql-username.html
+fbsql_warnings=function.fbsql-warnings.html
+fclose=function.fclose.html
+fdf_add_doc_javascript=function.fdf-add-doc-javascript.html
+fdf_add_template=function.fdf-add-template.html
+fdf_close=function.fdf-close.html
+fdf_create=function.fdf-create.html
+fdf_errno=function.fdf-errno.html
+fdf_error=function.fdf-error.html
+fdf_get_ap=function.fdf-get-ap.html
+fdf_get_attachment=function.fdf-get-attachment.html
+fdf_get_encoding=function.fdf-get-encoding.html
+fdf_get_file=function.fdf-get-file.html
+fdf_get_status=function.fdf-get-status.html
+fdf_get_value=function.fdf-get-value.html
+fdf_get_version=function.fdf-get-version.html
+fdf_header=function.fdf-header.html
+fdf_next_field_name=function.fdf-next-field-name.html
+fdf_open_string=function.fdf-open-string.html
+fdf_open=function.fdf-open.html
+fdf_save_string=function.fdf-save-string.html
+fdf_save=function.fdf-save.html
+fdf_set_ap=function.fdf-set-ap.html
+fdf_set_encoding=function.fdf-set-encoding.html
+fdf_set_file=function.fdf-set-file.html
+fdf_set_flags=function.fdf-set-flags.html
+fdf_set_javascript_action=function.fdf-set-javascript-action.html
+fdf_set_opt=function.fdf-set-opt.html
+fdf_set_status=function.fdf-set-status.html
+fdf_set_submit_form_action=function.fdf-set-submit-form-action.html
+fdf_set_target_frame=function.fdf-set-target-frame.html
+fdf_set_value=function.fdf-set-value.html
+fdf_set_version=function.fdf-set-version.html
+feof=function.feof.html
+fflush=function.fflush.html
+fgetc=function.fgetc.html
+fgetcsv=function.fgetcsv.html
+fgets=function.fgets.html
+fgetss=function.fgetss.html
+file_exists=function.file-exists.html
+file_get_contents=function.file-get-contents.html
+file=function.file.html
+fileatime=function.fileatime.html
+filectime=function.filectime.html
+filegroup=function.filegroup.html
+fileinode=function.fileinode.html
+filemtime=function.filemtime.html
+fileowner=function.fileowner.html
+fileperms=function.fileperms.html
+filepro_fieldcount=function.filepro-fieldcount.html
+filepro_fieldname=function.filepro-fieldname.html
+filepro_fieldtype=function.filepro-fieldtype.html
+filepro_fieldwidth=function.filepro-fieldwidth.html
+filepro_retrieve=function.filepro-retrieve.html
+filepro_rowcount=function.filepro-rowcount.html
+filepro=function.filepro.html
+filesize=function.filesize.html
+filetype=function.filetype.html
+floatval=function.floatval.html
+flock=function.flock.html
+floor=function.floor.html
+flush=function.flush.html
+fmod=function.fmod.html
+fnmatch=function.fnmatch.html
+fopen=function.fopen.html
+fpassthru=function.fpassthru.html
+fprintf=function.fprintf.html
+fputs=function.fputs.html
+fread=function.fread.html
+frenchtojd=function.frenchtojd.html
+fribidi_log2vis=function.fribidi-log2vis.html
+fscanf=function.fscanf.html
+fseek=function.fseek.html
+fsockopen=function.fsockopen.html
+fstat=function.fstat.html
+ftell=function.ftell.html
+ftok=function.ftok.html
+ftp_cdup=function.ftp-cdup.html
+ftp_chdir=function.ftp-chdir.html
+ftp_close=function.ftp-close.html
+ftp_connect=function.ftp-connect.html
+ftp_delete=function.ftp-delete.html
+ftp_exec=function.ftp-exec.html
+ftp_fget=function.ftp-fget.html
+ftp_fput=function.ftp-fput.html
+ftp_get_option=function.ftp-get-option.html
+ftp_get=function.ftp-get.html
+ftp_login=function.ftp-login.html
+ftp_mdtm=function.ftp-mdtm.html
+ftp_mkdir=function.ftp-mkdir.html
+ftp_nb_continue=function.ftp-nb-continue.html
+ftp_nb_fget=function.ftp-nb-fget.html
+ftp_nb_fput=function.ftp-nb-fput.html
+ftp_nb_get=function.ftp-nb-get.html
+ftp_nb_put=function.ftp-nb-put.html
+ftp_nlist=function.ftp-nlist.html
+ftp_pasv=function.ftp-pasv.html
+ftp_put=function.ftp-put.html
+ftp_pwd=function.ftp-pwd.html
+ftp_quit=function.ftp-quit.html
+ftp_rawlist=function.ftp-rawlist.html
+ftp_rename=function.ftp-rename.html
+ftp_rmdir=function.ftp-rmdir.html
+ftp_set_option=function.ftp-set-option.html
+ftp_site=function.ftp-site.html
+ftp_size=function.ftp-size.html
+ftp_ssl_connect=function.ftp-ssl-connect.html
+ftp_systype=function.ftp-systype.html
+ftruncate=function.ftruncate.html
+func_get_arg=function.func-get-arg.html
+func_get_args=function.func-get-args.html
+func_num_args=function.func-num-args.html
+function_exists=function.function-exists.html
+fwrite=function.fwrite.html
+gd_info=function.gd-info.html
+get_browser=function.get-browser.html
+get_cfg_var=function.get-cfg-var.html
+get_class_methods=function.get-class-methods.html
+get_class_vars=function.get-class-vars.html
+get_class=function.get-class.html
+get_current_user=function.get-current-user.html
+get_declared_classes=function.get-declared-classes.html
+get_defined_constants=function.get-defined-constants.html
+get_defined_functions=function.get-defined-functions.html
+get_defined_vars=function.get-defined-vars.html
+get_extension_funcs=function.get-extension-funcs.html
+get_html_translation_table=function.get-html-translation-table.html
+get_included_files=function.get-included-files.html
+get_loaded_extensions=function.get-loaded-extensions.html
+get_magic_quotes_gpc=function.get-magic-quotes-gpc.html
+get_magic_quotes_runtime=function.get-magic-quotes-runtime.html
+get_meta_tags=function.get-meta-tags.html
+get_object_vars=function.get-object-vars.html
+get_parent_class=function.get-parent-class.html
+get_required_files=function.get-required-files.html
+get_resource_type=function.get-resource-type.html
+getallheaders=function.getallheaders.html
+getcwd=function.getcwd.html
+getdate=function.getdate.html
+getenv=function.getenv.html
+gethostbyaddr=function.gethostbyaddr.html
+gethostbyname=function.gethostbyname.html
+gethostbynamel=function.gethostbynamel.html
+getimagesize=function.getimagesize.html
+getlastmod=function.getlastmod.html
+getmxrr=function.getmxrr.html
+getmygid=function.getmygid.html
+getmyinode=function.getmyinode.html
+getmypid=function.getmypid.html
+getmyuid=function.getmyuid.html
+getopt=function.getopt.html
+getprotobyname=function.getprotobyname.html
+getprotobynumber=function.getprotobynumber.html
+getrandmax=function.getrandmax.html
+getrusage=function.getrusage.html
+getservbyname=function.getservbyname.html
+getservbyport=function.getservbyport.html
+gettext=function.gettext.html
+gettimeofday=function.gettimeofday.html
+gettype=function.gettype.html
+glob=function.glob.html
+gmdate=function.gmdate.html
+gmmktime=function.gmmktime.html
+gmp_abs=function.gmp-abs.html
+gmp_add=function.gmp-add.html
+gmp_and=function.gmp-and.html
+gmp_clrbit=function.gmp-clrbit.html
+gmp_cmp=function.gmp-cmp.html
+gmp_com=function.gmp-com.html
+gmp_div_q=function.gmp-div-q.html
+gmp_div_qr=function.gmp-div-qr.html
+gmp_div_r=function.gmp-div-r.html
+gmp_div=function.gmp-div.html
+gmp_divexact=function.gmp-divexact.html
+gmp_fact=function.gmp-fact.html
+gmp_gcd=function.gmp-gcd.html
+gmp_gcdext=function.gmp-gcdext.html
+gmp_hamdist=function.gmp-hamdist.html
+gmp_init=function.gmp-init.html
+gmp_intval=function.gmp-intval.html
+gmp_invert=function.gmp-invert.html
+gmp_jacobi=function.gmp-jacobi.html
+gmp_legendre=function.gmp-legendre.html
+gmp_mod=function.gmp-mod.html
+gmp_mul=function.gmp-mul.html
+gmp_neg=function.gmp-neg.html
+gmp_or=function.gmp-or.html
+gmp_perfect_square=function.gmp-perfect-square.html
+gmp_popcount=function.gmp-popcount.html
+gmp_pow=function.gmp-pow.html
+gmp_powm=function.gmp-powm.html
+gmp_prob_prime=function.gmp-prob-prime.html
+gmp_random=function.gmp-random.html
+gmp_scan0=function.gmp-scan0.html
+gmp_scan1=function.gmp-scan1.html
+gmp_setbit=function.gmp-setbit.html
+gmp_sign=function.gmp-sign.html
+gmp_sqrt=function.gmp-sqrt.html
+gmp_sqrtrm=function.gmp-sqrtrm.html
+gmp_strval=function.gmp-strval.html
+gmp_sub=function.gmp-sub.html
+gmp_xor=function.gmp-xor.html
+gmstrftime=function.gmstrftime.html
+gregoriantojd=function.gregoriantojd.html
+gzclose=function.gzclose.html
+gzcompress=function.gzcompress.html
+gzdeflate=function.gzdeflate.html
+gzencode=function.gzencode.html
+gzeof=function.gzeof.html
+gzfile=function.gzfile.html
+gzgetc=function.gzgetc.html
+gzgets=function.gzgets.html
+gzgetss=function.gzgetss.html
+gzinflate=function.gzinflate.html
+gzopen=function.gzopen.html
+gzpassthru=function.gzpassthru.html
+gzputs=function.gzputs.html
+gzread=function.gzread.html
+gzrewind=function.gzrewind.html
+gzseek=function.gzseek.html
+gztell=function.gztell.html
+gzuncompress=function.gzuncompress.html
+gzwrite=function.gzwrite.html
+header=function.header.html
+headers_sent=function.headers-sent.html
+hebrev=function.hebrev.html
+hebrevc=function.hebrevc.html
+hexdec=function.hexdec.html
+highlight_file=function.highlight-file.html
+highlight_string=function.highlight-string.html
+html_entity_decode=function.html-entity-decode.html
+htmlentities=function.htmlentities.html
+htmlspecialchars=function.htmlspecialchars.html
+hw_array2objrec=function.hw-array2objrec.html
+hw_changeobject=function.hw-changeobject.html
+hw_children=function.hw-children.html
+hw_childrenobj=function.hw-childrenobj.html
+hw_close=function.hw-close.html
+hw_connect=function.hw-connect.html
+hw_connection_info=function.hw-connection-info.html
+hw_cp=function.hw-cp.html
+hw_deleteobject=function.hw-deleteobject.html
+hw_docbyanchor=function.hw-docbyanchor.html
+hw_docbyanchorobj=function.hw-docbyanchorobj.html
+hw_document_attributes=function.hw-document-attributes.html
+hw_document_bodytag=function.hw-document-bodytag.html
+hw_document_content=function.hw-document-content.html
+hw_document_setcontent=function.hw-document-setcontent.html
+hw_document_size=function.hw-document-size.html
+hw_dummy=function.hw-dummy.html
+hw_edittext=function.hw-edittext.html
+hw_error=function.hw-error.html
+hw_errormsg=function.hw-errormsg.html
+hw_free_document=function.hw-free-document.html
+hw_getanchors=function.hw-getanchors.html
+hw_getanchorsobj=function.hw-getanchorsobj.html
+hw_getandlock=function.hw-getandlock.html
+hw_getchildcoll=function.hw-getchildcoll.html
+hw_getchildcollobj=function.hw-getchildcollobj.html
+hw_getchilddoccoll=function.hw-getchilddoccoll.html
+hw_getchilddoccollobj=function.hw-getchilddoccollobj.html
+hw_getobject=function.hw-getobject.html
+hw_getobjectbyquery=function.hw-getobjectbyquery.html
+hw_getobjectbyquerycoll=function.hw-getobjectbyquerycoll.html
+hw_getobjectbyquerycollobj=function.hw-getobjectbyquerycollobj.html
+hw_getobjectbyqueryobj=function.hw-getobjectbyqueryobj.html
+hw_getparents=function.hw-getparents.html
+hw_getparentsobj=function.hw-getparentsobj.html
+hw_getrellink=function.hw-getrellink.html
+hw_getremote=function.hw-getremote.html
+hw_getremotechildren=function.hw-getremotechildren.html
+hw_getsrcbydestobj=function.hw-getsrcbydestobj.html
+hw_gettext=function.hw-gettext.html
+hw_getusername=function.hw-getusername.html
+hw_identify=function.hw-identify.html
+hw_incollections=function.hw-incollections.html
+hw_info=function.hw-info.html
+hw_inscoll=function.hw-inscoll.html
+hw_insdoc=function.hw-insdoc.html
+hw_insertanchors=function.hw-insertanchors.html
+hw_insertdocument=function.hw-insertdocument.html
+hw_insertobject=function.hw-insertobject.html
+hw_mapid=function.hw-mapid.html
+hw_modifyobject=function.hw-modifyobject.html
+hw_mv=function.hw-mv.html
+hw_new_document=function.hw-new-document.html
+hw_objrec2array=function.hw-objrec2array.html
+hw_output_document=function.hw-output-document.html
+hw_pconnect=function.hw-pconnect.html
+hw_pipedocument=function.hw-pipedocument.html
+hw_root=function.hw-root.html
+hw_setlinkroot=function.hw-setlinkroot.html
+hw_stat=function.hw-stat.html
+hw_unlock=function.hw-unlock.html
+hw_who=function.hw-who.html
+hwapi_attribute_key=function.hwapi-attribute-key.html
+hwapi_attribute_langdepvalue=function.hwapi-attribute-langdepvalue.html
+hwapi_attribute_value=function.hwapi-attribute-value.html
+hwapi_attribute_values=function.hwapi-attribute-values.html
+hwapi_attribute=function.hwapi-attribute.html
+hwapi_checkin=function.hwapi-checkin.html
+hwapi_checkout=function.hwapi-checkout.html
+hwapi_children=function.hwapi-children.html
+hwapi_content_mimetype=function.hwapi-content-mimetype.html
+hwapi_content_read=function.hwapi-content-read.html
+hwapi_content=function.hwapi-content.html
+hwapi_copy=function.hwapi-copy.html
+hwapi_dbstat=function.hwapi-dbstat.html
+hwapi_dcstat=function.hwapi-dcstat.html
+hwapi_dstanchors=function.hwapi-dstanchors.html
+hwapi_dstofsrcanchors=function.hwapi-dstofsrcanchors.html
+hwapi_error_count=function.hwapi-error-count.html
+hwapi_error_reason=function.hwapi-error-reason.html
+hwapi_find=function.hwapi-find.html
+hwapi_ftstat=function.hwapi-ftstat.html
+hwapi_hgcsp=function.hwapi-hgcsp.html
+hwapi_hwstat=function.hwapi-hwstat.html
+hwapi_identify=function.hwapi-identify.html
+hwapi_info=function.hwapi-info.html
+hwapi_insert=function.hwapi-insert.html
+hwapi_insertanchor=function.hwapi-insertanchor.html
+hwapi_insertcollection=function.hwapi-insertcollection.html
+hwapi_insertdocument=function.hwapi-insertdocument.html
+hwapi_link=function.hwapi-link.html
+hwapi_lock=function.hwapi-lock.html
+hwapi_move=function.hwapi-move.html
+hwapi_new_content=function.hwapi-new-content.html
+hwapi_object_assign=function.hwapi-object-assign.html
+hwapi_object_attreditable=function.hwapi-object-attreditable.html
+hwapi_object_count=function.hwapi-object-count.html
+hwapi_object_insert=function.hwapi-object-insert.html
+hwapi_object_new=function.hwapi-object-new.html
+hwapi_object_remove=function.hwapi-object-remove.html
+hwapi_object_title=function.hwapi-object-title.html
+hwapi_object_value=function.hwapi-object-value.html
+hwapi_object=function.hwapi-object.html
+hwapi_objectbyanchor=function.hwapi-objectbyanchor.html
+hwapi_parents=function.hwapi-parents.html
+hwapi_reason_description=function.hwapi-reason-description.html
+hwapi_reason_type=function.hwapi-reason-type.html
+hwapi_remove=function.hwapi-remove.html
+hwapi_replace=function.hwapi-replace.html
+hwapi_setcommitedversion=function.hwapi-setcommitedversion.html
+hwapi_srcanchors=function.hwapi-srcanchors.html
+hwapi_srcsofdst=function.hwapi-srcsofdst.html
+hwapi_unlock=function.hwapi-unlock.html
+hwapi_user=function.hwapi-user.html
+hwapi_userlist=function.hwapi-userlist.html
+hypot=function.hypot.html
+ibase_blob_add=function.ibase-blob-add.html
+ibase_blob_cancel=function.ibase-blob-cancel.html
+ibase_blob_close=function.ibase-blob-close.html
+ibase_blob_create=function.ibase-blob-create.html
+ibase_blob_echo=function.ibase-blob-echo.html
+ibase_blob_get=function.ibase-blob-get.html
+ibase_blob_import=function.ibase-blob-import.html
+ibase_blob_info=function.ibase-blob-info.html
+ibase_blob_open=function.ibase-blob-open.html
+ibase_close=function.ibase-close.html
+ibase_commit=function.ibase-commit.html
+ibase_connect=function.ibase-connect.html
+ibase_errmsg=function.ibase-errmsg.html
+ibase_execute=function.ibase-execute.html
+ibase_fetch_object=function.ibase-fetch-object.html
+ibase_fetch_row=function.ibase-fetch-row.html
+ibase_field_info=function.ibase-field-info.html
+ibase_free_query=function.ibase-free-query.html
+ibase_free_result=function.ibase-free-result.html
+ibase_num_fields=function.ibase-num-fields.html
+ibase_pconnect=function.ibase-pconnect.html
+ibase_prepare=function.ibase-prepare.html
+ibase_query=function.ibase-query.html
+ibase_rollback=function.ibase-rollback.html
+ibase_timefmt=function.ibase-timefmt.html
+ibase_trans=function.ibase-trans.html
+iconv_get_encoding=function.iconv-get-encoding.html
+iconv_set_encoding=function.iconv-set-encoding.html
+iconv=function.iconv.html
+ifx_affected_rows=function.ifx-affected-rows.html
+ifx_blobinfile_mode=function.ifx-blobinfile-mode.html
+ifx_byteasvarchar=function.ifx-byteasvarchar.html
+ifx_close=function.ifx-close.html
+ifx_connect=function.ifx-connect.html
+ifx_copy_blob=function.ifx-copy-blob.html
+ifx_create_blob=function.ifx-create-blob.html
+ifx_create_char=function.ifx-create-char.html
+ifx_do=function.ifx-do.html
+ifx_error=function.ifx-error.html
+ifx_errormsg=function.ifx-errormsg.html
+ifx_fetch_row=function.ifx-fetch-row.html
+ifx_fieldproperties=function.ifx-fieldproperties.html
+ifx_fieldtypes=function.ifx-fieldtypes.html
+ifx_free_blob=function.ifx-free-blob.html
+ifx_free_char=function.ifx-free-char.html
+ifx_free_result=function.ifx-free-result.html
+ifx_get_blob=function.ifx-get-blob.html
+ifx_get_char=function.ifx-get-char.html
+ifx_getsqlca=function.ifx-getsqlca.html
+ifx_htmltbl_result=function.ifx-htmltbl-result.html
+ifx_nullformat=function.ifx-nullformat.html
+ifx_num_fields=function.ifx-num-fields.html
+ifx_num_rows=function.ifx-num-rows.html
+ifx_pconnect=function.ifx-pconnect.html
+ifx_prepare=function.ifx-prepare.html
+ifx_query=function.ifx-query.html
+ifx_textasvarchar=function.ifx-textasvarchar.html
+ifx_update_blob=function.ifx-update-blob.html
+ifx_update_char=function.ifx-update-char.html
+ifxus_close_slob=function.ifxus-close-slob.html
+ifxus_create_slob=function.ifxus-create-slob.html
+ifxus_free_slob=function.ifxus-free-slob.html
+ifxus_open_slob=function.ifxus-open-slob.html
+ifxus_read_slob=function.ifxus-read-slob.html
+ifxus_seek_slob=function.ifxus-seek-slob.html
+ifxus_tell_slob=function.ifxus-tell-slob.html
+ifxus_write_slob=function.ifxus-write-slob.html
+ignore_user_abort=function.ignore-user-abort.html
+image_type_to_mime_type=function.image-type-to-mime-type.html
+image2wbmp=function.image2wbmp.html
+imagealphablending=function.imagealphablending.html
+imagearc=function.imagearc.html
+imagechar=function.imagechar.html
+imagecharup=function.imagecharup.html
+imagecolorallocate=function.imagecolorallocate.html
+imagecolorallocatealpha=function.imagecolorallocatealpha.html
+imagecolorat=function.imagecolorat.html
+imagecolorclosest=function.imagecolorclosest.html
+imagecolorclosestalpha=function.imagecolorclosestalpha.html
+imagecolorclosesthwb=function.imagecolorclosesthwb.html
+imagecolordeallocate=function.imagecolordeallocate.html
+imagecolorexact=function.imagecolorexact.html
+imagecolorexactalpha=function.imagecolorexactalpha.html
+imagecolorresolve=function.imagecolorresolve.html
+imagecolorresolvealpha=function.imagecolorresolvealpha.html
+imagecolorset=function.imagecolorset.html
+imagecolorsforindex=function.imagecolorsforindex.html
+imagecolorstotal=function.imagecolorstotal.html
+imagecolortransparent=function.imagecolortransparent.html
+imagecopy=function.imagecopy.html
+imagecopymerge=function.imagecopymerge.html
+imagecopymergegray=function.imagecopymergegray.html
+imagecopyresampled=function.imagecopyresampled.html
+imagecopyresized=function.imagecopyresized.html
+imagecreate=function.imagecreate.html
+imagecreatefromgd=function.imagecreatefromgd.html
+imagecreatefromgd2=function.imagecreatefromgd2.html
+imagecreatefromgd2part=function.imagecreatefromgd2part.html
+imagecreatefromgif=function.imagecreatefromgif.html
+imagecreatefromjpeg=function.imagecreatefromjpeg.html
+imagecreatefrompng=function.imagecreatefrompng.html
+imagecreatefromstring=function.imagecreatefromstring.html
+imagecreatefromwbmp=function.imagecreatefromwbmp.html
+imagecreatefromxbm=function.imagecreatefromxbm.html
+imagecreatefromxpm=function.imagecreatefromxpm.html
+imagecreatetruecolor=function.imagecreatetruecolor.html
+imagedashedline=function.imagedashedline.html
+imagedestroy=function.imagedestroy.html
+imageellipse=function.imageellipse.html
+imagefill=function.imagefill.html
+imagefilledarc=function.imagefilledarc.html
+imagefilledellipse=function.imagefilledellipse.html
+imagefilledpolygon=function.imagefilledpolygon.html
+imagefilledrectangle=function.imagefilledrectangle.html
+imagefilltoborder=function.imagefilltoborder.html
+imagefontheight=function.imagefontheight.html
+imagefontwidth=function.imagefontwidth.html
+imageftbbox=function.imageftbbox.html
+imagefttext=function.imagefttext.html
+imagegammacorrect=function.imagegammacorrect.html
+imagegd=function.imagegd.html
+imagegd2=function.imagegd2.html
+imagegif=function.imagegif.html
+imageinterlace=function.imageinterlace.html
+imagejpeg=function.imagejpeg.html
+imageline=function.imageline.html
+imageloadfont=function.imageloadfont.html
+imagepalettecopy=function.imagepalettecopy.html
+imagepng=function.imagepng.html
+imagepolygon=function.imagepolygon.html
+imagepsbbox=function.imagepsbbox.html
+imagepscopyfont=function.imagepscopyfont.html
+imagepsencodefont=function.imagepsencodefont.html
+imagepsextendfont=function.imagepsextendfont.html
+imagepsfreefont=function.imagepsfreefont.html
+imagepsloadfont=function.imagepsloadfont.html
+imagepsslantfont=function.imagepsslantfont.html
+imagepstext=function.imagepstext.html
+imagerectangle=function.imagerectangle.html
+imagerotate=function.imagerotate.html
+imagesetbrush=function.imagesetbrush.html
+imagesetpixel=function.imagesetpixel.html
+imagesetstyle=function.imagesetstyle.html
+imagesetthickness=function.imagesetthickness.html
+imagesettile=function.imagesettile.html
+imagestring=function.imagestring.html
+imagestringup=function.imagestringup.html
+imagesx=function.imagesx.html
+imagesy=function.imagesy.html
+imagetruecolortopalette=function.imagetruecolortopalette.html
+imagettfbbox=function.imagettfbbox.html
+imagettftext=function.imagettftext.html
+imagetypes=function.imagetypes.html
+imagewbmp=function.imagewbmp.html
+imap_8bit=function.imap-8bit.html
+imap_alerts=function.imap-alerts.html
+imap_append=function.imap-append.html
+imap_base64=function.imap-base64.html
+imap_binary=function.imap-binary.html
+imap_body=function.imap-body.html
+imap_bodystruct=function.imap-bodystruct.html
+imap_check=function.imap-check.html
+imap_clearflag_full=function.imap-clearflag-full.html
+imap_close=function.imap-close.html
+imap_createmailbox=function.imap-createmailbox.html
+imap_delete=function.imap-delete.html
+imap_deletemailbox=function.imap-deletemailbox.html
+imap_errors=function.imap-errors.html
+imap_expunge=function.imap-expunge.html
+imap_fetch_overview=function.imap-fetch-overview.html
+imap_fetchbody=function.imap-fetchbody.html
+imap_fetchheader=function.imap-fetchheader.html
+imap_fetchstructure=function.imap-fetchstructure.html
+imap_get_quota=function.imap-get-quota.html
+imap_get_quotaroot=function.imap-get-quotaroot.html
+imap_getmailboxes=function.imap-getmailboxes.html
+imap_getsubscribed=function.imap-getsubscribed.html
+imap_header=function.imap-header.html
+imap_headerinfo=function.imap-headerinfo.html
+imap_headers=function.imap-headers.html
+imap_last_error=function.imap-last-error.html
+imap_list=function.imap-list.html
+imap_listmailbox=function.imap-listmailbox.html
+imap_listscan=function.imap-listscan.html
+imap_listsubscribed=function.imap-listsubscribed.html
+imap_lsub=function.imap-lsub.html
+imap_mail_compose=function.imap-mail-compose.html
+imap_mail_copy=function.imap-mail-copy.html
+imap_mail_move=function.imap-mail-move.html
+imap_mail=function.imap-mail.html
+imap_mailboxmsginfo=function.imap-mailboxmsginfo.html
+imap_mime_header_decode=function.imap-mime-header-decode.html
+imap_msgno=function.imap-msgno.html
+imap_num_msg=function.imap-num-msg.html
+imap_num_recent=function.imap-num-recent.html
+imap_open=function.imap-open.html
+imap_ping=function.imap-ping.html
+imap_qprint=function.imap-qprint.html
+imap_renamemailbox=function.imap-renamemailbox.html
+imap_reopen=function.imap-reopen.html
+imap_rfc822_parse_adrlist=function.imap-rfc822-parse-adrlist.html
+imap_rfc822_parse_headers=function.imap-rfc822-parse-headers.html
+imap_rfc822_write_address=function.imap-rfc822-write-address.html
+imap_scanmailbox=function.imap-scanmailbox.html
+imap_search=function.imap-search.html
+imap_set_quota=function.imap-set-quota.html
+imap_setacl=function.imap-setacl.html
+imap_setflag_full=function.imap-setflag-full.html
+imap_sort=function.imap-sort.html
+imap_status=function.imap-status.html
+imap_subscribe=function.imap-subscribe.html
+imap_thread=function.imap-thread.html
+imap_uid=function.imap-uid.html
+imap_undelete=function.imap-undelete.html
+imap_unsubscribe=function.imap-unsubscribe.html
+imap_utf7_decode=function.imap-utf7-decode.html
+imap_utf7_encode=function.imap-utf7-encode.html
+imap_utf8=function.imap-utf8.html
+implode=function.implode.html
+import_request_variables=function.import-request-variables.html
+in_array=function.in-array.html
+include_once=function.include-once.html
+include=function.include.html
+ingres_autocommit=function.ingres-autocommit.html
+ingres_close=function.ingres-close.html
+ingres_commit=function.ingres-commit.html
+ingres_connect=function.ingres-connect.html
+ingres_fetch_array=function.ingres-fetch-array.html
+ingres_fetch_object=function.ingres-fetch-object.html
+ingres_fetch_row=function.ingres-fetch-row.html
+ingres_field_length=function.ingres-field-length.html
+ingres_field_name=function.ingres-field-name.html
+ingres_field_nullable=function.ingres-field-nullable.html
+ingres_field_precision=function.ingres-field-precision.html
+ingres_field_scale=function.ingres-field-scale.html
+ingres_field_type=function.ingres-field-type.html
+ingres_num_fields=function.ingres-num-fields.html
+ingres_num_rows=function.ingres-num-rows.html
+ingres_pconnect=function.ingres-pconnect.html
+ingres_query=function.ingres-query.html
+ingres_rollback=function.ingres-rollback.html
+ini_alter=function.ini-alter.html
+ini_get_all=function.ini-get-all.html
+ini_get=function.ini-get.html
+ini_restore=function.ini-restore.html
+ini_set=function.ini-set.html
+intval=function.intval.html
+ip2long=function.ip2long.html
+iptcembed=function.iptcembed.html
+iptcparse=function.iptcparse.html
+ircg_channel_mode=function.ircg-channel-mode.html
+ircg_disconnect=function.ircg-disconnect.html
+ircg_fetch_error_msg=function.ircg-fetch-error-msg.html
+ircg_get_username=function.ircg-get-username.html
+ircg_html_encode=function.ircg-html-encode.html
+ircg_ignore_add=function.ircg-ignore-add.html
+ircg_ignore_del=function.ircg-ignore-del.html
+ircg_is_conn_alive=function.ircg-is-conn-alive.html
+ircg_join=function.ircg-join.html
+ircg_kick=function.ircg-kick.html
+ircg_lookup_format_messages=function.ircg-lookup-format-messages.html
+ircg_msg=function.ircg-msg.html
+ircg_nick=function.ircg-nick.html
+ircg_nickname_escape=function.ircg-nickname-escape.html
+ircg_nickname_unescape=function.ircg-nickname-unescape.html
+ircg_notice=function.ircg-notice.html
+ircg_part=function.ircg-part.html
+ircg_pconnect=function.ircg-pconnect.html
+ircg_register_format_messages=function.ircg-register-format-messages.html
+ircg_set_current=function.ircg-set-current.html
+ircg_set_file=function.ircg-set-file.html
+ircg_set_on_die=function.ircg-set-on-die.html
+ircg_topic=function.ircg-topic.html
+ircg_whois=function.ircg-whois.html
+is_a=function.is-a.html
+is_array=function.is-array.html
+is_bool=function.is-bool.html
+is_callable=function.is-callable.html
+is_dir=function.is-dir.html
+is_double=function.is-double.html
+is_executable=function.is-executable.html
+is_file=function.is-file.html
+is_finite=function.is-finite.html
+is_float=function.is-float.html
+is_infinite=function.is-infinite.html
+is_int=function.is-int.html
+is_integer=function.is-integer.html
+is_link=function.is-link.html
+is_long=function.is-long.html
+is_nan=function.is-nan.html
+is_null=function.is-null.html
+is_numeric=function.is-numeric.html
+is_object=function.is-object.html
+is_readable=function.is-readable.html
+is_real=function.is-real.html
+is_resource=function.is-resource.html
+is_scalar=function.is-scalar.html
+is_string=function.is-string.html
+is_subclass_of=function.is-subclass-of.html
+is_uploaded_file=function.is-uploaded-file.html
+is_writable=function.is-writable.html
+is_writeable=function.is-writeable.html
+isset=function.isset.html
+java_last_exception_clear=function.java-last-exception-clear.html
+java_last_exception_get=function.java-last-exception-get.html
+jddayofweek=function.jddayofweek.html
+jdmonthname=function.jdmonthname.html
+jdtofrench=function.jdtofrench.html
+jdtogregorian=function.jdtogregorian.html
+jdtojewish=function.jdtojewish.html
+jdtojulian=function.jdtojulian.html
+jdtounix=function.jdtounix.html
+jewishtojd=function.jewishtojd.html
+join=function.join.html
+jpeg2wbmp=function.jpeg2wbmp.html
+juliantojd=function.juliantojd.html
+key=function.key.html
+krsort=function.krsort.html
+ksort=function.ksort.html
+lcg_value=function.lcg-value.html
+ldap_8859_to_t61=function.ldap-8859-to-t61.html
+ldap_add=function.ldap-add.html
+ldap_bind=function.ldap-bind.html
+ldap_close=function.ldap-close.html
+ldap_compare=function.ldap-compare.html
+ldap_connect=function.ldap-connect.html
+ldap_count_entries=function.ldap-count-entries.html
+ldap_delete=function.ldap-delete.html
+ldap_dn2ufn=function.ldap-dn2ufn.html
+ldap_err2str=function.ldap-err2str.html
+ldap_errno=function.ldap-errno.html
+ldap_error=function.ldap-error.html
+ldap_explode_dn=function.ldap-explode-dn.html
+ldap_first_attribute=function.ldap-first-attribute.html
+ldap_first_entry=function.ldap-first-entry.html
+ldap_first_reference=function.ldap-first-reference.html
+ldap_free_result=function.ldap-free-result.html
+ldap_get_attributes=function.ldap-get-attributes.html
+ldap_get_dn=function.ldap-get-dn.html
+ldap_get_entries=function.ldap-get-entries.html
+ldap_get_option=function.ldap-get-option.html
+ldap_get_values_len=function.ldap-get-values-len.html
+ldap_get_values=function.ldap-get-values.html
+ldap_list=function.ldap-list.html
+ldap_mod_add=function.ldap-mod-add.html
+ldap_mod_del=function.ldap-mod-del.html
+ldap_mod_replace=function.ldap-mod-replace.html
+ldap_modify=function.ldap-modify.html
+ldap_next_attribute=function.ldap-next-attribute.html
+ldap_next_entry=function.ldap-next-entry.html
+ldap_next_reference=function.ldap-next-reference.html
+ldap_parse_reference=function.ldap-parse-reference.html
+ldap_parse_result=function.ldap-parse-result.html
+ldap_read=function.ldap-read.html
+ldap_rename=function.ldap-rename.html
+ldap_search=function.ldap-search.html
+ldap_set_option=function.ldap-set-option.html
+ldap_set_rebind_proc=function.ldap-set-rebind-proc.html
+ldap_sort=function.ldap-sort.html
+ldap_start_tls=function.ldap-start-tls.html
+ldap_t61_to_8859=function.ldap-t61-to-8859.html
+ldap_unbind=function.ldap-unbind.html
+levenshtein=function.levenshtein.html
+link=function.link.html
+linkinfo=function.linkinfo.html
+list=function.list.html
+localeconv=function.localeconv.html
+localtime=function.localtime.html
+log=function.log.html
+log10=function.log10.html
+log1p=function.log1p.html
+long2ip=function.long2ip.html
+lstat=function.lstat.html
+ltrim=function.ltrim.html
+mail=function.mail.html
+mailparse_determine_best_xfer_encoding=function.mailparse-determine-best-xfer-encoding.html
+mailparse_msg_create=function.mailparse-msg-create.html
+mailparse_msg_extract_part_file=function.mailparse-msg-extract-part-file.html
+mailparse_msg_extract_part=function.mailparse-msg-extract-part.html
+mailparse_msg_free=function.mailparse-msg-free.html
+mailparse_msg_get_part_data=function.mailparse-msg-get-part-data.html
+mailparse_msg_get_part=function.mailparse-msg-get-part.html
+mailparse_msg_get_structure=function.mailparse-msg-get-structure.html
+mailparse_msg_parse_file=function.mailparse-msg-parse-file.html
+mailparse_msg_parse=function.mailparse-msg-parse.html
+mailparse_rfc822_parse_addresses=function.mailparse-rfc822-parse-addresses.html
+mailparse_stream_encode=function.mailparse-stream-encode.html
+mailparse_uudecode_all=function.mailparse-uudecode-all.html
+max=function.max.html
+mb_convert_case=function.mb-convert-case.html
+mb_convert_encoding=function.mb-convert-encoding.html
+mb_convert_kana=function.mb-convert-kana.html
+mb_convert_variables=function.mb-convert-variables.html
+mb_decode_mimeheader=function.mb-decode-mimeheader.html
+mb_decode_numericentity=function.mb-decode-numericentity.html
+mb_detect_encoding=function.mb-detect-encoding.html
+mb_detect_order=function.mb-detect-order.html
+mb_encode_mimeheader=function.mb-encode-mimeheader.html
+mb_encode_numericentity=function.mb-encode-numericentity.html
+mb_ereg_match=function.mb-ereg-match.html
+mb_ereg_replace=function.mb-ereg-replace.html
+mb_ereg_search_getpos=function.mb-ereg-search-getpos.html
+mb_ereg_search_getregs=function.mb-ereg-search-getregs.html
+mb_ereg_search_init=function.mb-ereg-search-init.html
+mb_ereg_search_pos=function.mb-ereg-search-pos.html
+mb_ereg_search_regs=function.mb-ereg-search-regs.html
+mb_ereg_search_setpos=function.mb-ereg-search-setpos.html
+mb_ereg_search=function.mb-ereg-search.html
+mb_ereg=function.mb-ereg.html
+mb_eregi_replace=function.mb-eregi-replace.html
+mb_eregi=function.mb-eregi.html
+mb_get_info=function.mb-get-info.html
+mb_http_input=function.mb-http-input.html
+mb_http_output=function.mb-http-output.html
+mb_internal_encoding=function.mb-internal-encoding.html
+mb_language=function.mb-language.html
+mb_output_handler=function.mb-output-handler.html
+mb_parse_str=function.mb-parse-str.html
+mb_preferred_mime_name=function.mb-preferred-mime-name.html
+mb_regex_encoding=function.mb-regex-encoding.html
+mb_regex_set_options=function.mb-regex-set-options.html
+mb_send_mail=function.mb-send-mail.html
+mb_split=function.mb-split.html
+mb_strcut=function.mb-strcut.html
+mb_strimwidth=function.mb-strimwidth.html
+mb_strlen=function.mb-strlen.html
+mb_strpos=function.mb-strpos.html
+mb_strrpos=function.mb-strrpos.html
+mb_strtolower=function.mb-strtolower.html
+mb_strtoupper=function.mb-strtoupper.html
+mb_strwidth=function.mb-strwidth.html
+mb_substitute_character=function.mb-substitute-character.html
+mb_substr_count=function.mb-substr-count.html
+mb_substr=function.mb-substr.html
+mcal_append_event=function.mcal-append-event.html
+mcal_close=function.mcal-close.html
+mcal_create_calendar=function.mcal-create-calendar.html
+mcal_date_compare=function.mcal-date-compare.html
+mcal_date_valid=function.mcal-date-valid.html
+mcal_day_of_week=function.mcal-day-of-week.html
+mcal_day_of_year=function.mcal-day-of-year.html
+mcal_days_in_month=function.mcal-days-in-month.html
+mcal_delete_calendar=function.mcal-delete-calendar.html
+mcal_delete_event=function.mcal-delete-event.html
+mcal_event_add_attribute=function.mcal-event-add-attribute.html
+mcal_event_init=function.mcal-event-init.html
+mcal_event_set_alarm=function.mcal-event-set-alarm.html
+mcal_event_set_category=function.mcal-event-set-category.html
+mcal_event_set_class=function.mcal-event-set-class.html
+mcal_event_set_description=function.mcal-event-set-description.html
+mcal_event_set_end=function.mcal-event-set-end.html
+mcal_event_set_recur_daily=function.mcal-event-set-recur-daily.html
+mcal_event_set_recur_monthly_mday=function.mcal-event-set-recur-monthly-mday.html
+mcal_event_set_recur_monthly_wday=function.mcal-event-set-recur-monthly-wday.html
+mcal_event_set_recur_none=function.mcal-event-set-recur-none.html
+mcal_event_set_recur_weekly=function.mcal-event-set-recur-weekly.html
+mcal_event_set_recur_yearly=function.mcal-event-set-recur-yearly.html
+mcal_event_set_start=function.mcal-event-set-start.html
+mcal_event_set_title=function.mcal-event-set-title.html
+mcal_expunge=function.mcal-expunge.html
+mcal_fetch_current_stream_event=function.mcal-fetch-current-stream-event.html
+mcal_fetch_event=function.mcal-fetch-event.html
+mcal_is_leap_year=function.mcal-is-leap-year.html
+mcal_list_alarms=function.mcal-list-alarms.html
+mcal_list_events=function.mcal-list-events.html
+mcal_next_recurrence=function.mcal-next-recurrence.html
+mcal_open=function.mcal-open.html
+mcal_popen=function.mcal-popen.html
+mcal_rename_calendar=function.mcal-rename-calendar.html
+mcal_reopen=function.mcal-reopen.html
+mcal_snooze=function.mcal-snooze.html
+mcal_store_event=function.mcal-store-event.html
+mcal_time_valid=function.mcal-time-valid.html
+mcal_week_of_year=function.mcal-week-of-year.html
+mcrypt_cbc=function.mcrypt-cbc.html
+mcrypt_cfb=function.mcrypt-cfb.html
+mcrypt_create_iv=function.mcrypt-create-iv.html
+mcrypt_decrypt=function.mcrypt-decrypt.html
+mcrypt_ecb=function.mcrypt-ecb.html
+mcrypt_enc_get_algorithms_name=function.mcrypt-enc-get-algorithms-name.html
+mcrypt_enc_get_block_size=function.mcrypt-enc-get-block-size.html
+mcrypt_enc_get_iv_size=function.mcrypt-enc-get-iv-size.html
+mcrypt_enc_get_key_size=function.mcrypt-enc-get-key-size.html
+mcrypt_enc_get_modes_name=function.mcrypt-enc-get-modes-name.html
+mcrypt_enc_get_supported_key_sizes=function.mcrypt-enc-get-supported-key-sizes.html
+mcrypt_enc_is_block_algorithm_mode=function.mcrypt-enc-is-block-algorithm-mode.html
+mcrypt_enc_is_block_algorithm=function.mcrypt-enc-is-block-algorithm.html
+mcrypt_enc_is_block_mode=function.mcrypt-enc-is-block-mode.html
+mcrypt_enc_self_test=function.mcrypt-enc-self-test.html
+mcrypt_encrypt=function.mcrypt-encrypt.html
+mcrypt_generic_deinit=function.mcrypt-generic-deinit.html
+mcrypt_generic_end=function.mcrypt-generic-end.html
+mcrypt_generic_init=function.mcrypt-generic-init.html
+mcrypt_generic=function.mcrypt-generic.html
+mcrypt_get_block_size=function.mcrypt-get-block-size.html
+mcrypt_get_cipher_name=function.mcrypt-get-cipher-name.html
+mcrypt_get_iv_size=function.mcrypt-get-iv-size.html
+mcrypt_get_key_size=function.mcrypt-get-key-size.html
+mcrypt_list_algorithms=function.mcrypt-list-algorithms.html
+mcrypt_list_modes=function.mcrypt-list-modes.html
+mcrypt_module_close=function.mcrypt-module-close.html
+mcrypt_module_get_algo_block_size=function.mcrypt-module-get-algo-block-size.html
+mcrypt_module_get_algo_key_size=function.mcrypt-module-get-algo-key-size.html
+mcrypt_module_get_supported_key_sizes=function.mcrypt-module-get-supported-key-sizes.html
+mcrypt_module_is_block_algorithm_mode=function.mcrypt-module-is-block-algorithm-mode.html
+mcrypt_module_is_block_algorithm=function.mcrypt-module-is-block-algorithm.html
+mcrypt_module_is_block_mode=function.mcrypt-module-is-block-mode.html
+mcrypt_module_open=function.mcrypt-module-open.html
+mcrypt_module_self_test=function.mcrypt-module-self-test.html
+mcrypt_ofb=function.mcrypt-ofb.html
+mcve_adduser=function.mcve-adduser.html
+mcve_adduserarg=function.mcve-adduserarg.html
+mcve_bt=function.mcve-bt.html
+mcve_checkstatus=function.mcve-checkstatus.html
+mcve_chkpwd=function.mcve-chkpwd.html
+mcve_chngpwd=function.mcve-chngpwd.html
+mcve_completeauthorizations=function.mcve-completeauthorizations.html
+mcve_connect=function.mcve-connect.html
+mcve_connectionerror=function.mcve-connectionerror.html
+mcve_deleteresponse=function.mcve-deleteresponse.html
+mcve_deletetrans=function.mcve-deletetrans.html
+mcve_deleteusersetup=function.mcve-deleteusersetup.html
+mcve_deluser=function.mcve-deluser.html
+mcve_destroyconn=function.mcve-destroyconn.html
+mcve_destroyengine=function.mcve-destroyengine.html
+mcve_disableuser=function.mcve-disableuser.html
+mcve_edituser=function.mcve-edituser.html
+mcve_enableuser=function.mcve-enableuser.html
+mcve_force=function.mcve-force.html
+mcve_getcell=function.mcve-getcell.html
+mcve_getcellbynum=function.mcve-getcellbynum.html
+mcve_getcommadelimited=function.mcve-getcommadelimited.html
+mcve_getheader=function.mcve-getheader.html
+mcve_getuserarg=function.mcve-getuserarg.html
+mcve_getuserparam=function.mcve-getuserparam.html
+mcve_gft=function.mcve-gft.html
+mcve_gl=function.mcve-gl.html
+mcve_gut=function.mcve-gut.html
+mcve_initconn=function.mcve-initconn.html
+mcve_initengine=function.mcve-initengine.html
+mcve_initusersetup=function.mcve-initusersetup.html
+mcve_iscommadelimited=function.mcve-iscommadelimited.html
+mcve_liststats=function.mcve-liststats.html
+mcve_listusers=function.mcve-listusers.html
+mcve_maxconntimeout=function.mcve-maxconntimeout.html
+mcve_monitor=function.mcve-monitor.html
+mcve_numcolumns=function.mcve-numcolumns.html
+mcve_numrows=function.mcve-numrows.html
+mcve_override=function.mcve-override.html
+mcve_parsecommadelimited=function.mcve-parsecommadelimited.html
+mcve_ping=function.mcve-ping.html
+mcve_preauth=function.mcve-preauth.html
+mcve_preauthcompletion=function.mcve-preauthcompletion.html
+mcve_qc=function.mcve-qc.html
+mcve_responseparam=function.mcve-responseparam.html
+mcve_return=function.mcve-return.html
+mcve_returncode=function.mcve-returncode.html
+mcve_returnstatus=function.mcve-returnstatus.html
+mcve_sale=function.mcve-sale.html
+mcve_setblocking=function.mcve-setblocking.html
+mcve_setdropfile=function.mcve-setdropfile.html
+mcve_setip=function.mcve-setip.html
+mcve_setssl=function.mcve-setssl.html
+mcve_settimeout=function.mcve-settimeout.html
+mcve_settle=function.mcve-settle.html
+mcve_text_avs=function.mcve-text-avs.html
+mcve_text_code=function.mcve-text-code.html
+mcve_text_cv=function.mcve-text-cv.html
+mcve_transactionauth=function.mcve-transactionauth.html
+mcve_transactionavs=function.mcve-transactionavs.html
+mcve_transactionbatch=function.mcve-transactionbatch.html
+mcve_transactioncv=function.mcve-transactioncv.html
+mcve_transactionid=function.mcve-transactionid.html
+mcve_transactionitem=function.mcve-transactionitem.html
+mcve_transactionssent=function.mcve-transactionssent.html
+mcve_transactiontext=function.mcve-transactiontext.html
+mcve_transinqueue=function.mcve-transinqueue.html
+mcve_transnew=function.mcve-transnew.html
+mcve_transparam=function.mcve-transparam.html
+mcve_transsend=function.mcve-transsend.html
+mcve_ub=function.mcve-ub.html
+mcve_uwait=function.mcve-uwait.html
+mcve_verifyconnection=function.mcve-verifyconnection.html
+mcve_verifysslcert=function.mcve-verifysslcert.html
+mcve_void=function.mcve-void.html
+md5_file=function.md5-file.html
+md5=function.md5.html
+mdecrypt_generic=function.mdecrypt-generic.html
+metaphone=function.metaphone.html
+method_exists=function.method-exists.html
+mhash_count=function.mhash-count.html
+mhash_get_block_size=function.mhash-get-block-size.html
+mhash_get_hash_name=function.mhash-get-hash-name.html
+mhash_keygen_s2k=function.mhash-keygen-s2k.html
+mhash=function.mhash.html
+microtime=function.microtime.html
+mime_content_type=function.mime-content-type.html
+min=function.min.html
+ming_setcubicthreshold=function.ming-setcubicthreshold.html
+ming_setscale=function.ming-setscale.html
+ming_useswfversion=function.ming-useswfversion.html
+mkdir=function.mkdir.html
+mktime=function.mktime.html
+money_format=function.money-format.html
+move_uploaded_file=function.move-uploaded-file.html
+msession_connect=function.msession-connect.html
+msession_count=function.msession-count.html
+msession_create=function.msession-create.html
+msession_destroy=function.msession-destroy.html
+msession_disconnect=function.msession-disconnect.html
+msession_find=function.msession-find.html
+msession_get_array=function.msession-get-array.html
+msession_get=function.msession-get.html
+msession_getdata=function.msession-getdata.html
+msession_inc=function.msession-inc.html
+msession_list=function.msession-list.html
+msession_listvar=function.msession-listvar.html
+msession_lock=function.msession-lock.html
+msession_plugin=function.msession-plugin.html
+msession_randstr=function.msession-randstr.html
+msession_set_array=function.msession-set-array.html
+msession_set=function.msession-set.html
+msession_setdata=function.msession-setdata.html
+msession_timeout=function.msession-timeout.html
+msession_uniq=function.msession-uniq.html
+msession_unlock=function.msession-unlock.html
+msg_get_queue=function.msg-get-queue.html
+msg_receive=function.msg-receive.html
+msg_remove_queue=function.msg-remove-queue.html
+msg_send=function.msg-send.html
+msg_set_queue=function.msg-set-queue.html
+msg_stat_queue=function.msg-stat-queue.html
+msql_affected_rows=function.msql-affected-rows.html
+msql_close=function.msql-close.html
+msql_connect=function.msql-connect.html
+msql_create_db=function.msql-create-db.html
+msql_createdb=function.msql-createdb.html
+msql_data_seek=function.msql-data-seek.html
+msql_dbname=function.msql-dbname.html
+msql_drop_db=function.msql-drop-db.html
+msql_dropdb=function.msql-dropdb.html
+msql_error=function.msql-error.html
+msql_fetch_array=function.msql-fetch-array.html
+msql_fetch_field=function.msql-fetch-field.html
+msql_fetch_object=function.msql-fetch-object.html
+msql_fetch_row=function.msql-fetch-row.html
+msql_field_seek=function.msql-field-seek.html
+msql_fieldflags=function.msql-fieldflags.html
+msql_fieldlen=function.msql-fieldlen.html
+msql_fieldname=function.msql-fieldname.html
+msql_fieldtable=function.msql-fieldtable.html
+msql_fieldtype=function.msql-fieldtype.html
+msql_free_result=function.msql-free-result.html
+msql_freeresult=function.msql-freeresult.html
+msql_list_dbs=function.msql-list-dbs.html
+msql_list_fields=function.msql-list-fields.html
+msql_list_tables=function.msql-list-tables.html
+msql_listdbs=function.msql-listdbs.html
+msql_listfields=function.msql-listfields.html
+msql_listtables=function.msql-listtables.html
+msql_num_fields=function.msql-num-fields.html
+msql_num_rows=function.msql-num-rows.html
+msql_numfields=function.msql-numfields.html
+msql_numrows=function.msql-numrows.html
+msql_pconnect=function.msql-pconnect.html
+msql_query=function.msql-query.html
+msql_regcase=function.msql-regcase.html
+msql_result=function.msql-result.html
+msql_select_db=function.msql-select-db.html
+msql_selectdb=function.msql-selectdb.html
+msql_tablename=function.msql-tablename.html
+msql=function.msql.html
+mssql_bind=function.mssql-bind.html
+mssql_close=function.mssql-close.html
+mssql_connect=function.mssql-connect.html
+mssql_data_seek=function.mssql-data-seek.html
+mssql_execute=function.mssql-execute.html
+mssql_fetch_array=function.mssql-fetch-array.html
+mssql_fetch_assoc=function.mssql-fetch-assoc.html
+mssql_fetch_batch=function.mssql-fetch-batch.html
+mssql_fetch_field=function.mssql-fetch-field.html
+mssql_fetch_object=function.mssql-fetch-object.html
+mssql_fetch_row=function.mssql-fetch-row.html
+mssql_field_length=function.mssql-field-length.html
+mssql_field_name=function.mssql-field-name.html
+mssql_field_seek=function.mssql-field-seek.html
+mssql_field_type=function.mssql-field-type.html
+mssql_free_result=function.mssql-free-result.html
+mssql_free_statement=function.mssql-free-statement.html
+mssql_get_last_message=function.mssql-get-last-message.html
+mssql_guid_string=function.mssql-guid-string.html
+mssql_init=function.mssql-init.html
+mssql_min_error_severity=function.mssql-min-error-severity.html
+mssql_min_message_severity=function.mssql-min-message-severity.html
+mssql_next_result=function.mssql-next-result.html
+mssql_num_fields=function.mssql-num-fields.html
+mssql_num_rows=function.mssql-num-rows.html
+mssql_pconnect=function.mssql-pconnect.html
+mssql_query=function.mssql-query.html
+mssql_result=function.mssql-result.html
+mssql_rows_affected=function.mssql-rows-affected.html
+mssql_select_db=function.mssql-select-db.html
+mt_getrandmax=function.mt-getrandmax.html
+mt_rand=function.mt-rand.html
+mt_srand=function.mt-srand.html
+muscat_close=function.muscat-close.html
+muscat_get=function.muscat-get.html
+muscat_give=function.muscat-give.html
+muscat_setup_net=function.muscat-setup-net.html
+muscat_setup=function.muscat-setup.html
+mysql_affected_rows=function.mysql-affected-rows.html
+mysql_change_user=function.mysql-change-user.html
+mysql_character_set_name=function.mysql-character-set-name.html
+mysql_close=function.mysql-close.html
+mysql_connect=function.mysql-connect.html
+mysql_create_db=function.mysql-create-db.html
+mysql_data_seek=function.mysql-data-seek.html
+mysql_db_name=function.mysql-db-name.html
+mysql_db_query=function.mysql-db-query.html
+mysql_drop_db=function.mysql-drop-db.html
+mysql_errno=function.mysql-errno.html
+mysql_error=function.mysql-error.html
+mysql_escape_string=function.mysql-escape-string.html
+mysql_fetch_array=function.mysql-fetch-array.html
+mysql_fetch_assoc=function.mysql-fetch-assoc.html
+mysql_fetch_field=function.mysql-fetch-field.html
+mysql_fetch_lengths=function.mysql-fetch-lengths.html
+mysql_fetch_object=function.mysql-fetch-object.html
+mysql_fetch_row=function.mysql-fetch-row.html
+mysql_field_flags=function.mysql-field-flags.html
+mysql_field_len=function.mysql-field-len.html
+mysql_field_name=function.mysql-field-name.html
+mysql_field_seek=function.mysql-field-seek.html
+mysql_field_table=function.mysql-field-table.html
+mysql_field_type=function.mysql-field-type.html
+mysql_free_result=function.mysql-free-result.html
+mysql_get_client_info=function.mysql-get-client-info.html
+mysql_get_host_info=function.mysql-get-host-info.html
+mysql_get_proto_info=function.mysql-get-proto-info.html
+mysql_get_server_info=function.mysql-get-server-info.html
+mysql_info=function.mysql-info.html
+mysql_insert_id=function.mysql-insert-id.html
+mysql_list_dbs=function.mysql-list-dbs.html
+mysql_list_fields=function.mysql-list-fields.html
+mysql_list_processes=function.mysql-list-processes.html
+mysql_list_tables=function.mysql-list-tables.html
+mysql_num_fields=function.mysql-num-fields.html
+mysql_num_rows=function.mysql-num-rows.html
+mysql_pconnect=function.mysql-pconnect.html
+mysql_ping=function.mysql-ping.html
+mysql_query=function.mysql-query.html
+mysql_real_escape_string=function.mysql-real-escape-string.html
+mysql_result=function.mysql-result.html
+mysql_select_db=function.mysql-select-db.html
+mysql_stat=function.mysql-stat.html
+mysql_tablename=function.mysql-tablename.html
+mysql_thread_id=function.mysql-thread-id.html
+mysql_unbuffered_query=function.mysql-unbuffered-query.html
+natcasesort=function.natcasesort.html
+natsort=function.natsort.html
+ncurses_addch=function.ncurses-addch.html
+ncurses_addchnstr=function.ncurses-addchnstr.html
+ncurses_addchstr=function.ncurses-addchstr.html
+ncurses_addnstr=function.ncurses-addnstr.html
+ncurses_addstr=function.ncurses-addstr.html
+ncurses_assume_default_colors=function.ncurses-assume-default-colors.html
+ncurses_attroff=function.ncurses-attroff.html
+ncurses_attron=function.ncurses-attron.html
+ncurses_attrset=function.ncurses-attrset.html
+ncurses_baudrate=function.ncurses-baudrate.html
+ncurses_beep=function.ncurses-beep.html
+ncurses_bkgd=function.ncurses-bkgd.html
+ncurses_bkgdset=function.ncurses-bkgdset.html
+ncurses_border=function.ncurses-border.html
+ncurses_can_change_color=function.ncurses-can-change-color.html
+ncurses_cbreak=function.ncurses-cbreak.html
+ncurses_clear=function.ncurses-clear.html
+ncurses_clrtobot=function.ncurses-clrtobot.html
+ncurses_clrtoeol=function.ncurses-clrtoeol.html
+ncurses_color_set=function.ncurses-color-set.html
+ncurses_curs_set=function.ncurses-curs-set.html
+ncurses_def_prog_mode=function.ncurses-def-prog-mode.html
+ncurses_def_shell_mode=function.ncurses-def-shell-mode.html
+ncurses_define_key=function.ncurses-define-key.html
+ncurses_delay_output=function.ncurses-delay-output.html
+ncurses_delch=function.ncurses-delch.html
+ncurses_deleteln=function.ncurses-deleteln.html
+ncurses_delwin=function.ncurses-delwin.html
+ncurses_doupdate=function.ncurses-doupdate.html
+ncurses_echo=function.ncurses-echo.html
+ncurses_echochar=function.ncurses-echochar.html
+ncurses_end=function.ncurses-end.html
+ncurses_erase=function.ncurses-erase.html
+ncurses_erasechar=function.ncurses-erasechar.html
+ncurses_filter=function.ncurses-filter.html
+ncurses_flash=function.ncurses-flash.html
+ncurses_flushinp=function.ncurses-flushinp.html
+ncurses_getch=function.ncurses-getch.html
+ncurses_getmouse=function.ncurses-getmouse.html
+ncurses_halfdelay=function.ncurses-halfdelay.html
+ncurses_has_colors=function.ncurses-has-colors.html
+ncurses_has_ic=function.ncurses-has-ic.html
+ncurses_has_il=function.ncurses-has-il.html
+ncurses_has_key=function.ncurses-has-key.html
+ncurses_hline=function.ncurses-hline.html
+ncurses_inch=function.ncurses-inch.html
+ncurses_init_color=function.ncurses-init-color.html
+ncurses_init_pair=function.ncurses-init-pair.html
+ncurses_init=function.ncurses-init.html
+ncurses_insch=function.ncurses-insch.html
+ncurses_insdelln=function.ncurses-insdelln.html
+ncurses_insertln=function.ncurses-insertln.html
+ncurses_insstr=function.ncurses-insstr.html
+ncurses_instr=function.ncurses-instr.html
+ncurses_isendwin=function.ncurses-isendwin.html
+ncurses_keyok=function.ncurses-keyok.html
+ncurses_killchar=function.ncurses-killchar.html
+ncurses_longname=function.ncurses-longname.html
+ncurses_mouseinterval=function.ncurses-mouseinterval.html
+ncurses_mousemask=function.ncurses-mousemask.html
+ncurses_move=function.ncurses-move.html
+ncurses_mvaddch=function.ncurses-mvaddch.html
+ncurses_mvaddchnstr=function.ncurses-mvaddchnstr.html
+ncurses_mvaddchstr=function.ncurses-mvaddchstr.html
+ncurses_mvaddnstr=function.ncurses-mvaddnstr.html
+ncurses_mvaddstr=function.ncurses-mvaddstr.html
+ncurses_mvcur=function.ncurses-mvcur.html
+ncurses_mvdelch=function.ncurses-mvdelch.html
+ncurses_mvgetch=function.ncurses-mvgetch.html
+ncurses_mvhline=function.ncurses-mvhline.html
+ncurses_mvinch=function.ncurses-mvinch.html
+ncurses_mvvline=function.ncurses-mvvline.html
+ncurses_mvwaddstr=function.ncurses-mvwaddstr.html
+ncurses_napms=function.ncurses-napms.html
+ncurses_newwin=function.ncurses-newwin.html
+ncurses_nl=function.ncurses-nl.html
+ncurses_nocbreak=function.ncurses-nocbreak.html
+ncurses_noecho=function.ncurses-noecho.html
+ncurses_nonl=function.ncurses-nonl.html
+ncurses_noqiflush=function.ncurses-noqiflush.html
+ncurses_noraw=function.ncurses-noraw.html
+ncurses_putp=function.ncurses-putp.html
+ncurses_qiflush=function.ncurses-qiflush.html
+ncurses_raw=function.ncurses-raw.html
+ncurses_refresh=function.ncurses-refresh.html
+ncurses_resetty=function.ncurses-resetty.html
+ncurses_savetty=function.ncurses-savetty.html
+ncurses_scr_dump=function.ncurses-scr-dump.html
+ncurses_scr_init=function.ncurses-scr-init.html
+ncurses_scr_restore=function.ncurses-scr-restore.html
+ncurses_scr_set=function.ncurses-scr-set.html
+ncurses_scrl=function.ncurses-scrl.html
+ncurses_slk_attr=function.ncurses-slk-attr.html
+ncurses_slk_attroff=function.ncurses-slk-attroff.html
+ncurses_slk_attron=function.ncurses-slk-attron.html
+ncurses_slk_attrset=function.ncurses-slk-attrset.html
+ncurses_slk_clear=function.ncurses-slk-clear.html
+ncurses_slk_color=function.ncurses-slk-color.html
+ncurses_slk_init=function.ncurses-slk-init.html
+ncurses_slk_noutrefresh=function.ncurses-slk-noutrefresh.html
+ncurses_slk_refresh=function.ncurses-slk-refresh.html
+ncurses_slk_restore=function.ncurses-slk-restore.html
+ncurses_slk_touch=function.ncurses-slk-touch.html
+ncurses_standend=function.ncurses-standend.html
+ncurses_standout=function.ncurses-standout.html
+ncurses_start_color=function.ncurses-start-color.html
+ncurses_termattrs=function.ncurses-termattrs.html
+ncurses_termname=function.ncurses-termname.html
+ncurses_timeout=function.ncurses-timeout.html
+ncurses_typeahead=function.ncurses-typeahead.html
+ncurses_ungetch=function.ncurses-ungetch.html
+ncurses_ungetmouse=function.ncurses-ungetmouse.html
+ncurses_use_default_colors=function.ncurses-use-default-colors.html
+ncurses_use_env=function.ncurses-use-env.html
+ncurses_use_extended_names=function.ncurses-use-extended-names.html
+ncurses_vidattr=function.ncurses-vidattr.html
+ncurses_vline=function.ncurses-vline.html
+ncurses_wrefresh=function.ncurses-wrefresh.html
+next=function.next.html
+ngettext=function.ngettext.html
+nl_langinfo=function.nl-langinfo.html
+nl2br=function.nl2br.html
+notes_body=function.notes-body.html
+notes_copy_db=function.notes-copy-db.html
+notes_create_db=function.notes-create-db.html
+notes_create_note=function.notes-create-note.html
+notes_drop_db=function.notes-drop-db.html
+notes_find_note=function.notes-find-note.html
+notes_header_info=function.notes-header-info.html
+notes_list_msgs=function.notes-list-msgs.html
+notes_mark_read=function.notes-mark-read.html
+notes_mark_unread=function.notes-mark-unread.html
+notes_nav_create=function.notes-nav-create.html
+notes_search=function.notes-search.html
+notes_unread=function.notes-unread.html
+notes_version=function.notes-version.html
+number_format=function.number-format.html
+ob_clean=function.ob-clean.html
+ob_end_clean=function.ob-end-clean.html
+ob_end_flush=function.ob-end-flush.html
+ob_flush=function.ob-flush.html
+ob_get_contents=function.ob-get-contents.html
+ob_get_length=function.ob-get-length.html
+ob_get_level=function.ob-get-level.html
+ob_get_status=function.ob-get-status.html
+ob_gzhandler=function.ob-gzhandler.html
+ob_iconv_handler=function.ob-iconv-handler.html
+ob_implicit_flush=function.ob-implicit-flush.html
+ob_start=function.ob-start.html
+ocibindbyname=function.ocibindbyname.html
+ocicancel=function.ocicancel.html
+ocicollappend=function.ocicollappend.html
+ocicollassign=function.ocicollassign.html
+ocicollassignelem=function.ocicollassignelem.html
+ocicollgetelem=function.ocicollgetelem.html
+ocicollmax=function.ocicollmax.html
+ocicollsize=function.ocicollsize.html
+ocicolltrim=function.ocicolltrim.html
+ocicolumnisnull=function.ocicolumnisnull.html
+ocicolumnname=function.ocicolumnname.html
+ocicolumnprecision=function.ocicolumnprecision.html
+ocicolumnscale=function.ocicolumnscale.html
+ocicolumnsize=function.ocicolumnsize.html
+ocicolumntype=function.ocicolumntype.html
+ocicolumntyperaw=function.ocicolumntyperaw.html
+ocicommit=function.ocicommit.html
+ocidefinebyname=function.ocidefinebyname.html
+ocierror=function.ocierror.html
+ociexecute=function.ociexecute.html
+ocifetch=function.ocifetch.html
+ocifetchinto=function.ocifetchinto.html
+ocifetchstatement=function.ocifetchstatement.html
+ocifreecollection=function.ocifreecollection.html
+ocifreecursor=function.ocifreecursor.html
+ocifreedesc=function.ocifreedesc.html
+ocifreestatement=function.ocifreestatement.html
+ociinternaldebug=function.ociinternaldebug.html
+ociloadlob=function.ociloadlob.html
+ocilogoff=function.ocilogoff.html
+ocilogon=function.ocilogon.html
+ocinewcollection=function.ocinewcollection.html
+ocinewcursor=function.ocinewcursor.html
+ocinewdescriptor=function.ocinewdescriptor.html
+ocinlogon=function.ocinlogon.html
+ocinumcols=function.ocinumcols.html
+ociparse=function.ociparse.html
+ociplogon=function.ociplogon.html
+ociresult=function.ociresult.html
+ocirollback=function.ocirollback.html
+ocirowcount=function.ocirowcount.html
+ocisavelob=function.ocisavelob.html
+ocisavelobfile=function.ocisavelobfile.html
+ociserverversion=function.ociserverversion.html
+ocisetprefetch=function.ocisetprefetch.html
+ocistatementtype=function.ocistatementtype.html
+ociwritelobtofile=function.ociwritelobtofile.html
+octdec=function.octdec.html
+odbc_autocommit=function.odbc-autocommit.html
+odbc_binmode=function.odbc-binmode.html
+odbc_close_all=function.odbc-close-all.html
+odbc_close=function.odbc-close.html
+odbc_columnprivileges=function.odbc-columnprivileges.html
+odbc_columns=function.odbc-columns.html
+odbc_commit=function.odbc-commit.html
+odbc_connect=function.odbc-connect.html
+odbc_cursor=function.odbc-cursor.html
+odbc_data_source=function.odbc-data-source.html
+odbc_do=function.odbc-do.html
+odbc_error=function.odbc-error.html
+odbc_errormsg=function.odbc-errormsg.html
+odbc_exec=function.odbc-exec.html
+odbc_execute=function.odbc-execute.html
+odbc_fetch_array=function.odbc-fetch-array.html
+odbc_fetch_into=function.odbc-fetch-into.html
+odbc_fetch_object=function.odbc-fetch-object.html
+odbc_fetch_row=function.odbc-fetch-row.html
+odbc_field_len=function.odbc-field-len.html
+odbc_field_name=function.odbc-field-name.html
+odbc_field_num=function.odbc-field-num.html
+odbc_field_precision=function.odbc-field-precision.html
+odbc_field_scale=function.odbc-field-scale.html
+odbc_field_type=function.odbc-field-type.html
+odbc_foreignkeys=function.odbc-foreignkeys.html
+odbc_free_result=function.odbc-free-result.html
+odbc_gettypeinfo=function.odbc-gettypeinfo.html
+odbc_longreadlen=function.odbc-longreadlen.html
+odbc_next_result=function.odbc-next-result.html
+odbc_num_fields=function.odbc-num-fields.html
+odbc_num_rows=function.odbc-num-rows.html
+odbc_pconnect=function.odbc-pconnect.html
+odbc_prepare=function.odbc-prepare.html
+odbc_primarykeys=function.odbc-primarykeys.html
+odbc_procedurecolumns=function.odbc-procedurecolumns.html
+odbc_procedures=function.odbc-procedures.html
+odbc_result_all=function.odbc-result-all.html
+odbc_result=function.odbc-result.html
+odbc_rollback=function.odbc-rollback.html
+odbc_setoption=function.odbc-setoption.html
+odbc_specialcolumns=function.odbc-specialcolumns.html
+odbc_statistics=function.odbc-statistics.html
+odbc_tableprivileges=function.odbc-tableprivileges.html
+odbc_tables=function.odbc-tables.html
+opendir=function.opendir.html
+openlog=function.openlog.html
+openssl_csr_export_to_file=function.openssl-csr-export-to-file.html
+openssl_csr_export=function.openssl-csr-export.html
+openssl_csr_new=function.openssl-csr-new.html
+openssl_csr_sign=function.openssl-csr-sign.html
+openssl_error_string=function.openssl-error-string.html
+openssl_free_key=function.openssl-free-key.html
+openssl_get_privatekey=function.openssl-get-privatekey.html
+openssl_get_publickey=function.openssl-get-publickey.html
+openssl_open=function.openssl-open.html
+openssl_pkcs7_decrypt=function.openssl-pkcs7-decrypt.html
+openssl_pkcs7_encrypt=function.openssl-pkcs7-encrypt.html
+openssl_pkcs7_sign=function.openssl-pkcs7-sign.html
+openssl_pkcs7_verify=function.openssl-pkcs7-verify.html
+openssl_pkey_export_to_file=function.openssl-pkey-export-to-file.html
+openssl_pkey_export=function.openssl-pkey-export.html
+openssl_pkey_get_private=function.openssl-pkey-get-private.html
+openssl_pkey_get_public=function.openssl-pkey-get-public.html
+openssl_pkey_new=function.openssl-pkey-new.html
+openssl_private_decrypt=function.openssl-private-decrypt.html
+openssl_private_encrypt=function.openssl-private-encrypt.html
+openssl_public_decrypt=function.openssl-public-decrypt.html
+openssl_public_encrypt=function.openssl-public-encrypt.html
+openssl_seal=function.openssl-seal.html
+openssl_sign=function.openssl-sign.html
+openssl_verify=function.openssl-verify.html
+openssl_x509_check_private_key=function.openssl-x509-check-private-key.html
+openssl_x509_checkpurpose=function.openssl-x509-checkpurpose.html
+openssl_x509_export_to_file=function.openssl-x509-export-to-file.html
+openssl_x509_export=function.openssl-x509-export.html
+openssl_x509_free=function.openssl-x509-free.html
+openssl_x509_parse=function.openssl-x509-parse.html
+openssl_x509_read=function.openssl-x509-read.html
+ora_bind=function.ora-bind.html
+ora_close=function.ora-close.html
+ora_columnname=function.ora-columnname.html
+ora_columnsize=function.ora-columnsize.html
+ora_columntype=function.ora-columntype.html
+ora_commit=function.ora-commit.html
+ora_commitoff=function.ora-commitoff.html
+ora_commiton=function.ora-commiton.html
+ora_do=function.ora-do.html
+ora_error=function.ora-error.html
+ora_errorcode=function.ora-errorcode.html
+ora_exec=function.ora-exec.html
+ora_fetch_into=function.ora-fetch-into.html
+ora_fetch=function.ora-fetch.html
+ora_getcolumn=function.ora-getcolumn.html
+ora_logoff=function.ora-logoff.html
+ora_logon=function.ora-logon.html
+ora_numcols=function.ora-numcols.html
+ora_numrows=function.ora-numrows.html
+ora_open=function.ora-open.html
+ora_parse=function.ora-parse.html
+ora_plogon=function.ora-plogon.html
+ora_rollback=function.ora-rollback.html
+ord=function.ord.html
+overload=function.overload.html
+ovrimos_close=function.ovrimos-close.html
+ovrimos_commit=function.ovrimos-commit.html
+ovrimos_connect=function.ovrimos-connect.html
+ovrimos_cursor=function.ovrimos-cursor.html
+ovrimos_exec=function.ovrimos-exec.html
+ovrimos_execute=function.ovrimos-execute.html
+ovrimos_fetch_into=function.ovrimos-fetch-into.html
+ovrimos_fetch_row=function.ovrimos-fetch-row.html
+ovrimos_field_len=function.ovrimos-field-len.html
+ovrimos_field_name=function.ovrimos-field-name.html
+ovrimos_field_num=function.ovrimos-field-num.html
+ovrimos_field_type=function.ovrimos-field-type.html
+ovrimos_free_result=function.ovrimos-free-result.html
+ovrimos_longreadlen=function.ovrimos-longreadlen.html
+ovrimos_num_fields=function.ovrimos-num-fields.html
+ovrimos_num_rows=function.ovrimos-num-rows.html
+ovrimos_prepare=function.ovrimos-prepare.html
+ovrimos_result_all=function.ovrimos-result-all.html
+ovrimos_result=function.ovrimos-result.html
+ovrimos_rollback=function.ovrimos-rollback.html
+pack=function.pack.html
+parse_ini_file=function.parse-ini-file.html
+parse_str=function.parse-str.html
+parse_url=function.parse-url.html
+passthru=function.passthru.html
+pathinfo=function.pathinfo.html
+pclose=function.pclose.html
+pcntl_exec=function.pcntl-exec.html
+pcntl_fork=function.pcntl-fork.html
+pcntl_signal=function.pcntl-signal.html
+pcntl_waitpid=function.pcntl-waitpid.html
+pcntl_wexitstatus=function.pcntl-wexitstatus.html
+pcntl_wifexited=function.pcntl-wifexited.html
+pcntl_wifsignaled=function.pcntl-wifsignaled.html
+pcntl_wifstopped=function.pcntl-wifstopped.html
+pcntl_wstopsig=function.pcntl-wstopsig.html
+pcntl_wtermsig=function.pcntl-wtermsig.html
+pdf_add_annotation=function.pdf-add-annotation.html
+pdf_add_bookmark=function.pdf-add-bookmark.html
+pdf_add_launchlink=function.pdf-add-launchlink.html
+pdf_add_locallink=function.pdf-add-locallink.html
+pdf_add_note=function.pdf-add-note.html
+pdf_add_outline=function.pdf-add-outline.html
+pdf_add_pdflink=function.pdf-add-pdflink.html
+pdf_add_thumbnail=function.pdf-add-thumbnail.html
+pdf_add_weblink=function.pdf-add-weblink.html
+pdf_arc=function.pdf-arc.html
+pdf_arcn=function.pdf-arcn.html
+pdf_attach_file=function.pdf-attach-file.html
+pdf_begin_page=function.pdf-begin-page.html
+pdf_begin_pattern=function.pdf-begin-pattern.html
+pdf_begin_template=function.pdf-begin-template.html
+pdf_circle=function.pdf-circle.html
+pdf_clip=function.pdf-clip.html
+pdf_close_image=function.pdf-close-image.html
+pdf_close_pdi_page=function.pdf-close-pdi-page.html
+pdf_close_pdi=function.pdf-close-pdi.html
+pdf_close=function.pdf-close.html
+pdf_closepath_fill_stroke=function.pdf-closepath-fill-stroke.html
+pdf_closepath_stroke=function.pdf-closepath-stroke.html
+pdf_closepath=function.pdf-closepath.html
+pdf_concat=function.pdf-concat.html
+pdf_continue_text=function.pdf-continue-text.html
+pdf_curveto=function.pdf-curveto.html
+pdf_delete=function.pdf-delete.html
+pdf_end_page=function.pdf-end-page.html
+pdf_end_pattern=function.pdf-end-pattern.html
+pdf_end_template=function.pdf-end-template.html
+pdf_endpath=function.pdf-endpath.html
+pdf_fill_stroke=function.pdf-fill-stroke.html
+pdf_fill=function.pdf-fill.html
+pdf_findfont=function.pdf-findfont.html
+pdf_get_buffer=function.pdf-get-buffer.html
+pdf_get_font=function.pdf-get-font.html
+pdf_get_fontname=function.pdf-get-fontname.html
+pdf_get_fontsize=function.pdf-get-fontsize.html
+pdf_get_image_height=function.pdf-get-image-height.html
+pdf_get_image_width=function.pdf-get-image-width.html
+pdf_get_majorversion=function.pdf-get-majorversion.html
+pdf_get_minorversion=function.pdf-get-minorversion.html
+pdf_get_parameter=function.pdf-get-parameter.html
+pdf_get_pdi_parameter=function.pdf-get-pdi-parameter.html
+pdf_get_pdi_value=function.pdf-get-pdi-value.html
+pdf_get_value=function.pdf-get-value.html
+pdf_initgraphics=function.pdf-initgraphics.html
+pdf_lineto=function.pdf-lineto.html
+pdf_makespotcolor=function.pdf-makespotcolor.html
+pdf_moveto=function.pdf-moveto.html
+pdf_new=function.pdf-new.html
+pdf_open_ccitt=function.pdf-open-ccitt.html
+pdf_open_file=function.pdf-open-file.html
+pdf_open_gif=function.pdf-open-gif.html
+pdf_open_image_file=function.pdf-open-image-file.html
+pdf_open_image=function.pdf-open-image.html
+pdf_open_jpeg=function.pdf-open-jpeg.html
+pdf_open_memory_image=function.pdf-open-memory-image.html
+pdf_open_pdi_page=function.pdf-open-pdi-page.html
+pdf_open_pdi=function.pdf-open-pdi.html
+pdf_open_png=function.pdf-open-png.html
+pdf_open_tiff=function.pdf-open-tiff.html
+pdf_open=function.pdf-open.html
+pdf_place_image=function.pdf-place-image.html
+pdf_place_pdi_page=function.pdf-place-pdi-page.html
+pdf_rect=function.pdf-rect.html
+pdf_restore=function.pdf-restore.html
+pdf_rotate=function.pdf-rotate.html
+pdf_save=function.pdf-save.html
+pdf_scale=function.pdf-scale.html
+pdf_set_border_color=function.pdf-set-border-color.html
+pdf_set_border_dash=function.pdf-set-border-dash.html
+pdf_set_border_style=function.pdf-set-border-style.html
+pdf_set_char_spacing=function.pdf-set-char-spacing.html
+pdf_set_duration=function.pdf-set-duration.html
+pdf_set_font=function.pdf-set-font.html
+pdf_set_horiz_scaling=function.pdf-set-horiz-scaling.html
+pdf_set_info_author=function.pdf-set-info-author.html
+pdf_set_info_creator=function.pdf-set-info-creator.html
+pdf_set_info_keywords=function.pdf-set-info-keywords.html
+pdf_set_info_subject=function.pdf-set-info-subject.html
+pdf_set_info_title=function.pdf-set-info-title.html
+pdf_set_info=function.pdf-set-info.html
+pdf_set_leading=function.pdf-set-leading.html
+pdf_set_parameter=function.pdf-set-parameter.html
+pdf_set_text_matrix=function.pdf-set-text-matrix.html
+pdf_set_text_pos=function.pdf-set-text-pos.html
+pdf_set_text_rendering=function.pdf-set-text-rendering.html
+pdf_set_text_rise=function.pdf-set-text-rise.html
+pdf_set_value=function.pdf-set-value.html
+pdf_set_word_spacing=function.pdf-set-word-spacing.html
+pdf_setcolor=function.pdf-setcolor.html
+pdf_setdash=function.pdf-setdash.html
+pdf_setflat=function.pdf-setflat.html
+pdf_setfont=function.pdf-setfont.html
+pdf_setgray_fill=function.pdf-setgray-fill.html
+pdf_setgray_stroke=function.pdf-setgray-stroke.html
+pdf_setgray=function.pdf-setgray.html
+pdf_setlinecap=function.pdf-setlinecap.html
+pdf_setlinejoin=function.pdf-setlinejoin.html
+pdf_setlinewidth=function.pdf-setlinewidth.html
+pdf_setmatrix=function.pdf-setmatrix.html
+pdf_setmiterlimit=function.pdf-setmiterlimit.html
+pdf_setpolydash=function.pdf-setpolydash.html
+pdf_setrgbcolor_fill=function.pdf-setrgbcolor-fill.html
+pdf_setrgbcolor_stroke=function.pdf-setrgbcolor-stroke.html
+pdf_setrgbcolor=function.pdf-setrgbcolor.html
+pdf_show_boxed=function.pdf-show-boxed.html
+pdf_show_xy=function.pdf-show-xy.html
+pdf_show=function.pdf-show.html
+pdf_skew=function.pdf-skew.html
+pdf_stringwidth=function.pdf-stringwidth.html
+pdf_stroke=function.pdf-stroke.html
+pdf_translate=function.pdf-translate.html
+pfpro_cleanup=function.pfpro-cleanup.html
+pfpro_init=function.pfpro-init.html
+pfpro_process_raw=function.pfpro-process-raw.html
+pfpro_process=function.pfpro-process.html
+pfpro_version=function.pfpro-version.html
+pfsockopen=function.pfsockopen.html
+pg_affected_rows=function.pg-affected-rows.html
+pg_cancel_query=function.pg-cancel-query.html
+pg_client_encoding=function.pg-client-encoding.html
+pg_close=function.pg-close.html
+pg_connect=function.pg-connect.html
+pg_connection_busy=function.pg-connection-busy.html
+pg_connection_reset=function.pg-connection-reset.html
+pg_connection_status=function.pg-connection-status.html
+pg_convert=function.pg-convert.html
+pg_copy_from=function.pg-copy-from.html
+pg_copy_to=function.pg-copy-to.html
+pg_dbname=function.pg-dbname.html
+pg_delete=function.pg-delete.html
+pg_end_copy=function.pg-end-copy.html
+pg_escape_bytea=function.pg-escape-bytea.html
+pg_escape_string=function.pg-escape-string.html
+pg_fetch_all=function.pg-fetch-all.html
+pg_fetch_array=function.pg-fetch-array.html
+pg_fetch_assoc=function.pg-fetch-assoc.html
+pg_fetch_object=function.pg-fetch-object.html
+pg_fetch_result=function.pg-fetch-result.html
+pg_fetch_row=function.pg-fetch-row.html
+pg_field_is_null=function.pg-field-is-null.html
+pg_field_name=function.pg-field-name.html
+pg_field_num=function.pg-field-num.html
+pg_field_prtlen=function.pg-field-prtlen.html
+pg_field_size=function.pg-field-size.html
+pg_field_type=function.pg-field-type.html
+pg_free_result=function.pg-free-result.html
+pg_get_notify=function.pg-get-notify.html
+pg_get_pid=function.pg-get-pid.html
+pg_get_result=function.pg-get-result.html
+pg_host=function.pg-host.html
+pg_insert=function.pg-insert.html
+pg_last_error=function.pg-last-error.html
+pg_last_notice=function.pg-last-notice.html
+pg_last_oid=function.pg-last-oid.html
+pg_lo_close=function.pg-lo-close.html
+pg_lo_create=function.pg-lo-create.html
+pg_lo_export=function.pg-lo-export.html
+pg_lo_import=function.pg-lo-import.html
+pg_lo_open=function.pg-lo-open.html
+pg_lo_read_all=function.pg-lo-read-all.html
+pg_lo_read=function.pg-lo-read.html
+pg_lo_seek=function.pg-lo-seek.html
+pg_lo_tell=function.pg-lo-tell.html
+pg_lo_unlink=function.pg-lo-unlink.html
+pg_lo_write=function.pg-lo-write.html
+pg_meta_data=function.pg-meta-data.html
+pg_num_fields=function.pg-num-fields.html
+pg_num_rows=function.pg-num-rows.html
+pg_options=function.pg-options.html
+pg_pconnect=function.pg-pconnect.html
+pg_ping=function.pg-ping.html
+pg_port=function.pg-port.html
+pg_put_line=function.pg-put-line.html
+pg_query=function.pg-query.html
+pg_result_error=function.pg-result-error.html
+pg_result_seek=function.pg-result-seek.html
+pg_result_status=function.pg-result-status.html
+pg_select=function.pg-select.html
+pg_send_query=function.pg-send-query.html
+pg_set_client_encoding=function.pg-set-client-encoding.html
+pg_trace=function.pg-trace.html
+pg_tty=function.pg-tty.html
+pg_unescape_bytea=function.pg-unescape-bytea.html
+pg_untrace=function.pg-untrace.html
+pg_update=function.pg-update.html
+php_ini_scanned_files=function.php-ini-scanned-files.html
+php_logo_guid=function.php-logo-guid.html
+php_sapi_name=function.php-sapi-name.html
+php_uname=function.php-uname.html
+phpcredits=function.phpcredits.html
+phpinfo=function.phpinfo.html
+phpversion=function.phpversion.html
+pi=function.pi.html
+png2wbmp=function.png2wbmp.html
+popen=function.popen.html
+pos=function.pos.html
+posix_ctermid=function.posix-ctermid.html
+posix_getcwd=function.posix-getcwd.html
+posix_getegid=function.posix-getegid.html
+posix_geteuid=function.posix-geteuid.html
+posix_getgid=function.posix-getgid.html
+posix_getgrgid=function.posix-getgrgid.html
+posix_getgrnam=function.posix-getgrnam.html
+posix_getgroups=function.posix-getgroups.html
+posix_getlogin=function.posix-getlogin.html
+posix_getpgid=function.posix-getpgid.html
+posix_getpgrp=function.posix-getpgrp.html
+posix_getpid=function.posix-getpid.html
+posix_getppid=function.posix-getppid.html
+posix_getpwnam=function.posix-getpwnam.html
+posix_getpwuid=function.posix-getpwuid.html
+posix_getrlimit=function.posix-getrlimit.html
+posix_getsid=function.posix-getsid.html
+posix_getuid=function.posix-getuid.html
+posix_isatty=function.posix-isatty.html
+posix_kill=function.posix-kill.html
+posix_mkfifo=function.posix-mkfifo.html
+posix_setegid=function.posix-setegid.html
+posix_seteuid=function.posix-seteuid.html
+posix_setgid=function.posix-setgid.html
+posix_setpgid=function.posix-setpgid.html
+posix_setsid=function.posix-setsid.html
+posix_setuid=function.posix-setuid.html
+posix_times=function.posix-times.html
+posix_ttyname=function.posix-ttyname.html
+posix_uname=function.posix-uname.html
+pow=function.pow.html
+preg_grep=function.preg-grep.html
+preg_match_all=function.preg-match-all.html
+preg_match=function.preg-match.html
+preg_quote=function.preg-quote.html
+preg_replace_callback=function.preg-replace-callback.html
+preg_replace=function.preg-replace.html
+preg_split=function.preg-split.html
+prev=function.prev.html
+print_r=function.print-r.html
+print=function.print.html
+printer_abort=function.printer-abort.html
+printer_close=function.printer-close.html
+printer_create_brush=function.printer-create-brush.html
+printer_create_dc=function.printer-create-dc.html
+printer_create_font=function.printer-create-font.html
+printer_create_pen=function.printer-create-pen.html
+printer_delete_brush=function.printer-delete-brush.html
+printer_delete_dc=function.printer-delete-dc.html
+printer_delete_font=function.printer-delete-font.html
+printer_delete_pen=function.printer-delete-pen.html
+printer_draw_bmp=function.printer-draw-bmp.html
+printer_draw_chord=function.printer-draw-chord.html
+printer_draw_elipse=function.printer-draw-elipse.html
+printer_draw_line=function.printer-draw-line.html
+printer_draw_pie=function.printer-draw-pie.html
+printer_draw_rectangle=function.printer-draw-rectangle.html
+printer_draw_roundrect=function.printer-draw-roundrect.html
+printer_draw_text=function.printer-draw-text.html
+printer_end_doc=function.printer-end-doc.html
+printer_end_page=function.printer-end-page.html
+printer_get_option=function.printer-get-option.html
+printer_list=function.printer-list.html
+printer_logical_fontheight=function.printer-logical-fontheight.html
+printer_open=function.printer-open.html
+printer_select_brush=function.printer-select-brush.html
+printer_select_font=function.printer-select-font.html
+printer_select_pen=function.printer-select-pen.html
+printer_set_option=function.printer-set-option.html
+printer_start_doc=function.printer-start-doc.html
+printer_start_page=function.printer-start-page.html
+printer_write=function.printer-write.html
+printf=function.printf.html
+proc_close=function.proc-close.html
+proc_open=function.proc-open.html
+pspell_add_to_personal=function.pspell-add-to-personal.html
+pspell_add_to_session=function.pspell-add-to-session.html
+pspell_check=function.pspell-check.html
+pspell_clear_session=function.pspell-clear-session.html
+pspell_config_create=function.pspell-config-create.html
+pspell_config_ignore=function.pspell-config-ignore.html
+pspell_config_mode=function.pspell-config-mode.html
+pspell_config_personal=function.pspell-config-personal.html
+pspell_config_repl=function.pspell-config-repl.html
+pspell_config_runtogether=function.pspell-config-runtogether.html
+pspell_config_save_repl=function.pspell-config-save-repl.html
+pspell_new_config=function.pspell-new-config.html
+pspell_new_personal=function.pspell-new-personal.html
+pspell_new=function.pspell-new.html
+pspell_save_wordlist=function.pspell-save-wordlist.html
+pspell_store_replacement=function.pspell-store-replacement.html
+pspell_suggest=function.pspell-suggest.html
+putenv=function.putenv.html
+qdom_error=function.qdom-error.html
+qdom_tree=function.qdom-tree.html
+quoted_printable_decode=function.quoted-printable-decode.html
+quotemeta=function.quotemeta.html
+rad2deg=function.rad2deg.html
+rand=function.rand.html
+range=function.range.html
+rawurldecode=function.rawurldecode.html
+rawurlencode=function.rawurlencode.html
+read_exif_data=function.read-exif-data.html
+readdir=function.readdir.html
+readfile=function.readfile.html
+readgzfile=function.readgzfile.html
+readline_add_history=function.readline-add-history.html
+readline_clear_history=function.readline-clear-history.html
+readline_completion_function=function.readline-completion-function.html
+readline_info=function.readline-info.html
+readline_list_history=function.readline-list-history.html
+readline_read_history=function.readline-read-history.html
+readline_write_history=function.readline-write-history.html
+readline=function.readline.html
+readlink=function.readlink.html
+realpath=function.realpath.html
+recode_file=function.recode-file.html
+recode_string=function.recode-string.html
+recode=function.recode.html
+register_shutdown_function=function.register-shutdown-function.html
+register_tick_function=function.register-tick-function.html
+rename=function.rename.html
+require_once=function.require-once.html
+require=function.require.html
+reset=function.reset.html
+restore_error_handler=function.restore-error-handler.html
+return=function.return.html
+rewind=function.rewind.html
+rewinddir=function.rewinddir.html
+rmdir=function.rmdir.html
+round=function.round.html
+rsort=function.rsort.html
+rtrim=function.rtrim.html
+sem_acquire=function.sem-acquire.html
+sem_get=function.sem-get.html
+sem_release=function.sem-release.html
+sem_remove=function.sem-remove.html
+serialize=function.serialize.html
+sesam_affected_rows=function.sesam-affected-rows.html
+sesam_commit=function.sesam-commit.html
+sesam_connect=function.sesam-connect.html
+sesam_diagnostic=function.sesam-diagnostic.html
+sesam_disconnect=function.sesam-disconnect.html
+sesam_errormsg=function.sesam-errormsg.html
+sesam_execimm=function.sesam-execimm.html
+sesam_fetch_array=function.sesam-fetch-array.html
+sesam_fetch_result=function.sesam-fetch-result.html
+sesam_fetch_row=function.sesam-fetch-row.html
+sesam_field_array=function.sesam-field-array.html
+sesam_field_name=function.sesam-field-name.html
+sesam_free_result=function.sesam-free-result.html
+sesam_num_fields=function.sesam-num-fields.html
+sesam_query=function.sesam-query.html
+sesam_rollback=function.sesam-rollback.html
+sesam_seek_row=function.sesam-seek-row.html
+sesam_settransaction=function.sesam-settransaction.html
+session_cache_expire=function.session-cache-expire.html
+session_cache_limiter=function.session-cache-limiter.html
+session_decode=function.session-decode.html
+session_destroy=function.session-destroy.html
+session_encode=function.session-encode.html
+session_get_cookie_params=function.session-get-cookie-params.html
+session_id=function.session-id.html
+session_is_registered=function.session-is-registered.html
+session_module_name=function.session-module-name.html
+session_name=function.session-name.html
+session_readonly=function.session-readonly.html
+session_register=function.session-register.html
+session_save_path=function.session-save-path.html
+session_set_cookie_params=function.session-set-cookie-params.html
+session_set_save_handler=function.session-set-save-handler.html
+session_start=function.session-start.html
+session_unregister=function.session-unregister.html
+session_unset=function.session-unset.html
+session_write_close=function.session-write-close.html
+set_error_handler=function.set-error-handler.html
+set_file_buffer=function.set-file-buffer.html
+set_magic_quotes_runtime=function.set-magic-quotes-runtime.html
+set_time_limit=function.set-time-limit.html
+setcookie=function.setcookie.html
+setlocale=function.setlocale.html
+settype=function.settype.html
+sha1_file=function.sha1-file.html
+sha1=function.sha1.html
+shell_exec=function.shell-exec.html
+shm_attach=function.shm-attach.html
+shm_detach=function.shm-detach.html
+shm_get_var=function.shm-get-var.html
+shm_put_var=function.shm-put-var.html
+shm_remove_var=function.shm-remove-var.html
+shm_remove=function.shm-remove.html
+shmop_close=function.shmop-close.html
+shmop_delete=function.shmop-delete.html
+shmop_open=function.shmop-open.html
+shmop_read=function.shmop-read.html
+shmop_size=function.shmop-size.html
+shmop_write=function.shmop-write.html
+show_source=function.show-source.html
+shuffle=function.shuffle.html
+similar_text=function.similar-text.html
+sin=function.sin.html
+sinh=function.sinh.html
+sizeof=function.sizeof.html
+sleep=function.sleep.html
+snmp_get_quick_print=function.snmp-get-quick-print.html
+snmp_set_quick_print=function.snmp-set-quick-print.html
+snmpget=function.snmpget.html
+snmprealwalk=function.snmprealwalk.html
+snmpset=function.snmpset.html
+snmpwalk=function.snmpwalk.html
+snmpwalkoid=function.snmpwalkoid.html
+socket_accept=function.socket-accept.html
+socket_bind=function.socket-bind.html
+socket_clear_error=function.socket-clear-error.html
+socket_close=function.socket-close.html
+socket_connect=function.socket-connect.html
+socket_create_listen=function.socket-create-listen.html
+socket_create_pair=function.socket-create-pair.html
+socket_create=function.socket-create.html
+socket_get_option=function.socket-get-option.html
+socket_get_status=function.socket-get-status.html
+socket_getpeername=function.socket-getpeername.html
+socket_getsockname=function.socket-getsockname.html
+socket_iovec_add=function.socket-iovec-add.html
+socket_iovec_alloc=function.socket-iovec-alloc.html
+socket_iovec_delete=function.socket-iovec-delete.html
+socket_iovec_fetch=function.socket-iovec-fetch.html
+socket_iovec_free=function.socket-iovec-free.html
+socket_iovec_set=function.socket-iovec-set.html
+socket_last_error=function.socket-last-error.html
+socket_listen=function.socket-listen.html
+socket_read=function.socket-read.html
+socket_readv=function.socket-readv.html
+socket_recv=function.socket-recv.html
+socket_recvfrom=function.socket-recvfrom.html
+socket_recvmsg=function.socket-recvmsg.html
+socket_select=function.socket-select.html
+socket_send=function.socket-send.html
+socket_sendmsg=function.socket-sendmsg.html
+socket_sendto=function.socket-sendto.html
+socket_set_blocking=function.socket-set-blocking.html
+socket_set_nonblock=function.socket-set-nonblock.html
+socket_set_option=function.socket-set-option.html
+socket_set_timeout=function.socket-set-timeout.html
+socket_shutdown=function.socket-shutdown.html
+socket_strerror=function.socket-strerror.html
+socket_write=function.socket-write.html
+socket_writev=function.socket-writev.html
+sort=function.sort.html
+soundex=function.soundex.html
+split=function.split.html
+spliti=function.spliti.html
+sprintf=function.sprintf.html
+sql_regcase=function.sql-regcase.html
+sqrt=function.sqrt.html
+srand=function.srand.html
+sscanf=function.sscanf.html
+stat=function.stat.html
+str_pad=function.str-pad.html
+str_repeat=function.str-repeat.html
+str_replace=function.str-replace.html
+str_rot13=function.str-rot13.html
+str_shuffle=function.str-shuffle.html
+str_word_count=function.str-word-count.html
+strcasecmp=function.strcasecmp.html
+strchr=function.strchr.html
+strcmp=function.strcmp.html
+strcoll=function.strcoll.html
+strcspn=function.strcspn.html
+stream_context_create=function.stream-context-create.html
+stream_context_get_options=function.stream-context-get-options.html
+stream_context_set_option=function.stream-context-set-option.html
+stream_context_set_params=function.stream-context-set-params.html
+stream_filter_append=function.stream-filter-append.html
+stream_filter_prepend=function.stream-filter-prepend.html
+stream_get_filters=function.stream-get-filters.html
+stream_get_meta_data=function.stream-get-meta-data.html
+stream_get_wrappers=function.stream-get-wrappers.html
+stream_register_filter=function.stream-register-filter.html
+stream_register_wrapper=function.stream-register-wrapper.html
+stream_select=function.stream-select.html
+stream_set_blocking=function.stream-set-blocking.html
+stream_set_timeout=function.stream-set-timeout.html
+stream_set_write_buffer=function.stream-set-write-buffer.html
+strftime=function.strftime.html
+strip_tags=function.strip-tags.html
+stripcslashes=function.stripcslashes.html
+stripslashes=function.stripslashes.html
+stristr=function.stristr.html
+strlen=function.strlen.html
+strnatcasecmp=function.strnatcasecmp.html
+strnatcmp=function.strnatcmp.html
+strncasecmp=function.strncasecmp.html
+strncmp=function.strncmp.html
+strpos=function.strpos.html
+strrchr=function.strrchr.html
+strrev=function.strrev.html
+strrpos=function.strrpos.html
+strspn=function.strspn.html
+strstr=function.strstr.html
+strtok=function.strtok.html
+strtolower=function.strtolower.html
+strtotime=function.strtotime.html
+strtoupper=function.strtoupper.html
+strtr=function.strtr.html
+strval=function.strval.html
+substr_count=function.substr-count.html
+substr_replace=function.substr-replace.html
+substr=function.substr.html
+swf_actiongeturl=function.swf-actiongeturl.html
+swf_actiongotoframe=function.swf-actiongotoframe.html
+swf_actiongotolabel=function.swf-actiongotolabel.html
+swf_actionnextframe=function.swf-actionnextframe.html
+swf_actionplay=function.swf-actionplay.html
+swf_actionprevframe=function.swf-actionprevframe.html
+swf_actionsettarget=function.swf-actionsettarget.html
+swf_actionstop=function.swf-actionstop.html
+swf_actiontogglequality=function.swf-actiontogglequality.html
+swf_actionwaitforframe=function.swf-actionwaitforframe.html
+swf_addbuttonrecord=function.swf-addbuttonrecord.html
+swf_addcolor=function.swf-addcolor.html
+swf_closefile=function.swf-closefile.html
+swf_definebitmap=function.swf-definebitmap.html
+swf_definefont=function.swf-definefont.html
+swf_defineline=function.swf-defineline.html
+swf_definepoly=function.swf-definepoly.html
+swf_definerect=function.swf-definerect.html
+swf_definetext=function.swf-definetext.html
+swf_endbutton=function.swf-endbutton.html
+swf_enddoaction=function.swf-enddoaction.html
+swf_endshape=function.swf-endshape.html
+swf_endsymbol=function.swf-endsymbol.html
+swf_fontsize=function.swf-fontsize.html
+swf_fontslant=function.swf-fontslant.html
+swf_fonttracking=function.swf-fonttracking.html
+swf_getbitmapinfo=function.swf-getbitmapinfo.html
+swf_getfontinfo=function.swf-getfontinfo.html
+swf_getframe=function.swf-getframe.html
+swf_labelframe=function.swf-labelframe.html
+swf_lookat=function.swf-lookat.html
+swf_modifyobject=function.swf-modifyobject.html
+swf_mulcolor=function.swf-mulcolor.html
+swf_nextid=function.swf-nextid.html
+swf_oncondition=function.swf-oncondition.html
+swf_openfile=function.swf-openfile.html
+swf_ortho=function.swf-ortho.html
+swf_ortho2=function.swf-ortho2.html
+swf_perspective=function.swf-perspective.html
+swf_placeobject=function.swf-placeobject.html
+swf_polarview=function.swf-polarview.html
+swf_popmatrix=function.swf-popmatrix.html
+swf_posround=function.swf-posround.html
+swf_pushmatrix=function.swf-pushmatrix.html
+swf_removeobject=function.swf-removeobject.html
+swf_rotate=function.swf-rotate.html
+swf_scale=function.swf-scale.html
+swf_setfont=function.swf-setfont.html
+swf_setframe=function.swf-setframe.html
+swf_shapearc=function.swf-shapearc.html
+swf_shapecurveto=function.swf-shapecurveto.html
+swf_shapecurveto3=function.swf-shapecurveto3.html
+swf_shapefillbitmapclip=function.swf-shapefillbitmapclip.html
+swf_shapefillbitmaptile=function.swf-shapefillbitmaptile.html
+swf_shapefilloff=function.swf-shapefilloff.html
+swf_shapefillsolid=function.swf-shapefillsolid.html
+swf_shapelinesolid=function.swf-shapelinesolid.html
+swf_shapelineto=function.swf-shapelineto.html
+swf_shapemoveto=function.swf-shapemoveto.html
+swf_showframe=function.swf-showframe.html
+swf_startbutton=function.swf-startbutton.html
+swf_startdoaction=function.swf-startdoaction.html
+swf_startshape=function.swf-startshape.html
+swf_startsymbol=function.swf-startsymbol.html
+swf_textwidth=function.swf-textwidth.html
+swf_translate=function.swf-translate.html
+swf_viewport=function.swf-viewport.html
+swfaction=function.swfaction.html
+swfbitmap.getheight=function.swfbitmap.getheight.html
+swfbitmap.getwidth=function.swfbitmap.getwidth.html
+swfbitmap=function.swfbitmap.html
+swfbutton_keypress=function.swfbutton-keypress.html
+swfbutton.addaction=function.swfbutton.addaction.html
+swfbutton.addshape=function.swfbutton.addshape.html
+swfbutton=function.swfbutton.html
+swfbutton.setaction=function.swfbutton.setaction.html
+swfbutton.setdown=function.swfbutton.setdown.html
+swfbutton.sethit=function.swfbutton.sethit.html
+swfbutton.setover=function.swfbutton.setover.html
+swfbutton.setup=function.swfbutton.setup.html
+swfdisplayitem.addcolor=function.swfdisplayitem.addcolor.html
+swfdisplayitem=function.swfdisplayitem.html
+swfdisplayitem.move=function.swfdisplayitem.move.html
+swfdisplayitem.moveto=function.swfdisplayitem.moveto.html
+swfdisplayitem.multcolor=function.swfdisplayitem.multcolor.html
+swfdisplayitem.remove=function.swfdisplayitem.remove.html
+swfdisplayitem.rotate=function.swfdisplayitem.rotate.html
+swfdisplayitem.rotateto=function.swfdisplayitem.rotateto.html
+swfdisplayitem.scale=function.swfdisplayitem.scale.html
+swfdisplayitem.scaleto=function.swfdisplayitem.scaleto.html
+swfdisplayitem.setdepth=function.swfdisplayitem.setdepth.html
+swfdisplayitem.setname=function.swfdisplayitem.setname.html
+swfdisplayitem.setratio=function.swfdisplayitem.setratio.html
+swfdisplayitem.skewx=function.swfdisplayitem.skewx.html
+swfdisplayitem.skewxto=function.swfdisplayitem.skewxto.html
+swfdisplayitem.skewy=function.swfdisplayitem.skewy.html
+swfdisplayitem.skewyto=function.swfdisplayitem.skewyto.html
+swffill=function.swffill.html
+swffill.moveto=function.swffill.moveto.html
+swffill.rotateto=function.swffill.rotateto.html
+swffill.scaleto=function.swffill.scaleto.html
+swffill.skewxto=function.swffill.skewxto.html
+swffill.skewyto=function.swffill.skewyto.html
+swffont.getwidth=function.swffont.getwidth.html
+swffont=function.swffont.html
+swfgradient.addentry=function.swfgradient.addentry.html
+swfgradient=function.swfgradient.html
+swfmorph.getshape1=function.swfmorph.getshape1.html
+swfmorph.getshape2=function.swfmorph.getshape2.html
+swfmorph=function.swfmorph.html
+swfmovie.add=function.swfmovie.add.html
+swfmovie=function.swfmovie.html
+swfmovie.nextframe=function.swfmovie.nextframe.html
+swfmovie.output=function.swfmovie.output.html
+swfmovie.remove=function.swfmovie.remove.html
+swfmovie.save=function.swfmovie.save.html
+swfmovie.setbackground=function.swfmovie.setbackground.html
+swfmovie.setdimension=function.swfmovie.setdimension.html
+swfmovie.setframes=function.swfmovie.setframes.html
+swfmovie.setrate=function.swfmovie.setrate.html
+swfmovie.streammp3=function.swfmovie.streammp3.html
+swfshape.addfill=function.swfshape.addfill.html
+swfshape.drawcurve=function.swfshape.drawcurve.html
+swfshape.drawcurveto=function.swfshape.drawcurveto.html
+swfshape.drawline=function.swfshape.drawline.html
+swfshape.drawlineto=function.swfshape.drawlineto.html
+swfshape=function.swfshape.html
+swfshape.movepen=function.swfshape.movepen.html
+swfshape.movepento=function.swfshape.movepento.html
+swfshape.setleftfill=function.swfshape.setleftfill.html
+swfshape.setline=function.swfshape.setline.html
+swfshape.setrightfill=function.swfshape.setrightfill.html
+swfsprite.add=function.swfsprite.add.html
+swfsprite=function.swfsprite.html
+swfsprite.nextframe=function.swfsprite.nextframe.html
+swfsprite.remove=function.swfsprite.remove.html
+swfsprite.setframes=function.swfsprite.setframes.html
+swftext.addstring=function.swftext.addstring.html
+swftext.getwidth=function.swftext.getwidth.html
+swftext=function.swftext.html
+swftext.moveto=function.swftext.moveto.html
+swftext.setcolor=function.swftext.setcolor.html
+swftext.setfont=function.swftext.setfont.html
+swftext.setheight=function.swftext.setheight.html
+swftext.setspacing=function.swftext.setspacing.html
+swftextfield.addstring=function.swftextfield.addstring.html
+swftextfield.align=function.swftextfield.align.html
+swftextfield=function.swftextfield.html
+swftextfield.setbounds=function.swftextfield.setbounds.html
+swftextfield.setcolor=function.swftextfield.setcolor.html
+swftextfield.setfont=function.swftextfield.setfont.html
+swftextfield.setheight=function.swftextfield.setheight.html
+swftextfield.setindentation=function.swftextfield.setindentation.html
+swftextfield.setleftmargin=function.swftextfield.setleftmargin.html
+swftextfield.setlinespacing=function.swftextfield.setlinespacing.html
+swftextfield.setmargins=function.swftextfield.setmargins.html
+swftextfield.setname=function.swftextfield.setname.html
+swftextfield.setrightmargin=function.swftextfield.setrightmargin.html
+sybase_affected_rows=function.sybase-affected-rows.html
+sybase_close=function.sybase-close.html
+sybase_connect=function.sybase-connect.html
+sybase_data_seek=function.sybase-data-seek.html
+sybase_fetch_array=function.sybase-fetch-array.html
+sybase_fetch_field=function.sybase-fetch-field.html
+sybase_fetch_object=function.sybase-fetch-object.html
+sybase_fetch_row=function.sybase-fetch-row.html
+sybase_field_seek=function.sybase-field-seek.html
+sybase_free_result=function.sybase-free-result.html
+sybase_get_last_message=function.sybase-get-last-message.html
+sybase_min_client_severity=function.sybase-min-client-severity.html
+sybase_min_error_severity=function.sybase-min-error-severity.html
+sybase_min_message_severity=function.sybase-min-message-severity.html
+sybase_min_server_severity=function.sybase-min-server-severity.html
+sybase_num_fields=function.sybase-num-fields.html
+sybase_num_rows=function.sybase-num-rows.html
+sybase_pconnect=function.sybase-pconnect.html
+sybase_query=function.sybase-query.html
+sybase_result=function.sybase-result.html
+sybase_select_db=function.sybase-select-db.html
+symlink=function.symlink.html
+syslog=function.syslog.html
+system=function.system.html
+tan=function.tan.html
+tanh=function.tanh.html
+tempnam=function.tempnam.html
+textdomain=function.textdomain.html
+time=function.time.html
+tmpfile=function.tmpfile.html
+token_get_all=function.token-get-all.html
+token_name=function.token-name.html
+touch=function.touch.html
+trigger_error=function.trigger-error.html
+trim=function.trim.html
+uasort=function.uasort.html
+ucfirst=function.ucfirst.html
+ucwords=function.ucwords.html
+udm_add_search_limit=function.udm-add-search-limit.html
+udm_alloc_agent=function.udm-alloc-agent.html
+udm_api_version=function.udm-api-version.html
+udm_cat_list=function.udm-cat-list.html
+udm_cat_path=function.udm-cat-path.html
+udm_check_charset=function.udm-check-charset.html
+udm_check_stored=function.udm-check-stored.html
+udm_clear_search_limits=function.udm-clear-search-limits.html
+udm_close_stored=function.udm-close-stored.html
+udm_crc32=function.udm-crc32.html
+udm_errno=function.udm-errno.html
+udm_error=function.udm-error.html
+udm_find=function.udm-find.html
+udm_free_agent=function.udm-free-agent.html
+udm_free_ispell_data=function.udm-free-ispell-data.html
+udm_free_res=function.udm-free-res.html
+udm_get_doc_count=function.udm-get-doc-count.html
+udm_get_res_field=function.udm-get-res-field.html
+udm_get_res_param=function.udm-get-res-param.html
+udm_load_ispell_data=function.udm-load-ispell-data.html
+udm_open_stored=function.udm-open-stored.html
+udm_set_agent_param=function.udm-set-agent-param.html
+uksort=function.uksort.html
+umask=function.umask.html
+uniqid=function.uniqid.html
+unixtojd=function.unixtojd.html
+unlink=function.unlink.html
+unpack=function.unpack.html
+unregister_tick_function=function.unregister-tick-function.html
+unserialize=function.unserialize.html
+unset=function.unset.html
+urldecode=function.urldecode.html
+urlencode=function.urlencode.html
+user_error=function.user-error.html
+usleep=function.usleep.html
+usort=function.usort.html
+utf8_decode=function.utf8-decode.html
+utf8_encode=function.utf8-encode.html
+var_dump=function.var-dump.html
+var_export=function.var-export.html
+version_compare=function.version-compare.html
+virtual=function.virtual.html
+vpopmail_add_alias_domain_ex=function.vpopmail-add-alias-domain-ex.html
+vpopmail_add_alias_domain=function.vpopmail-add-alias-domain.html
+vpopmail_add_domain_ex=function.vpopmail-add-domain-ex.html
+vpopmail_add_domain=function.vpopmail-add-domain.html
+vpopmail_add_user=function.vpopmail-add-user.html
+vpopmail_alias_add=function.vpopmail-alias-add.html
+vpopmail_alias_del_domain=function.vpopmail-alias-del-domain.html
+vpopmail_alias_del=function.vpopmail-alias-del.html
+vpopmail_alias_get_all=function.vpopmail-alias-get-all.html
+vpopmail_alias_get=function.vpopmail-alias-get.html
+vpopmail_auth_user=function.vpopmail-auth-user.html
+vpopmail_del_domain_ex=function.vpopmail-del-domain-ex.html
+vpopmail_del_domain=function.vpopmail-del-domain.html
+vpopmail_del_user=function.vpopmail-del-user.html
+vpopmail_error=function.vpopmail-error.html
+vpopmail_passwd=function.vpopmail-passwd.html
+vpopmail_set_user_quota=function.vpopmail-set-user-quota.html
+vprintf=function.vprintf.html
+vsprintf=function.vsprintf.html
+w32api_deftype=function.w32api-deftype.html
+w32api_init_dtype=function.w32api-init-dtype.html
+w32api_invoke_function=function.w32api-invoke-function.html
+w32api_register_function=function.w32api-register-function.html
+w32api_set_call_method=function.w32api-set-call-method.html
+wddx_add_vars=function.wddx-add-vars.html
+wddx_deserialize=function.wddx-deserialize.html
+wddx_packet_end=function.wddx-packet-end.html
+wddx_packet_start=function.wddx-packet-start.html
+wddx_serialize_value=function.wddx-serialize-value.html
+wddx_serialize_vars=function.wddx-serialize-vars.html
+wordwrap=function.wordwrap.html
+xml_error_string=function.xml-error-string.html
+xml_get_current_byte_index=function.xml-get-current-byte-index.html
+xml_get_current_column_number=function.xml-get-current-column-number.html
+xml_get_current_line_number=function.xml-get-current-line-number.html
+xml_get_error_code=function.xml-get-error-code.html
+xml_parse_into_struct=function.xml-parse-into-struct.html
+xml_parse=function.xml-parse.html
+xml_parser_create_ns=function.xml-parser-create-ns.html
+xml_parser_create=function.xml-parser-create.html
+xml_parser_free=function.xml-parser-free.html
+xml_parser_get_option=function.xml-parser-get-option.html
+xml_parser_set_option=function.xml-parser-set-option.html
+xml_set_character_data_handler=function.xml-set-character-data-handler.html
+xml_set_default_handler=function.xml-set-default-handler.html
+xml_set_element_handler=function.xml-set-element-handler.html
+xml_set_end_namespace_decl_handler=function.xml-set-end-namespace-decl-handler.html
+xml_set_external_entity_ref_handler=function.xml-set-external-entity-ref-handler.html
+xml_set_notation_decl_handler=function.xml-set-notation-decl-handler.html
+xml_set_object=function.xml-set-object.html
+xml_set_processing_instruction_handler=function.xml-set-processing-instruction-handler.html
+xml_set_start_namespace_decl_handler=function.xml-set-start-namespace-decl-handler.html
+xml_set_unparsed_entity_decl_handler=function.xml-set-unparsed-entity-decl-handler.html
+xmlrpc_decode_request=function.xmlrpc-decode-request.html
+xmlrpc_decode=function.xmlrpc-decode.html
+xmlrpc_encode_request=function.xmlrpc-encode-request.html
+xmlrpc_encode=function.xmlrpc-encode.html
+xmlrpc_get_type=function.xmlrpc-get-type.html
+xmlrpc_parse_method_descriptions=function.xmlrpc-parse-method-descriptions.html
+xmlrpc_server_add_introspection_data=function.xmlrpc-server-add-introspection-data.html
+xmlrpc_server_call_method=function.xmlrpc-server-call-method.html
+xmlrpc_server_create=function.xmlrpc-server-create.html
+xmlrpc_server_destroy=function.xmlrpc-server-destroy.html
+xmlrpc_server_register_introspection_callback=function.xmlrpc-server-register-introspection-callback.html
+xmlrpc_server_register_method=function.xmlrpc-server-register-method.html
+xmlrpc_set_type=function.xmlrpc-set-type.html
+xpath_eval_expression=function.xpath-eval-expression.html
+xpath_eval=function.xpath-eval.html
+xpath_new_context=function.xpath-new-context.html
+xptr_eval=function.xptr-eval.html
+xptr_new_context=function.xptr-new-context.html
+xslt_create=function.xslt-create.html
+xslt_errno=function.xslt-errno.html
+xslt_error=function.xslt-error.html
+xslt_free=function.xslt-free.html
+xslt_process=function.xslt-process.html
+xslt_set_base=function.xslt-set-base.html
+xslt_set_encoding=function.xslt-set-encoding.html
+xslt_set_error_handler=function.xslt-set-error-handler.html
+xslt_set_log=function.xslt-set-log.html
+xslt_set_sax_handler=function.xslt-set-sax-handler.html
+xslt_set_sax_handlers=function.xslt-set-sax-handlers.html
+xslt_set_scheme_handler=function.xslt-set-scheme-handler.html
+xslt_set_scheme_handlers=function.xslt-set-scheme-handlers.html
+yaz_addinfo=function.yaz-addinfo.html
+yaz_ccl_conf=function.yaz-ccl-conf.html
+yaz_ccl_parse=function.yaz-ccl-parse.html
+yaz_close=function.yaz-close.html
+yaz_connect=function.yaz-connect.html
+yaz_database=function.yaz-database.html
+yaz_element=function.yaz-element.html
+yaz_errno=function.yaz-errno.html
+yaz_error=function.yaz-error.html
+yaz_get_option=function.yaz-get-option.html
+yaz_hits=function.yaz-hits.html
+yaz_itemorder=function.yaz-itemorder.html
+yaz_present=function.yaz-present.html
+yaz_range=function.yaz-range.html
+yaz_record=function.yaz-record.html
+yaz_scan_result=function.yaz-scan-result.html
+yaz_scan=function.yaz-scan.html
+yaz_schema=function.yaz-schema.html
+yaz_search=function.yaz-search.html
+yaz_set_option=function.yaz-set-option.html
+yaz_sort=function.yaz-sort.html
+yaz_syntax=function.yaz-syntax.html
+yaz_wait=function.yaz-wait.html
+yp_all=function.yp-all.html
+yp_cat=function.yp-cat.html
+yp_err_string=function.yp-err-string.html
+yp_errno=function.yp-errno.html
+yp_first=function.yp-first.html
+yp_get_default_domain=function.yp-get-default-domain.html
+yp_master=function.yp-master.html
+yp_match=function.yp-match.html
+yp_next=function.yp-next.html
+yp_order=function.yp-order.html
+zend_logo_guid=function.zend-logo-guid.html
+zend_version=function.zend-version.html
+zip_close=function.zip-close.html
+zip_entry_close=function.zip-entry-close.html
+zip_entry_compressedsize=function.zip-entry-compressedsize.html
+zip_entry_compressionmethod=function.zip-entry-compressionmethod.html
+zip_entry_filesize=function.zip-entry-filesize.html
+zip_entry_name=function.zip-entry-name.html
+zip_entry_open=function.zip-entry-open.html
+zip_entry_read=function.zip-entry-read.html
+zip_open=function.zip-open.html
+zip_read=function.zip-read.html
+functions.arguments.html=functions.arguments.html
+functions.html=functions.html
+functions.old_syntax.html=functions.old-syntax.html
+functions.returning_values.html=functions.returning-values.html
+functions.variable_functions.html=functions.variable-functions.html
+language.oop.magic_functions.html=language.oop.magic-functions.html
+zend.calling_user_functions.html=zend.calling-user-functions.html
+zend.structure.exporting_functions.html=zend.structure.exporting-functions.html
+zend.structure.function_block.html=zend.structure.function-block.html

Added: people/jriddell/KDE/3.5/kdewebdev/debian/icons/kimagemapeditor.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/icons/kimagemapeditor.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/icons/kimagemapeditor.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * kimagemapeditor_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #000100",
+"+ 	c #102835",
+"@ 	c #092F3E",
+"# 	c #1A313F",
+"$ 	c #1E303A",
+"% 	c #143441",
+"& 	c #233136",
+"* 	c #183547",
+"= 	c #12394B",
+"- 	c #163A51",
+"; 	c #1B3A47",
+"> 	c #183B53",
+", 	c #173D4F",
+"' 	c #273842",
+") 	c #104056",
+"! 	c #1E3D4A",
+"~ 	c #2D3B40",
+"{ 	c #1B4153",
+"] 	c #124460",
+"^ 	c #263E57",
+"/ 	c #1B4455",
+"( 	c #17455C",
+"_ 	c #134B66",
+": 	c #1D4960",
+"< 	c #0C5070",
+"[ 	c #184B6D",
+"} 	c #3B433F",
+"| 	c #1D4D5E",
+"1 	c #344645",
+"2 	c #33454F",
+"3 	c #194E6A",
+"4 	c #274961",
+"5 	c #2A4C54",
+"6 	c #274C5E",
+"7 	c #234C69",
+"8 	c #2D4C59",
+"9 	c #28505C",
+"0 	c #1F536F",
+"a 	c #265168",
+"b 	c #3E4D52",
+"c 	c #374C6C",
+"d 	c #395346",
+"e 	c #474B4E",
+"f 	c #1C597A",
+"g 	c #295768",
+"h 	c #305467",
+"i 	c #315851",
+"j 	c #265875",
+"k 	c #355173",
+"l 	c #435157",
+"m 	c #315865",
+"n 	c #315960",
+"o 	c #375663",
+"p 	c #2E5D5D",
+"q 	c #2C5D68",
+"r 	c #475651",
+"s 	c #3C5A5D",
+"t 	c #276278",
+"u 	c #3A5A73",
+"v 	c #4B5E30",
+"w 	c #415B64",
+"x 	c #39606D",
+"y 	c #3A5D82",
+"z 	c #3F625B",
+"A 	c #495B66",
+"B 	c #306778",
+"C 	c #49615C",
+"D 	c #416273",
+"E 	c #585D5A",
+"F 	c #555D64",
+"G 	c #4B6557",
+"H 	c #5F5D50",
+"I 	c #3B6B76",
+"J 	c #476B64",
+"K 	c #516B55",
+"L 	c #54676C",
+"M 	c #4D6696",
+"N 	c #5B6960",
+"O 	c #4F6D7C",
+"P 	c #51754C",
+"Q 	c #4D7083",
+"R 	c #567745",
+"S 	c #56706D",
+"T 	c #627050",
+"U 	c #676F48",
+"V 	c #577169",
+"W 	c #5B735A",
+"X 	c #596E7B",
+"Y 	c #627546",
+"Z 	c #607B37",
+"` 	c #5F7176",
+" .	c #6C6F61",
+"..	c #687261",
+"+.	c #5470A3",
+"@.	c #5E7E40",
+"#.	c #627574",
+"$.	c #647B53",
+"%.	c #5274AD",
+"&.	c #6B7A51",
+"*.	c #72784B",
+"=.	c #5B8450",
+"-.	c #6F7376",
+";.	c #5B73AE",
+">.	c #658539",
+",.	c #667785",
+"'.	c #6C7C5F",
+").	c #688251",
+"!.	c #6B8056",
+"~.	c #767B60",
+"{.	c #598870",
+"].	c #5D8A5D",
+"^.	c #798254",
+"/.	c #768162",
+"(.	c #6480A1",
+"_.	c #837E59",
+":.	c #7A8550",
+"<.	c #6A8097",
+"[.	c #838257",
+"}.	c #6F9043",
+"|.	c #7D7F7C",
+"1.	c #72913E",
+"2.	c #7E8178",
+"3.	c #6D8885",
+"4.	c #758D55",
+"5.	c #6E81B4",
+"6.	c #878272",
+"7.	c #818A5C",
+"8.	c #8D8365",
+"9.	c #938068",
+"0.	c #7E9147",
+"a.	c #6E82C5",
+"b.	c #878861",
+"c.	c #8F8567",
+"d.	c #8B837D",
+"e.	c #83914E",
+"f.	c #7D9938",
+"g.	c #809B32",
+"h.	c #8D8D61",
+"i.	c #769D4B",
+"j.	c #849457",
+"k.	c #998765",
+"l.	c #9C896E",
+"m.	c #819096",
+"n.	c #8A9E37",
+"o.	c #859192",
+"p.	c #7F929E",
+"q.	c #829A6B",
+"r.	c #8D9D46",
+"s.	c #998D7F",
+"t.	c #9A9072",
+"u.	c #979563",
+"v.	c #8990A5",
+"w.	c #93928A",
+"x.	c #88A93F",
+"y.	c #8091DC",
+"z.	c #8699AB",
+"A.	c #888FDC",
+"B.	c #959794",
+"C.	c #889BA6",
+"D.	c #9293B9",
+"E.	c #9AAF26",
+"F.	c #8D94E2",
+"G.	c #9CAD37",
+"H.	c #A2AC2F",
+"I.	c #9597CF",
+"J.	c #9FB320",
+"K.	c #96A1AF",
+"L.	c #9CB43C",
+"M.	c #AEA661",
+"N.	c #949AE9",
+"O.	c #9599EF",
+"P.	c #8CA8BE",
+"Q.	c #9C9AEB",
+"R.	c #9FA6AB",
+"S.	c #ACBB1F",
+"T.	c #9C9EE7",
+"U.	c #9A9DF3",
+"V.	c #9CA1E3",
+"W.	c #AEC016",
+"X.	c #A19FF0",
+"Y.	c #9CA2F1",
+"Z.	c #A9ABA8",
+"`.	c #C2A680",
+" +	c #AEC131",
+".+	c #B1B377",
+"++	c #ABBE56",
+"@+	c #BEB360",
+"#+	c #BBB94F",
+"$+	c #ADAFAC",
+"%+	c #9BB2D1",
+"&+	c #A6A7F1",
+"*+	c #ABABCE",
+"=+	c #ABB0B8",
+"-+	c #ADABDF",
+";+	c #BBCB18",
+">+	c #AFB4B6",
+",+	c #C4BF47",
+"'+	c #B6CD28",
+")+	c #A6B3F4",
+"!+	c #C7CF0F",
+"~+	c #B7B9B6",
+"{+	c #CFB493",
+"]+	c #B4B3E4",
+"^+	c #CCC545",
+"/+	c #ADBFCF",
+"(+	c #BCBEBB",
+"_+	c #ADBFE2",
+":+	c #B3BAF0",
+"<+	c #D3D41E",
+"[+	c #D6BDA1",
+"}+	c #AFC7D9",
+"|+	c #D0DC13",
+"1+	c #D6C38C",
+"2+	c #D3C87B",
+"3+	c #C2C2CC",
+"4+	c #DDCB5D",
+"5+	c #D9D630",
+"6+	c #DEC67C",
+"7+	c #D7E101",
+"8+	c #DBCF58",
+"9+	c #C5C7C4",
+"0+	c #D5D267",
+"a+	c #DBDA3E",
+"b+	c #B8CBF2",
+"c+	c #E3CE76",
+"d+	c #BFCFE2",
+"e+	c #CCCCD6",
+"f+	c #C0D0F0",
+"g+	c #E1EC00",
+"h+	c #E7E519",
+"i+	c #E0E628",
+"j+	c #E2CBB5",
+"k+	c #E3E81B",
+"l+	c #CFD0DA",
+"m+	c #E8EB07",
+"n+	c #EBDF47",
+"o+	c #EAE336",
+"p+	c #D1D3D0",
+"q+	c #ECD96B",
+"r+	c #F2E924",
+"s+	c #F0F200",
+"t+	c #C9DAF4",
+"u+	c #F1E263",
+"v+	c #F3EB34",
+"w+	c #CEDDF1",
+"x+	c #DBDAE1",
+"y+	c #FAF50D",
+"z+	c #F8F900",
+"A+	c #E1E3E0",
+"B+	c #FFFF01",
+"C+	c #E3E3EE",
+"D+	c #E8E5EA",
+"E+	c #E8EAE7",
+"F+	c #F1F3F0",
+"G+	c #FDFFFC",
+"                                                                ",
+"                    X.U.]+]+]+]+]+Y.Q.U.                        ",
+"                Q.V.p+x+p+l+l+3+z.<.O 5.F.A.                    ",
+"            X.I.<.` o.R.C+C+E+x+K.g / { 4 M O.                  ",
+"          N.D.6.|.2.o.x =+C+/+C.O h { > 6 9 ,.Q.                ",
+"        N.D.N n N  .L 8 O p.h ( : g : | x V C X Q.              ",
+"      Q.v.&.&.G /.h./.C ) , / { ) / n z C K W ~.2.Q.            ",
+"      D.b.7.).$.j.j.W S | { ) { > ) g G $.*.[.u.W #.N.          ",
+"    X..+5+i+i+y+g+S.|+m+S.Z m+g+;+s+f.B+s+s+0.H.g.e.V.          ",
+"    =+5+a+++|+;+i.7+1. at .z+m+L.P J.z+g.i+2+n+<+).r.5+0+V.        ",
+"  T.!+i+#+q.'+L.g U r i B+B+R 7 >.s+,+v+j+c+s+1+ at +5+r+*+        ",
+"  O.p =.|+ +'+x.n (+R.d m+;+7+W.|+B+q+y+o+y+n+q+n+M.{+-+        ",
+"  ;.< f t ].i.].o 9+>+5 0.9 1.f.P n.8+v+c+8+[+6+`.s.w.o.U.      ",
+"  +.f f f f t I A 9+~+s j < 0 7 3 t H.<+6.c.9.l.9.k.s.O U.      ",
+"  +.3 < < f 0 j ..3+~+$.{.I j f _ < g p f K *.:.h.l.` a U.      ",
+"  ;.< j 7 : 0 | ..9+>+v Z q.3.3 [ < < [ 7 p *.[.7.'.0 < U.      ",
+"  ;.< 0 3 3 7 > e 9+~+|.E H } > ] [ 0 ] ] n _._.b.$.x m U.      ",
+"  F.0 a : : = L -.3+>+3+B.(+e -.* a : ( ) o l.9.8.S V 5.U.      ",
+"  F._ 3 : _ b A+Z.9+G+G+9+E+|.3+@ : : ] ] : s.9.N a p y.        ",
+"  U.%.6 : ( e A+Z.9+G+G+G+G+A+9+# ( ) { , ) A r 9 ] y Q.        ",
+"    F.7 ) ) l D+D+F+G+G+G+G+G+9++ ] ) , * - > ) , > a.          ",
+"    A.M * ) 2 A+G+G+G+G+G+G+G+3++ * * ) = = = * = , N.          ",
+"      U.k * ' R.G+G+G+G+G+G+G+>++ ) * , = ; = = > F.            ",
+"        O.c # & 3+G+G+G+G+G+p+l % # ; % % # # # A.Q.            ",
+"          O.k ! 2 F F ~ & & & % ; ; 8 8 h o u A.                ",
+"            Q.(.P.d+d+Q g 6 6 6 O z./+}+}+}+T.Q.                ",
+"              X.Y.:+b+_+%+%+%+_+f+f+w+f+)+X.                    ",
+"                  O.&+&+t+t+t+w+t+:+X.U.                        ",
+"                        U.U.U.U.U.X.                            ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdewebdev/debian/icons/klinkstatus.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/icons/klinkstatus.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/icons/klinkstatus.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * klinkstatus_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #010B26",
+"+ 	c #071846",
+"@ 	c #061F5F",
+"# 	c #002267",
+"$ 	c #092155",
+"% 	c #13204A",
+"& 	c #002375",
+"* 	c #042673",
+"= 	c #012F6E",
+"- 	c #002D7F",
+"; 	c #112D67",
+"> 	c #022F89",
+", 	c #132F63",
+"' 	c #0C3373",
+") 	c #003782",
+"! 	c #0D3669",
+"~ 	c #0C3192",
+"{ 	c #0035B2",
+"] 	c #12339B",
+"^ 	c #173979",
+"/ 	c #1633A4",
+"( 	c #004294",
+"_ 	c #123D98",
+": 	c #0242A9",
+"< 	c #0343A3",
+"[ 	c #0041B6",
+"} 	c #113CA4",
+"| 	c #0041C4",
+"1 	c #1F4271",
+"2 	c #0046B3",
+"3 	c #0141CD",
+"4 	c #184094",
+"5 	c #004B9C",
+"6 	c #0D4793",
+"7 	c #233C92",
+"8 	c #19438A",
+"9 	c #0049AF",
+"0 	c #0B44B2",
+"a 	c #004AB0",
+"b 	c #004DA6",
+"c 	c #1D4686",
+"d 	c #1E4398",
+"e 	c #1347A1",
+"f 	c #1145C2",
+"g 	c #0050BD",
+"h 	c #084EB5",
+"i 	c #23469B",
+"j 	c #0A4FAF",
+"k 	c #0053BF",
+"l 	c #0052C6",
+"m 	c #0F568E",
+"n 	c #2C4A80",
+"o 	c #0056C3",
+"p 	c #0055C9",
+"q 	c #0F4FC4",
+"r 	c #0258BE",
+"s 	c #1250BF",
+"t 	c #0056D2",
+"u 	c #234FA4",
+"v 	c #1652B9",
+"w 	c #22548F",
+"x 	c #005BC7",
+"y 	c #144FD4",
+"z 	c #1853B4",
+"A 	c #0658CD",
+"B 	c #005BCE",
+"C 	c #1A54AE",
+"D 	c #1953BA",
+"E 	c #005BD5",
+"F 	c #0D5ABA",
+"G 	c #0060C5",
+"H 	c #105AC2",
+"I 	c #005FD3",
+"J 	c #2853A8",
+"K 	c #0061CE",
+"L 	c #105AC8",
+"M 	c #0060DC",
+"N 	c #295B8F",
+"O 	c #2358B3",
+"P 	c #2D56AB",
+"Q 	c #0563D7",
+"R 	c #185CD2",
+"S 	c #1A5EC5",
+"T 	c #1B5DCC",
+"U 	c #1D61B5",
+"V 	c #006AD7",
+"W 	c #0E65CC",
+"X 	c #295DB2",
+"Y 	c #1267C7",
+"Z 	c #006ED4",
+"` 	c #2262C3",
+" .	c #336298",
+"..	c #2F5FBB",
+"+.	c #176AC3",
+"@.	c #2564BF",
+"#.	c #1766E2",
+"$.	c #2F64AC",
+"%.	c #0073E6",
+"&.	c #1C6DC0",
+"*.	c #1D6AD2",
+"=.	c #0079D8",
+"-.	c #356C8F",
+";.	c #216CCD",
+">.	c #1274CD",
+",.	c #2D69C4",
+"'.	c #226EC8",
+").	c #007CFD",
+"!.	c #2A70D2",
+"~.	c #1D76D7",
+"{.	c #1F75E3",
+"].	c #0081FB",
+"^.	c #2D73CE",
+"/.	c #2079D2",
+"(.	c #0084F1",
+"_.	c #2377DF",
+":.	c #257CD0",
+"<.	c #2677ED",
+"[.	c #3477D3",
+"}.	c #3479CE",
+"|.	c #1F84DE",
+"1.	c #008EFF",
+"2.	c #4077CD",
+"3.	c #3C7EB3",
+"4.	c #2D7FD9",
+"5.	c #3F7AC3",
+"6.	c #4678BB",
+"7.	c #0091F7",
+"8.	c #2F7DE6",
+"9.	c #2384E5",
+"0.	c #3B7FCE",
+"a.	c #1689FE",
+"b.	c #0097FF",
+"c.	c #3483DE",
+"d.	c #1A8EED",
+"e.	c #3587D4",
+"f.	c #2B8AE4",
+"g.	c #2D89EA",
+"h.	c #3988DC",
+"i.	c #4986C2",
+"j.	c #4388D0",
+"k.	c #2690F8",
+"l.	c #1899FF",
+"m.	c #368FEA",
+"n.	c #528ABA",
+"o.	c #08A4FF",
+"p.	c #1E9AFF",
+"q.	c #498CD5",
+"r.	c #4091D8",
+"s.	c #448DE9",
+"t.	c #3B91F3",
+"u.	c #458FE5",
+"v.	c #5A8BC9",
+"w.	c #548DD1",
+"x.	c #4F8EDE",
+"y.	c #4D90D9",
+"z.	c #259EFE",
+"A.	c #3D98E5",
+"B.	c #4B96CB",
+"C.	c #4995E3",
+"D.	c #4098EC",
+"E.	c #369DF1",
+"F.	c #4498F4",
+"G.	c #399DF8",
+"H.	c #5397DA",
+"I.	c #4798FB",
+"J.	c #3BA0F4",
+"K.	c #5697E1",
+"L.	c #3F9FFF",
+"M.	c #32A8FB",
+"N.	c #40A1FC",
+"O.	c #4A9EF3",
+"P.	c #35A7FF",
+"Q.	c #5B9BE5",
+"R.	c #4D9FFB",
+"S.	c #5C9EE1",
+"T.	c #4DA3F1",
+"U.	c #5BA0DD",
+"V.	c #56A2EB",
+"W.	c #3BADFF",
+"X.	c #51A3F9",
+"Y.	c #49A9FE",
+"Z.	c #67A1DF",
+"`.	c #66A3DA",
+" +	c #5DA7F0",
+".+	c #41B3FF",
+"++	c #4CAEFC",
+"@+	c #5DAAED",
+"#+	c #56ADF5",
+"$+	c #64A9E6",
+"%+	c #6EA7E6",
+"&+	c #51B2FF",
+"*+	c #6EABE2",
+"=+	c #5CAFFE",
+"-+	c #5CB1FA",
+";+	c #76ABDD",
+">+	c #55B7FF",
+",+	c #59BAFF",
+"'+	c #72AFFB",
+")+	c #83AFE3",
+"!+	c #63BBFD",
+"~+	c #6CB7FA",
+"{+	c #75B4F9",
+"]+	c #74B7F4",
+"^+	c #5EC1FF",
+"/+	c #68BEFF",
+"(+	c #7CB7F0",
+"_+	c #73BDFF",
+":+	c #72C0FC",
+"<+	c #7FBEEF",
+"[+	c #6CC5FF",
+"}+	c #76C3FF",
+"|+	c #86BDFD",
+"1+	c #8EBDEB",
+"2+	c #83C2F4",
+"3+	c #7FC4FC",
+"4+	c #86C1FA",
+"5+	c #78C8FE",
+"6+	c #71CEFF",
+"7+	c #8BC4F0",
+"8+	c #7BCBFF",
+"9+	c #83C8FF",
+"0+	c #98C2EA",
+"a+	c #85CAFF",
+"b+	c #96C5F2",
+"c+	c #7CD0FF",
+"d+	c #84CDFE",
+"e+	c #8CCBFD",
+"f+	c #96C9F0",
+"g+	c #88D1FF",
+"h+	c #90CEFF",
+"i+	c #87D4FD",
+"j+	c #97D0FC",
+"k+	c #91D3FE",
+"l+	c #8BD8FF",
+"m+	c #9BD3FF",
+"n+	c #94D7FF",
+"o+	c #AACFF2",
+"p+	c #A3D5FC",
+"q+	c #9DD9FE",
+"r+	c #A6D9FF",
+"s+	c #ADDBFD",
+"t+	c #A7DEFE",
+"u+	c #A1E1FF",
+"v+	c #B1DFFF",
+"w+	c #BCDCF9",
+"x+	c #B7E0FC",
+"y+	c #B2E4FE",
+"z+	c #ACE7FF",
+"A+	c #BBE4FF",
+"B+	c #B3E9FC",
+"C+	c #C3E8FE",
+"D+	c #BEEBFF",
+"E+	c #C8E8F8",
+"F+	c #D6EEFF",
+"G+	c #D5F2FD",
+"                  3 y /                                         ",
+"                | ++D+4+*     4 X.S                             ",
+"                [ {.q+C+{+_.g u.B+u+I.                          ",
+"        8.2.    I f.m+x+y+y+u+t+r+s+/+>                         ",
+"      #.y+D+|+O.h+v+v+q+9+{+ +-+!+9+k+/+r     {                 ",
+"      I T.v+t+A+q+s+}+[.j 4 _ _ e O f.,+8+t.X.>+t               ",
+"      p p O.r+r+q+}+Y 4 4 ( ( i ( d 7 S O.c+5+>+1.f             ",
+"    & B v 9.n+m+h+4.b J X P P J J J J u C f.}+Y.).@             ",
+"      2 g G.q+k+~+` F < ) ) 4 z .. at .X X P O |.p.a.-             ",
+"      ] E ~+h+h+N.e %           $ ( ;.+.'.+.,.(.b.].            ",
+"  E >+}+}+d+h+d+f..                 ; ;.[.^.2.~.t.p.%.}         ",
+"  B 5+g+h+h+8+k+A.                    % ~.c.c.}.g.b.p.p.a.#     ",
+"  I ~+d+d+h+9+h+!+                      , t.d.m.s.F.b.p.z.T     ",
+"  E 9.D.X.-+d+8+8+m                       &.R.F.t.o.z.p.7.%.    ",
+"  o o v k *.}+e+d+ at +                        z.N.L.z.o.z.V ~     ",
+"  q r x r k J.8+9+c+i.                      }.P.R.P.P.P.v       ",
+"  ~ : 0 k k *.}+9+8+c+3.                    N P.N.Y.W.M.C       ",
+"        - l '.:+d+9+h+c+B.                    Y.&+.+++W.P.W     ",
+"          T !+9+9+9+h+h+k+:+-.              N >+_+~+&+.+++.+{.  ",
+"          T.d+8+d+d+e+2+}+5+d+:+n.        =+_+}+!+>+>+-+.+.+g.  ",
+"        2 E.3+}+}+[+}+8+}+5+d+8+i+e+9+3+3+5+[+}+/+/+,+~.^.T.~.  ",
+"        k r T.}+[+ at +=.h.3+k+h+j+j+g+k+k+d+e+e+[+8+[+h.D k K (   ",
+"        A k r T.A.` k h Y @+k+m+r+p+p+r+k+g+h+9+9+}+W v B <     ",
+"        j x k r s p x G G Y 1+v+r+s+s+q+p+m+m+j+d+d+u.q a       ",
+"          g x B e $ b Y '.>.2+A+v+A+w+U.q.e.C.j+k+d+[+8         ",
+"            A =       ' Z :.b+C+C+A+v+y.e.0.:.%+r+k+k+0.        ",
+"                        ^ h.0+F+F+F+x+Q.K.w.e.e.1+d+T.8         ",
+"                          C.*+f+o+E+)+! c r.U.e.r.u.(           ",
+"                          Q.Z.`.;+)+n     $.%+S.C.$.            ",
+"                          '+(+1+b+6.        C.5.!               ",
+"                          1  .v.w.                              ",
+"                                                                "};

Added: people/jriddell/KDE/3.5/kdewebdev/debian/icons/quanta.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/icons/quanta.xpm	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/icons/quanta.xpm	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,291 @@
+/* XPM */
+static char * quanta_xpm[] = {
+"32 32 256 2",
+"  	c None",
+". 	c #000100",
+"+ 	c #151614",
+"@ 	c #11202F",
+"# 	c #182C3F",
+"$ 	c #163855",
+"% 	c #30322F",
+"& 	c #004B82",
+"* 	c #015480",
+"= 	c #434B52",
+"- 	c #395675",
+"; 	c #515350",
+"> 	c #2A5C90",
+", 	c #126C8C",
+"' 	c #1D66A6",
+") 	c #306096",
+"! 	c #28639E",
+"~ 	c #41617A",
+"{ 	c #2A679B",
+"] 	c #2369A9",
+"^ 	c #1A738C",
+"/ 	c #2667B5",
+"( 	c #227891",
+"_ 	c #28769C",
+": 	c #3A78A1",
+"< 	c #2F77C5",
+"[ 	c #5E6D7F",
+"} 	c #26878D",
+"| 	c #3778B3",
+"1 	c #2C8782",
+"2 	c #257ECA",
+"3 	c #277FCC",
+"4 	c #3381A1",
+"5 	c #3B7BB6",
+"6 	c #2980CD",
+"7 	c #2C8B91",
+"8 	c #3C7CB8",
+"9 	c #2B81CE",
+"0 	c #2D82CF",
+"a 	c #2E83D0",
+"b 	c #3882C3",
+"c 	c #3086CD",
+"d 	c #3B82C9",
+"e 	c #3488CF",
+"f 	c #3E84CB",
+"g 	c #3589D0",
+"h 	c #3F85CD",
+"i 	c #3D9583",
+"j 	c #3B948E",
+"k 	c #4B86AF",
+"l 	c #378AD1",
+"m 	c #359A87",
+"n 	c #388BD2",
+"o 	c #4287CF",
+"p 	c #4986C2",
+"q 	c #4B8E98",
+"r 	c #3A8CD3",
+"s 	c #5886A4",
+"t 	c #2F9F9D",
+"u 	c #3E95B5",
+"v 	c #408EDC",
+"w 	c #478DCF",
+"x 	c #37A295",
+"y 	c #5590A7",
+"z 	c #479A9B",
+"A 	c #498FD1",
+"B 	c #508FC5",
+"C 	c #4C91D3",
+"D 	c #42A491",
+"E 	c #4F93D6",
+"F 	c #5099BB",
+"G 	c #4E98CD",
+"H 	c #5195D7",
+"I 	c #5C93C4",
+"J 	c #48A98A",
+"K 	c #5198D4",
+"L 	c #5299D5",
+"M 	c #5794E5",
+"N 	c #5B96D3",
+"O 	c #549AD6",
+"P 	c #4FA0C7",
+"Q 	c #4CAD8D",
+"R 	c #559BD7",
+"S 	c #4FAB92",
+"T 	c #569CD8",
+"U 	c #54A7A8",
+"V 	c #6296E2",
+"W 	c #4FB090",
+"X 	c #599EDB",
+"Y 	c #6E97D0",
+"Z 	c #58AE9C",
+"` 	c #629FD6",
+" .	c #63A0D7",
+"..	c #5BB192",
+"+.	c #64A1D8",
+"@.	c #7C9BB7",
+"#.	c #65A2D9",
+"$.	c #779FB9",
+"%.	c #6BA1D2",
+"&.	c #66A3DA",
+"*.	c #5BB69D",
+"=.	c #62B39B",
+"-.	c #68A5DC",
+";.	c #71A0E0",
+">.	c #6EA4D6",
+",.	c #6AA6DE",
+"'.	c #70A5D7",
+").	c #6BA7DF",
+"!.	c #72A8DA",
+"~.	c #73A9DB",
+"{.	c #6EAFCC",
+"].	c #77A6E6",
+"^.	c #75AADC",
+"/.	c #73ACD8",
+"(.	c #6ABBA2",
+"_.	c #70B7AD",
+":.	c #76ABDD",
+"<.	c #77ACDF",
+"[.	c #78ADE0",
+"}.	c #75ADEC",
+"|.	c #79AEE1",
+"1.	c #76B5C6",
+"2.	c #6EBFA7",
+"3.	c #7AAFE2",
+"4.	c #70B9C8",
+"5.	c #72B5DF",
+"6.	c #81B0DD",
+"7.	c #71C2A9",
+"8.	c #82B1DE",
+"9.	c #72C3AB",
+"0.	c #83B2DF",
+"a.	c #84B3E0",
+"b.	c #8DB2D4",
+"c.	c #7BBEC7",
+"d.	c #86B5E2",
+"e.	c #87B9D2",
+"f.	c #89B4E9",
+"g.	c #78C9B0",
+"h.	c #88B7E5",
+"i.	c #85BAED",
+"j.	c #8AB9E6",
+"k.	c #88BBE1",
+"l.	c #98B8C8",
+"m.	c #88C7A4",
+"n.	c #90B9E1",
+"o.	c #86C9AC",
+"p.	c #95B9DB",
+"q.	c #86C8B8",
+"r.	c #91BBE2",
+"s.	c #ADB5BD",
+"t.	c #87C0EC",
+"u.	c #92BCE4",
+"v.	c #93BDE5",
+"w.	c #9FBBD2",
+"x.	c #96BBEB",
+"y.	c #94BEE6",
+"z.	c #9DBDDA",
+"A.	c #99BEE0",
+"B.	c #96BFE7",
+"C.	c #8BCEBE",
+"D.	c #89D1B9",
+"E.	c #97C1E9",
+"F.	c #93C2F0",
+"G.	c #90CFB9",
+"H.	c #9DC2E4",
+"I.	c #8FCAE2",
+"J.	c #91CFC6",
+"K.	c #9FC3E6",
+"L.	c #ABC2D4",
+"M.	c #A0C5E8",
+"N.	c #96D0CE",
+"O.	c #A1C6E9",
+"P.	c #97D1DC",
+"Q.	c #96DBB0",
+"R.	c #A4C9EC",
+"S.	c #A7CCD4",
+"T.	c #A0D9AA",
+"U.	c #A6CAED",
+"V.	c #9AD9C2",
+"W.	c #ABCBE8",
+"X.	c #B8C8DC",
+"Y.	c #ACCCEA",
+"Z.	c #ADCDEB",
+"`.	c #A2DDC1",
+" +	c #AECFEC",
+".+	c #A5DDBB",
+"++	c #B4CFE7",
+"@+	c #B0D0EE",
+"#+	c #C9CBC8",
+"$+	c #ABD3EF",
+"%+	c #A8E0BE",
+"&+	c #B2D2EF",
+"*+	c #B0D4EA",
+"=+	c #ABDEC3",
+"-+	c #B3D3F0",
+";+	c #ADD6F1",
+">+	c #B7D3EA",
+",+	c #A9E0CB",
+"'+	c #ACD9EE",
+")+	c #B9D5ED",
+"!+	c #B9DAEA",
+"~+	c #B6DBF1",
+"{+	c #B9DDE6",
+"]+	c #BDD9F1",
+"^+	c #BEDAF2",
+"/+	c #B8E6D3",
+"(+	c #C4DCEE",
+"_+	c #BFDFEF",
+":+	c #BCE0F7",
+"<+	c #C5DDF0",
+"[+	c #C2DEF6",
+"}+	c #C1E1F1",
+"|+	c #BBE4F3",
+"1+	c #C7DFF1",
+"2+	c #BEEAD0",
+"3+	c #C8E0F3",
+"4+	c #C3E4F4",
+"5+	c #C3E8E4",
+"6+	c #CAE2F4",
+"7+	c #C4E5F5",
+"8+	c #CBE3F5",
+"9+	c #C8EBD3",
+"0+	c #D1E1F5",
+"a+	c #CAE6F1",
+"b+	c #C4EFD6",
+"c+	c #CBE8F2",
+"d+	c #C7EDE8",
+"e+	c #C9E9FA",
+"f+	c #D2E6F2",
+"g+	c #CDE9F4",
+"h+	c #D3EDE4",
+"i+	c #DAE7F5",
+"j+	c #E4E6E3",
+"k+	c #D6EAF6",
+"l+	c #DCE8F6",
+"m+	c #DAEBF1",
+"n+	c #DEEAF8",
+"o+	c #DCECF3",
+"p+	c #DDEFE8",
+"q+	c #DFEBFA",
+"r+	c #E2EBF3",
+"s+	c #DEEEF5",
+"t+	c #E2F0F0",
+"u+	c #E5EEF6",
+"v+	c #E9EEF1",
+"w+	c #EBF0F3",
+"x+	c #EEF0ED",
+"y+	c #E8F1F9",
+"z+	c #EAF3FB",
+"A+	c #ECF5FD",
+"B+	c #F0F5F8",
+"C+	c #E8F9FF",
+"D+	c #F3F8FB",
+"E+	c #F6FCFE",
+"F+	c #F8FEFF",
+"G+	c #FEFFFC",
+"                                                                ",
+"                      G+D+]+Z.&+Z.<+E+                          ",
+"                  B+M.K.W.<+i+f+0+^+O.H.<+G+                    ",
+"              G+U.B.1+6+0+]+Z.Z.(+i+6+6+U.B.G+                  ",
+"            B+0.&+^+&+n.H.)+u+l+-+A.r.(+(+ at +r.G+                ",
+"          B+3.>+>+r.M.E+C+          q+6.&+>+E.>+                ",
+"        F+/.U.U.h.<+e+I.c.t.5.5.      l+h.Z.Z.h.G+              ",
+"        j.E.K.n.!+=+.+9+5+9+.+D._.      n.O.O.8.y+              ",
+"      0+6.A.j.p.T.Q./+h+p+9+,+D.7.S u   Z.r.A.r. at +              ",
+"    G+6.h.j.'.m.J._+o+s+x+d+,+J.2.W m   f+3.h.j.M.              ",
+"    <+'.6.:.{.4.:+g+s+h+b+/+,+G.(...i 4 8+^.6.6.K.              ",
+"    a.^.^.+.1.}.g+g+m+.+`.`.G.o.Z D 1 , M.#.^.^. at +              ",
+"  F+#.,.&.-.U t G.7+7+{+C.o.2.=.W Z ' ' %.+.+.` 3+h.]+          ",
+"  A+K O w 5.z 7 x g.a+a+}+P.S Q ..` / < B C a &.H.3 W.          ",
+"  )+A d d b.q ^ } P $+:+_+P.D j F M 8 V p 3 3 a./.a q+          ",
+"  U.e 9 9 z.y * b f.;+_+4+_+( _ k.V & _ c 2 3 &+3.6.G+          ",
+"  M.c g c L.s { ].$+}+g+f+f+p.$+x.%.Y z.n.h.h.u+|.h.G+          ",
+"  W.f w w >+  k ;.;+7+m+u+u+a+a+;+F.-+%.^.^.[.a.6.^.8.8.8.|.f+  ",
+"  [+f w w H.  # :.~+c+s+w+v+f+}+;+i.L.E ` ` ` #.'.X X X ` H D+  ",
+"  G+r E N ).x+  @ I e.$.l.l.S.'+^.~ H.Y.Y.^+F+a.r l+G+G+G+G+    ",
+"  G+` E O C r+    . $ { ! ) > - = | 6 3 o z+G+O w G+            ",
+"    ]+w N T T B+        + % ; [ p f c f i+  G+f H               ",
+"    F+[.N X +.O H.r+j+#+s. at .B o r o E f+    6+3 [.              ",
+"      E+!.Y ,.^.).X ;.N H H O E w 6.D+      >+K >+              ",
+"        F+M.X +././.).).&.N O r O.G+                            ",
+"            G+<+B.8.a.r.H.K K N l E n.u+G+                      ",
+"                          u+#.w w e a 6 C [.Y.y+                ",
+"                            G+]+X c f 3 3 3 l u+                ",
+"                                F+^+` 6 3 l q+                  ",
+"                                    G+z+k.r+                    ",
+"                                                                ",
+"                                                                "};

Added: 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.kfilereplace	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: kfilereplace
+Title: KFileReplace Handbook
+Author: Emiliano Gulmini <emi_barbarossa at yahoo.it>
+Abstract: KFileReplace is an utility to search and replace strings.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kfilereplace/index.html
+Files: /usr/share/doc/kde/HTML/en/kfilereplace/*.html
+

Added: 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.klinkstatus	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: klinkstatus
+Title: KLinkStatus Handbook
+Author: Paulo Moura Guedes <moura at kdewebdev.org>
+Abstract: KLinkStatus is a link checker for KDE.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/klinkstatus/index.html
+Files: /usr/share/doc/kde/HTML/en/klinkstatus/*.html
+

Added: 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.kommander	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,18 @@
+Document: kommander
+Title: Kommander Handbook
+Author: Marc Britton <consume at optushome.com.au>, Tamara King <tik at acm.org> and Eric Laffoon <sequitur at kde.org>
+Abstract: Kommander is a set of tools that allow you to create dynamic
+ GUI dialogs that generate, based on their state, a piece of text.  The
+ piece of text can be a command line to a program, any piece of code,
+ business documents that contain a lot of repititious or templated text
+ and so on.  The resulting generated text can then be executed as a
+ command line program (hence the name "Kommander"), written to a file,
+ passed to a script for extended processing, and literally anything else
+ you can think of.  The best part of it all?  You aren't required to write
+ a single line of code!
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kommander/index.html
+Files: /usr/share/doc/kde/HTML/en/kommander/*.html
+

Added: 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.kxsldbg	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+Document: kxsldbg
+Title: KXsldbg Handbook
+Author: Keith Isdale <k_isdale at tpg.com.au>
+Abstract: KXsldbg provides a graphical user interface front-end to
+ xsldbg, which supports debugging of XSLT scripts.
+Section: Apps/Text
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kxsldbg/index.html
+Files: /usr/share/doc/kde/HTML/en/kxsldbg/*.html
+

Added: 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.quanta	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,13 @@
+Document: quanta
+Title: Quanta Plus User Manual
+Author: Christopher Hornbaker <chrishornbaker at earthlink.net>,
+ Fabrice Mous <fabrice at kde.nl> and Robert Nickel <robert at artnickel.com>
+Abstract: Quanta Plus is a Web IDE that strives to be neutral and
+ transparent to all markup languages, while supporting popular web-based
+ scripting languages, CSS and other emerging W3C recommendations.
+Section: Apps/Editors
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/quanta/index.html
+Files: /usr/share/doc/kde/HTML/en/quanta/*.html
+

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+Document: xsldbg
+Title: Xsldbg Handbook
+Author: Keith Isdale <k_isdale at tpg.com.au>
+Abstract: xlsdbg is a XSLT scripts debbuger.
+Section: Apps/Text
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/xsldbg/index.html
+Files: /usr/share/doc/kde/HTML/en/xsldbg/*.html
+

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kfilereplace.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kfilereplace.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kfilereplace.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,10 @@
+KFileReplace for Debian
+-----------------------
+
+KFileReplace is currently not available as a standalone application.
+Instead it is made available as a KPart (an embedded KDE component).
+
+An example of an application that uses the KFileReplace component is
+Quanta Plus, found in the package quanta.
+
+ -- Ben Burton <bab at debian.org>, Sat, 31 Jan 2004 12:08:48 +1100

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kfilereplace.install
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kfilereplace.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kfilereplace.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,14 @@
+debian/tmp/usr/bin/kfilereplace
+debian/tmp/usr/lib/kde3/libkfilereplacepart.la
+debian/tmp/usr/lib/kde3/libkfilereplacepart.so
+debian/tmp/usr/share/applications/kde/kfilereplace.desktop
+debian/tmp/usr/share/apps/kfilereplace/kfilereplaceui.rc
+debian/tmp/usr/share/apps/kfilereplacepart
+debian/tmp/usr/share/doc/kde/HTML/en/kfilereplace/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kfilereplace/common
+debian/tmp/usr/share/doc/kde/HTML/en/kfilereplace/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kfilereplace/*.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kfilereplace.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kfilereplace.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kfilereplace.png
+debian/tmp/usr/share/services/kfilereplacepart.desktop

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

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.install
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,23 @@
+debian/icons/kimagemapeditor.xpm	/usr/share/pixmaps
+
+debian/tmp/usr/bin/kimagemapeditor
+debian/tmp/usr/lib/kde3/libkimagemapeditor.la
+debian/tmp/usr/lib/kde3/libkimagemapeditor.so
+debian/tmp/usr/share/applications/kde/kimagemapeditor.desktop
+debian/tmp/usr/share/apps/kimagemapeditor
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kimagemapeditor.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/addpoint.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/arrow.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/circle2.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/circle.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/freehand.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/lower.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/polygon.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/raise.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/rectangle.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/removepoint.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kimagemapeditor.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kimagemapeditor.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/kimagemapeditor.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/kimagemapeditor.png
+debian/tmp/usr/share/services/kimagemapeditorpart.desktop

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

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.menu
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kimagemapeditor.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(kimagemapeditor):\
+    needs="X11"\
+    hints="KDE"\
+    section="Apps/Editors"\
+    title="KImageMapEditor"\
+    longtitle="KImageMapEditor (HTML Image Map Editor)"\
+    icon="/usr/share/pixmaps/kimagemapeditor.xpm"\
+    command="/usr/bin/kimagemapeditor"

Added: people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+KLinkStatus for Debian
+----------------------
+
+This application 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 kdewebdev-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Tue, 19 Oct 2004 09:09:06 +1000
+

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

Added: people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.install
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/klinkstatus.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,21 @@
+debian/icons/klinkstatus.xpm	/usr/share/pixmaps
+
+debian/tmp/usr/bin/klinkstatus
+debian/tmp/usr/lib/kde3/libklinkstatuspart.la
+debian/tmp/usr/lib/kde3/libklinkstatuspart.so
+debian/tmp/usr/share/applications/kde/klinkstatus.desktop
+debian/tmp/usr/share/apps/klinkstatus
+debian/tmp/usr/share/apps/klinkstatuspart
+debian/tmp/usr/share/config.kcfg/klinkstatus.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/klinkstatus/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/klinkstatus/common
+debian/tmp/usr/share/doc/kde/HTML/en/klinkstatus/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/klinkstatus/*.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/actions/bug.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/klinkstatus.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/klinkstatus.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/klinkstatus.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/klinkstatus.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/klinkstatus.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/klinkstatus.png
+debian/tmp/usr/share/services/klinkstatus_part.desktop

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

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

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kommander-dev.docs
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kommander-dev.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kommander-dev.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+kommander/AUTHORS
+kommander/README
+kommander/working/extendingkommander.txt
+kommander/working/translating.txt

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kommander-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kommander-dev.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kommander-dev.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+debian/tmp/usr/include/kde/kommander*
+debian/tmp/usr/lib/libkommanderplugin.la
+debian/tmp/usr/lib/libkommanderplugin.so
+debian/tmp/usr/lib/libkommanderwidget.la
+debian/tmp/usr/lib/libkommanderwidget.so
+debian/tmp/usr/lib/libkommanderwidgets.so

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kommander.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kommander.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kommander.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+Kommander for Debian
+--------------------
+
+This application 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 kdewebdev-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Tue, 19 Oct 2004 09:09:06 +1000
+

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kommander.docs
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kommander.docs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kommander.docs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+kommander/AUTHORS
+kommander/README
+kommander/working/extendingkommander.txt
+kommander/working/translating.txt

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kommander.install
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kommander.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kommander.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,27 @@
+debian/tmp/usr/bin/kmdr-editor
+debian/tmp/usr/bin/kmdr-executor
+debian/tmp/usr/bin/kmdr-plugins
+debian/tmp/usr/lib/libkommanderplugin.so.0
+debian/tmp/usr/lib/libkommanderplugin.so.0.0.0
+debian/tmp/usr/lib/libkommanderwidgets.la
+debian/tmp/usr/lib/libkommanderwidget.so.0
+debian/tmp/usr/lib/libkommanderwidget.so.0.0.0
+debian/tmp/usr/lib/libkommanderwidgets.so.0
+debian/tmp/usr/lib/libkommanderwidgets.so.0.0.0
+debian/tmp/usr/share/applications/kde/kmdr-editor.desktop
+debian/tmp/usr/share/applnk/.hidden/kmdr-executor.desktop
+debian/tmp/usr/share/apps/kmdr-editor/pics/kommandersplash.png
+debian/tmp/usr/share/doc/kde/HTML/en/kommander/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kommander/common
+debian/tmp/usr/share/doc/kde/HTML/en/kommander/*.css
+debian/tmp/usr/share/doc/kde/HTML/en/kommander/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kommander/*.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kommander.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kommander.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kommander.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kommander.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kommander.png
+debian/tmp/usr/share/mimelnk/application/x-kommander.desktop
+kommander/examples /usr/share/doc/kommander
+kommander/working/extractkmdr /usr/bin
+kommander/working/kmdr2po /usr/bin

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kommander.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kommander.manpages	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kommander.manpages	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,5 @@
+debian/man/extractkmdr.1
+debian/man/kmdr-editor.1
+debian/man/kmdr-executor.1
+debian/man/kmdr-plugins.1
+debian/man/kmdr2po.1

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kommander.menu
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kommander.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kommander.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(kommander):\
+    needs="X11"\
+    hints="KDE"\
+    section="Apps/Tools"\
+    title="Kommander Editor"\
+    longtitle="Kommander Editor (Dynamic Dialog Editor)"\
+    command="/usr/bin/kmdr-editor"

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kommander.shlibs
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kommander.shlibs	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kommander.shlibs	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,3 @@
+libkommanderplugin 0 kommander (>= 1:3.3.0)
+libkommanderwidget 0 kommander (>= 1:3.3.0)
+libkommanderwidgets 0 kommander (>= 1:3.3.0)

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,9 @@
+KXSLDbg for Debian
+------------------
+
+This application 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 kdewebdev-doc-html.
+
+ -- Ben Burton <bab at debian.org>, Tue, 19 Oct 2004 09:09:06 +1000
+

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.install
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,32 @@
+debian/tmp/usr/bin/kxsldbg
+debian/tmp/usr/bin/xsldbg
+debian/tmp/usr/lib/kde3/libkxsldbgpart.la
+debian/tmp/usr/lib/kde3/libkxsldbgpart.so
+debian/tmp/usr/share/applications/kde/kxsldbg.desktop
+debian/tmp/usr/share/apps/kxsldbg
+debian/tmp/usr/share/apps/kxsldbgpart
+debian/tmp/usr/share/doc/kde/HTML/en/kxsldbg/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kxsldbg/common
+debian/tmp/usr/share/doc/kde/HTML/en/kxsldbg/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kxsldbg/*.png
+debian/tmp/usr/share/doc/kde/HTML/en/xsldbg/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/xsldbg/common
+debian/tmp/usr/share/doc/kde/HTML/en/xsldbg/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/xsldbg/xsldbghelp.xml
+debian/tmp/usr/share/icons/hicolor/16x16/actions/1downarrow.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/configure.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/exit.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/hash.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/mark.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/next.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/run.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/step.png
+debian/tmp/usr/share/icons/hicolor/16x16/actions/xsldbg_*.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/1downarrow.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/configure.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/exit.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/next.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/run.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/step.png
+debian/tmp/usr/share/icons/hicolor/22x22/actions/xsldbg_*.png
+debian/tmp/usr/share/services/kxsldbg_part.desktop

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

Added: people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.menu
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/kxsldbg.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+?package(kxsldbg):\
+    needs="X11"\
+    hints="KDE"\
+    section="Apps/Text"\
+    title="KXSLDbg"\
+    longtitle="KXSLDbg (XSLT Debugger)"\
+    command="/usr/bin/kxsldbg"

Added: people/jriddell/KDE/3.5/kdewebdev/debian/man/extractkmdr.1
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/man/extractkmdr.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/man/extractkmdr.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 EXTRACTKMDR 1 "March 25, 2005"
+.\" 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
+extractkmdr \- extract message strings from Kommander dialogs
+.SH SYNOPSIS
+.B extractkmdr
+[ \fB\-\-tag=\fP\fIname\fP ... ]
+[ \fB\-\-context=\fP\fIname\fP ]
+\fIfile\fP ...
+.SH DESCRIPTION
+\fBextractkmdr\fP finds all text tags and other message strings within the
+given Kommander dialog (.kmdr) files.  It then writes the corresponding
+\fIi18n()\fP calls to standard output (usually redirected to rc.cpp)
+so that xgettext can parse them.
+.PP
+To create a complete gettext message file (PO-file) from a Kommander
+dialog, the
+.BR kmdr2po (1)
+utility is more convenient.
+.PP
+This utility is part of the KDE web development module.
+.SH OPTIONS
+.TP
+\fB\-\-tag=\fP\fIname\fP
+Extract also the contents of the tag \fIname\fP.
+This option may be used multiple times
+(e.g., \-\-tag=tag_one \-\-tag=tag_two).
+.TP
+\fB\-\-context=\fP\fIname\fP
+Give all i18n() calls the given context: i18n("\fIname\fP", ...).
+.SH SEE ALSO
+.BR kmdr-editor (1),
+.BR kmdr-executor (1),
+.BR kmdr-plugins (1),
+.BR kmdr2po (1).
+.SH AUTHOR
+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/kdewebdev/debian/man/kimagemapeditor.1
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/man/kimagemapeditor.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/man/kimagemapeditor.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,47 @@
+.\"                                      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 KIMAGEMAPEDITOR 1 "October 19, 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
+kimagemapeditor \- an HTML image map editor for KDE
+.SH SYNOPSIS
+.B kimagemapeditor
+[ \fIgeneric-options\fP ]
+[ \fB\-c, \-\-stdout\fP ]
+[ \fIfile\fP ... ]
+.SH DESCRIPTION
+\fBKImageMapEditor\fP is a tool that allows you to edit image maps in
+HTML files.  As well as providing a standalone application,
+KImageMapEditor makes itself available as a KPart for embedding into
+larger applications.
+.PP
+The files passed on the command line may be either HTML files or image
+files.
+.PP
+This application is part of the official KDE web development module.
+.SH OPTIONS
+Below are the kimagemapeditor-specific options.
+For a full summary of options, run \fIkimagemapeditor \-\-help\fP.
+.TP
+\fB\-c, \-\-stdout\fP
+Write the resulting HTML code to standard output when exiting.
+.SH SEE ALSO
+.BR quanta (1).
+.SH AUTHOR
+KImageMapEditor was written by Jan Schafer <janschaefer 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/kdewebdev/debian/man/klinkstatus.1
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/man/klinkstatus.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/man/klinkstatus.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 KLINKSTATUS 1 "October 19, 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
+klinkstatus \- a web link validity checker for KDE
+.SH SYNOPSIS
+.B klinkstatus
+[ \fIgeneric-options\fP ]
+[ \fIURL\fP ]
+.SH DESCRIPTION
+\fBKLinkStatus\fP is a web link validity checker for KDE.  It allows you to
+search internal and external links throughout your web site.  Simply
+point it to a single page and choose the depth to search.
+.PP
+You can also check local files, or files over ftp:, fish: or any other
+KIO protocols.  For performance, links can be checked simultaneously.
+.PP
+This application is part of the official KDE web development module.
+.SH OPTIONS
+For a full summary of options, run \fIklinkstatus \-\-help\fP.
+.SH SEE ALSO
+.BR quanta (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/klinkstatus/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/klinkstatus/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/klinkstatus/\fP.
+.SH AUTHOR
+KLinkStatus was written by Paulo Moura Guedes <moura at kdewebdev.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/kdewebdev/debian/man/kmdr-editor.1
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr-editor.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr-editor.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,70 @@
+.\"                                      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 KMDR-EDITOR 1 "March 25, 2005"
+.\" 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
+kmdr-editor \- editor for the Kommander visual dialog building tool
+.SH SYNOPSIS
+.B kmdr-editor
+[ \fIgeneric-options\fP ]
+.SH DESCRIPTION
+\fBKommander\fP is a visual dialog building tool whose
+primary objective is to create
+as much functionality as possible without using any scripting language.
+.PP
+More specifically, Kommander is a set of tools that allow you to create
+dynamic GUI dialogs that generate, based on their state, a piece of text.
+The piece of text can be a command line to a program, any piece of code,
+business documents that contain a lot of repititious or templated text and so
+on.  The resulting generated text can then be executed as a command line
+program (hence the name "Kommander"), written to a file, passed to a
+script for extended processing, and literally anything else you can
+think of.  The best part of it all?  You aren't required to write a single
+line of code!
+.PP
+This editor (\fBkmdr-editor\fP) allows you to lay out your entire dialog
+through a graphical
+user interface.  Once a dialog has been created by the editor, it is
+saved as a file with extension \fI.kmdr\fP.  The dialog that this XML file
+represents can then be run instantly with the executor (\fBkmdr-executor\fP).
+.PP
+This application is part of the official KDE web development module.
+.SH OPTIONS
+For a full summary of options, run \fIkmdr-editor \-\-help\fP.
+.SH SEE ALSO
+.BR extractkmdr (1),
+.BR kmdr-executor (1),
+.BR kmdr-plugins (1),
+.BR kmdr2po (1),
+.BR quanta (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kommander/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kommander/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kommander/\fP.
+.SH AUTHOR
+Kommander was written by Marc Britton <consume at optusnet.com.au>,
+Eric Laffoon <sequitur at kde.org>, Michal Rudolf <mrudolf at kdewebdev.org>,
+Andras Mantia <amantia at kde.org> and Trolltech.
+.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/kdewebdev/debian/man/kmdr-executor.1
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr-executor.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr-executor.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,87 @@
+.\"                                      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 KMDR-EXECUTOR 1 "March 25, 2005"
+.\" 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
+kmdr-executor \- executor for the Kommander visual dialog building tool
+.SH SYNOPSIS
+.B kmdr-executor
+[ \fIgeneric-options\fP ]
+[ \fB\-c\fP \fIcatalog\fP ]
+{ \fB\-\-stdin\fP | \fIfile\fP }
+[ \fIarg\fP ... ]
+.SH DESCRIPTION
+\fBKommander\fP is a visual dialog building tool whose
+primary objective is to create
+as much functionality as possible without using any scripting language.
+.PP
+More specifically, Kommander is a set of tools that allow you to
+create dynamic GUI dialogs
+that generate, based on their state, a piece of text.  The piece of text
+can be a command line to a program, any piece of code, business
+documents that contain a lot of repititious or templated text and so on.
+The resulting generated text can then be executed as a command line
+program (hence the name "Kommander"), written to a file, passed to a
+script for extended processing, and literally anything else you can
+think of.  The best part of it all?  You aren't required to write a single
+line of code!
+.PP
+This executor (\fBkmdr-executor\fP) is used to run a dialog that has
+been created by the
+dialog editor (\fBkmdr-editor\fP).  Either the dialog file (generally
+a \fI.kmdr\fP file) should be passed on
+the command-line, or else the option \-\-stdin should be passed and the
+dialog description should be supplied as XML on standard input.
+Additional arguments for the dialog itself may also be supplied.
+.PP
+This application is part of the official KDE web development module.
+.SH OPTIONS
+Below are the kommander-specific options.
+For a full summary of options, run \fIkmdr-editor \-\-help\fP.
+.TP
+\fB\-c\fP \fIcatalog\fP
+Use the given catalog for translation.
+.TP
+\fB\-\-stdin\fP
+Read the XML dialog description from standard input instead of passing
+a \fI.kmdr\fP file on the command-line.
+.TP
+\fIarg\fP ...
+Additional arguments to be passed on to the dialog itself.
+.SH SEE ALSO
+.BR extractkmdr (1),
+.BR kmdr-editor (1),
+.BR kmdr-plugins (1),
+.BR kmdr2po (1),
+.BR quanta (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kommander/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kommander/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kommander/\fP.
+.SH AUTHOR
+Kommander was written by Marc Britton <consume at optusnet.com.au>,
+Eric Laffoon <sequitur at kde.org>, Michal Rudolf <mrudolf at kdewebdev.org>,
+Andras Mantia <amantia at kde.org> and Trolltech.
+.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/kdewebdev/debian/man/kmdr-plugins.1
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr-plugins.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr-plugins.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,71 @@
+.\"                                      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 KMDR-PLUGINS 1 "March 25, 2005"
+.\" 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
+kmdr-plugins \- plugin manager for the Kommander visual dialog building tool
+.SH SYNOPSIS
+.B kmdr-plugins
+[ \fIgeneric-options\fP ]
+.SH DESCRIPTION
+\fBKommander\fP is a visual dialog building tool whose
+primary objective is to create
+as much functionality as possible without using any scripting language.
+.PP
+It is possible to extend Kommander by writing your own plugins.  The
+plugin manager
+.B kmdr-plugins
+is a simple user interface to Kommander's configuration file, and
+can be used to select which external plugins Kommander should load.
+Closing the plugin manager will automatically save any changes.
+.PP
+By loading a plugin, the custom widgets that it defines
+will become available in Kommander's menus and toolbars, and these
+custom widgets can be used in Kommander dialogs.
+.PP
+See
+.BR kmdr-editor (1)
+and
+.BR kmdr-executor (1)
+for a more detailed description of Kommander.
+.PP
+This application is part of the official KDE web development module.
+.SH OPTIONS
+For a full summary of options, run \fIkmdr-plugins \-\-help\fP.
+.SH SEE ALSO
+.BR extractkmdr (1),
+.BR kmdr-editor (1),
+.BR kmdr-executor (1),
+.BR kmdr2po (1),
+.BR quanta (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kommander/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kommander/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kommander/\fP.
+.SH AUTHOR
+Kommander was written by Marc Britton <consume at optusnet.com.au>,
+Eric Laffoon <sequitur at kde.org>, Michal Rudolf <mrudolf at kdewebdev.org>,
+Andras Mantia <amantia at kde.org> and Trolltech.
+.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/kdewebdev/debian/man/kmdr2po.1
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr2po.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/man/kmdr2po.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,47 @@
+.\"                                      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 KMDR2PO 1 "March 25, 2005"
+.\" 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
+kmdr2po \- create a PO-file from a Kommander dialog
+.SH SYNOPSIS
+.B kmdr2po
+.I dialog
+.SH DESCRIPTION
+\fBkmdr2po\fP creates a gettext message file (PO-file) from the given
+Kommander dialog (.kmdr) file.  It does this by using
+.BR extractkmdr (1)
+to extract all text tags and other message strings, and then running
+.BR xgettext (1)
+to create the corresponding PO-file.
+.PP
+The final PO-file will be created in the current directory.  Its name
+will be derived from the dialog filename by replacing the suffix
+\fI.kmdr\fP with \fI.po\fP.
+.PP
+This utility is part of the KDE web development module.
+.SH WARNING
+A temporary file named \fI_from_rc.cc\fP in the current directory
+will be created and subsequently removed.
+.SH SEE ALSO
+.BR extractkmdr (1),
+.BR kmdr-editor (1),
+.BR kmdr-executor (1),
+.BR kmdr-plugins (1),
+.BR xgettext (1).
+.SH AUTHOR
+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/kdewebdev/debian/man/kxsldbg.1
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/man/kxsldbg.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/man/kxsldbg.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,54 @@
+.\"                                      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 KXSLDBG 1 "October 19, 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
+kxsldbg \- a graphical XSLT debugger for KDE
+.SH SYNOPSIS
+.B kxsldbg
+[ \fIgeneric-options\fP ]
+.SH DESCRIPTION
+\fBKXSLDbg\fP is a graphical debugger for XSLT scripts.  It provides
+a graphical front-end to the text-based debugger
+.BR xsldbg (1).
+KXSLDbg can be run as a standalone application or as an embedded KDE part.
+.PP
+XSLT is an XML language for defining transformations of XML files from
+XML to some other arbitrary format, such as XML, HTML, plain text, etc.,
+using standard XSLT stylesheets.
+.PP
+This application is part of the official KDE web development module.
+.SH OPTIONS
+For a full summary of options, run \fIkxsldbg \-\-help\fP.
+.SH SEE ALSO
+.BR quanta (1),
+.BR xsldbg (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/kxsldbg/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/kxsldbg/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/kxsldbg/\fP.
+.SH AUTHOR
+KXSLDbg was written by Keith Isdale <k_isdale at tpg.com.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/kdewebdev/debian/man/quanta.1
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/man/quanta.1	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/man/quanta.1	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,71 @@
+.\"                                      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 QUANTA 1 "October 19, 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
+quanta \- a web development environment for KDE
+.SH SYNOPSIS
+.B quanta
+[ \fIgeneric-options\fP ] [ \fB\-\-unique\fP ]
+[ \fB\-\-nologo\fP ] [ \fIfile\fP ]
+.SH DESCRIPTION
+\fBQuanta Plus\fP is a web development environment for working with HTML
+and associated languages.  It strives to be neutral and transparent
+to all markup languages, while supporting popular web-based scripting
+languages, CSS and other emerging W3C recommendations.
+.PP
+Quanta Plus supports many external components, debuggers and other tools
+for web development, several of which are shipped with the KDE web development
+module.
+.PP
+Quanta Plus is not in any way affiliated with any commercial versions
+of Quanta.  The primary coders from the original team left the GPLed
+version to produce a commercial product.
+.PP
+This application is part of the official KDE web development module.
+.SH OPTIONS
+Below are the quanta-specific options.  For a full summary of options,
+run \fIquanta \-\-help\fP.
+.TP
+\fB\-\-unique\fP
+Run as a one-instance application.
+.TP
+\fB\-\-nologo\fP
+Do not show the logo during startup.
+.SH SEE ALSO
+.BR kimagemapeditor (1),
+.BR klinkstatus (1),
+.BR kmdr-editor (1),
+.BR kmdr-executor (1),
+.BR kxsldbg (1).
+.PP
+Full user documentation is available through the KDE Help Centre.
+You can also enter the URL
+\fIhelp:/quanta/\fP
+directly into konqueror or you can run
+`\fIkhelpcenter help:/quanta/\fP'
+from the command-line.
+.PP
+If the KDE Help Centre is not installed then you can install the package
+\fIkdewebdev-doc-html\fP and read this documentation in HTML format from
+\fI/usr/share/doc/kde/HTML/en/quanta/\fP.
+.SH AUTHOR
+Quanta was written by Eric Laffoon <sequitur at kde.org>, Andras Mantia
+<amantia at kde.org> and others including inactive authors
+Dmitry Poplavsky <dima at kde.org> and Alexander Yakovlev <yshurik 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/kdewebdev/debian/patches/02_kmdr_i18n.diff
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/02_kmdr_i18n.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/patches/02_kmdr_i18n.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+--- kde.orig/kommander/working/kmdr2po
++++ kde.patched/kommander/working/kmdr2po
+@@ -4,7 +4,7 @@ if [ -z $1 ]; then
+    echo "Makepo extracts strings for translation from Kommander dialog."
+    echo "Usage: kmdr2po <Kommander dialog>"
+ else
+-   ./extractkmdr $1 >_from_rc.cc
++   extractkmdr $1 >_from_rc.cc
+    xgettext -C -F --default-domain=`basename $1 .kmdr` \
+       --keyword=i18n --keyword=@i18n $1 _from_rc.cc
+    rm _from_rc.cc

Added: people/jriddell/KDE/3.5/kdewebdev/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/patches/04_am_maintainer_mode.diff	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,11 @@
+--- kde.orig/configure.in.in
++++ kde.patched/configure.in.in
+@@ -13,6 +13,8 @@
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@)
+ KDE_ENABLE_HIDDEN_VISIBILITY
+ 
++AM_MAINTAINER_MODE
++
+ quanta_datadir='${kde_datadir}/quanta'
+ package="quanta"
+ AC_SUBST(package)

Added: people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/02_autotools_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/02_autotools_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/03_libtool_update.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/04_am_maintainer_mode.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/05_pedantic-errors.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/06_disable_no_undefined.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/patches/common/README
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/README	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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-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/kdewebdev/debian/patches/common/update.sh
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/patches/common/update.sh	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/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/kdewebdev/debian/quanta-data.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/quanta-data.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/quanta-data.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,7 @@
+Quanta Plus data for Debian
+---------------------------
+
+This package merely provides supporting data files for Quanta Plus.  The
+Quanta Plus application itself can be found in the quanta package.
+
+ -- Ben Burton <bab at debian.org>, Tue,  8 Jun 2004 17:31:32 +1000

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

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

Added: people/jriddell/KDE/3.5/kdewebdev/debian/quanta-data.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/quanta-data.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/quanta-data.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,6 @@
+# These are shipped with quanta's kommander scripts and do not need to be
+# executable.
+quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/dwt.pl
+quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/TemplateMagic.pl
+quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/externalpreview.sh
+

Added: people/jriddell/KDE/3.5/kdewebdev/debian/quanta.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/quanta.README.Debian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/quanta.README.Debian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,36 @@
+Quanta Plus for Debian
+----------------------
+
+Reference Documentation:
+
+  Quanta Plus is able to display reference documentation from several
+  external sources.
+
+  Reference documentation for HTML, CSS and PHP can be downloaded as
+  separate Debian packages (wdg-html-reference and phpdoc).  Quanta Plus
+  will be able to access this documentation out of the box.
+
+  JavaScript and MySQL reference documentation is also available but is
+  not supported natively by this package.  To make JavaScript or MySQL
+  documentation accessible in Quanta Plus, download the relevant documentation
+  tarball from http://sourceforge.net/projects/quanta/.  You should unpack
+  this tarball beneath ~/.kde/share/apps/quanta/doc/, so that the file
+  javascript.docrc or mysql.docrc is unpacked directly into this directory.
+
+HTML Documentation:
+
+  Quanta Plus 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 kdewebdev-doc-html.
+
+Kommander:
+
+  The Kommander GUI script builder and executor that ships with Quanta Plus
+  has been split out of the main quanta package and can now be found in the
+  separate kommander package.
+
+Quanta Plus is not in any way affiliated with any commercial versions of
+Quanta.  The primary coders from the original team left the GPLed
+version to produce a commercial product.
+
+ -- Ben Burton <bab at debian.org>, Tue, 19 Oct 2004 09:09:06 +1000

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

Added: people/jriddell/KDE/3.5/kdewebdev/debian/quanta.install
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/quanta.install	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/quanta.install	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,23 @@
+debian/docrc/*.docrc        /usr/share/apps/quanta/doc
+debian/icons/quanta.xpm	/usr/share/pixmaps
+
+debian/tmp/usr/bin/quanta
+debian/tmp/usr/lib/kde3/quantadebuggerdbgp.la
+debian/tmp/usr/lib/kde3/quantadebuggerdbgp.so
+debian/tmp/usr/lib/kde3/quantadebuggergubed.la
+debian/tmp/usr/lib/kde3/quantadebuggergubed.so
+debian/tmp/usr/share/applications/kde/quanta.desktop
+debian/tmp/usr/share/apps/kafkapart
+debian/tmp/usr/share/doc/kde/HTML/en/quanta/*.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/quanta/common
+debian/tmp/usr/share/doc/kde/HTML/en/quanta/*.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/quanta/*.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/quanta.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/quanta.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/quanta.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/quanta.png
+debian/tmp/usr/share/mimelnk/application/x-webprj.desktop
+debian/tmp/usr/share/services/quantadebuggerdbgp.desktop
+debian/tmp/usr/share/services/quantadebuggergubed.desktop
+debian/tmp/usr/share/services/quanta_preview_config.desktop
+debian/tmp/usr/share/servicetypes/quantadebugger.desktop

Added: people/jriddell/KDE/3.5/kdewebdev/debian/quanta.links
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/quanta.links	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/quanta.links	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+/usr/share/doc/phpdoc/html /usr/share/apps/quanta/doc/php
+/usr/share/doc/docbook-defguide/html /usr/share/apps/quanta/doc/docbook
+/usr/share/doc/wdg-html-reference/reference/css /usr/share/apps/quanta/doc/css
+/usr/share/doc/wdg-html-reference/reference/html40 /usr/share/apps/quanta/doc/html

Added: people/jriddell/KDE/3.5/kdewebdev/debian/quanta.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/quanta.lintian	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/quanta.lintian	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,4 @@
+# This tag is required for apps already in the KDE menu.
+quanta: menu-item-contains-unknown-tag kderemove /usr/lib/menu/quanta:9
+# This is part of the docbook docs.
+quanta: extra-license-file usr/share/doc/kde/HTML/en/quanta/credits-license.docbook

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

Added: people/jriddell/KDE/3.5/kdewebdev/debian/quanta.menu
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/quanta.menu	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/quanta.menu	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,8 @@
+?package(quanta):\
+    needs="X11"\
+    hints="KDE"\
+    section="Apps/Editors"\
+    title="Quanta Plus"\
+    longtitle="Quanta Plus (Web Development Environment)"\
+    icon="/usr/share/pixmaps/quanta.xpm"\
+    command="/usr/bin/quanta"

Added: people/jriddell/KDE/3.5/kdewebdev/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdewebdev/debian/rules	2006-02-14 14:27:50 UTC (rev 3125)
+++ people/jriddell/KDE/3.5/kdewebdev/debian/rules	2006-02-14 17:44:09 UTC (rev 3126)
@@ -0,0 +1,34 @@
+#! /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_INSTALL_CHANGELOGS_kfilereplace    := kfilereplace/ChangeLog
+DEB_INSTALL_CHANGELOGS_kimagemapeditor := kimagemapeditor/ChangeLog
+DEB_INSTALL_CHANGELOGS_klinkstatus     := klinkstatus/ChangeLog
+DEB_INSTALL_CHANGELOGS_kommander       := kommander/ChangeLog
+DEB_INSTALL_CHANGELOGS_quanta          := quanta/ChangeLog
+
+DEB_DH_STRIP_ARGS  := --dbg-package=kdewebdev-dbg
+
+PACKAGES_WITH_LIBS := kommander kxsldbg
+
+DEB_DH_MAKESHLIBS_ARGS_kommander := -V'kommander (>= 4:3.5.0-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.5.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))


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


