--- kdebase-3.5.7.orig/debian/kdebase-doc-html.doc-base.kdeprint
+++ kdebase-3.5.7/debian/kdebase-doc-html.doc-base.kdeprint
@@ -0,0 +1,10 @@
+Document: kdebase-doc-html-kdeprint
+Title: KDEPrint Handbook
+Author: Kurt Pfeifle
+Abstract: KDEPrint is the official printing system of KDE. 
+Section: Apps/Tools 
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kdeprint/index.html
+Files: /usr/share/doc/kde/HTML/en/kdeprint/*.html
+
--- kdebase-3.5.7.orig/debian/kwin.postinst
+++ kdebase-3.5.7/debian/kwin.postinst
@@ -0,0 +1,42 @@
+#! /bin/sh
+# postinst script for konqueror 
+#
+# 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 http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+    configure)
+	update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/kwin 50
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst 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
+
+
--- kdebase-3.5.7.orig/debian/compat
+++ kdebase-3.5.7/debian/compat
@@ -0,0 +1 @@
+5
--- kdebase-3.5.7.orig/debian/kdm.templates
+++ kdebase-3.5.7/debian/kdm.templates
@@ -0,0 +1,32 @@
+Template: shared/default-x-display-manager
+Type: select
+Choices: ${choices}
+_Description: Default display manager:
+ A display manager is a program that provides graphical login capabilities for
+ the X Window System.
+ .
+ Only one display manager can manage a given X server, but multiple display
+ manager packages are installed. Please select which display manager should
+ run by default.
+ .
+ Multiple display managers can run simultaneously if they are configured to
+ manage different servers; to achieve this, configure the display managers
+ accordingly, edit each of their init scripts in /etc/init.d, and disable the
+ check for a default display manager.
+
+Template: kdm/daemon_name
+Type: string
+Default: /usr/bin/kdm
+Description: internal use only
+ This template is never shown to the user and does not require translation.
+
+Template: kdm/stop_running_server_with_children
+Type: boolean
+Default: false
+_Description: Stop the kdm daemon?
+ The K Desktop manager (kdm) daemon is typically stopped on package upgrade
+ and removal, but it appears to be managing at least one running X session.
+ .
+ If kdm is stopped now, any X sessions it manages will be terminated.
+ Otherwise, the new version will take effect the next time the daemon
+ is restarted.
--- kdebase-3.5.7.orig/debian/ksmserver.postinst
+++ kdebase-3.5.7/debian/ksmserver.postinst
@@ -0,0 +1,46 @@
+#! /bin/sh
+# postinst script for ksmserver
+#
+# 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 http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+    configure)
+        update-alternatives --install /usr/bin/x-session-manager \
+	x-session-manager /usr/bin/startkde 40 \
+	--slave /usr/share/man/man1/x-session-manager.1.gz \
+	x-session-manager.1.gz "/usr/share/man/man1/startkde.1.gz"
+    
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst 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
+
+
--- kdebase-3.5.7.orig/debian/khelpcenter.install
+++ kdebase-3.5.7/debian/khelpcenter.install
@@ -0,0 +1,220 @@
+debian/tmp/usr/bin/khc_docbookdig.pl
+debian/tmp/usr/bin/khc_htdig.pl
+debian/tmp/usr/bin/khc_htsearch.pl
+debian/tmp/usr/bin/khc_indexbuilder
+debian/tmp/usr/bin/khc_mansearch.pl
+debian/tmp/usr/bin/khelpcenter
+debian/tmp/usr/lib/kde3/khelpcenter.la
+debian/tmp/usr/lib/kde3/khelpcenter.so
+debian/tmp/usr/lib/libkdeinit_khelpcenter.so
+debian/tmp/usr/share/applications/kde/Help.desktop
+debian/tmp/usr/share/apps/khelpcenter/glossary.html.in
+debian/tmp/usr/share/apps/khelpcenter/glossary.xslt
+debian/tmp/usr/share/apps/khelpcenter/index.html.in
+debian/tmp/usr/share/apps/khelpcenter/intro.html.in
+debian/tmp/usr/share/apps/khelpcenter/khelpcenterui.rc
+debian/tmp/usr/share/apps/khelpcenter/plugins/applets.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Applications/.directory
+debian/tmp/usr/share/apps/khelpcenter/plugins/contact.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/faq.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/info.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/kcontrolmodules.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/kicmodules.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/kioslaves.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/konqplugins.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/links.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/.directory
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man1.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man2.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man3.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man4.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man5.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man6.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man7.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man8.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man9.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/mann.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Scrollkeeper/.directory
+debian/tmp/usr/share/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/support.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Tutorials/.directory
+debian/tmp/usr/share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/Tutorials/visualdict.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/userguide.desktop
+debian/tmp/usr/share/apps/khelpcenter/plugins/welcome.desktop
+debian/tmp/usr/share/apps/khelpcenter/searchhandlers/docbook.desktop
+debian/tmp/usr/share/apps/khelpcenter/searchhandlers/htdig.desktop
+debian/tmp/usr/share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
+debian/tmp/usr/share/apps/khelpcenter/searchhandlers/man.desktop
+debian/tmp/usr/share/apps/khelpcenter/table-of-contents.xslt
+debian/tmp/usr/share/config.kcfg/khelpcenter.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/background.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/bgtable.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/common
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/contact.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/about.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/common
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/configkde.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/contrib.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/desktop.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/filemng.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/getkde.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/install.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/intro.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/kdeapps.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/misc.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/moreinfo.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/nonkdeapps.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/notrelated.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/panel.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/qt.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/questions.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/sound.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/tips.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/TODO
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/webbrowse.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/faq/winmng.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/checkxrefs
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/common
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/help.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/kdelogo2.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/khelpcenter.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/konq.css
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/lines2.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/lines.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/pointers.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/quickstart/common
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/quickstart/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/quickstart/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/shadow1.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/support.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/accessibility.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/amarok-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/amarok.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/a-window.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/burning-cds.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/common
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/control-center.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/customizing-desktop.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/desktop.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/email.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/extragear-applications.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/file-sharing.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/font-installation.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/getting-help.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/glossary.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/juk-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/juk.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kaboodle.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kcalc-systray.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kcontrol.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kde-as-root.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kde-office.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmag.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmousetool.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmouth2.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmouth3.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kmouth.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/knode-identity.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/knode-mail-account.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/knode-news-account.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/knode-start.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/konq-sidebar.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/konq-simple.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kopete.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/kppp-wizard.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/migrator-applications.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/noatun-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/noatun.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/oggfolder.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/open-file-dialog.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/pdf-files.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/playing-movies.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/playing-music.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/printer-setup.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/removable-disks.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/rip.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/ripsettings.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/screen-captures.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/services.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/splash-screen.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/the-filemanager.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/titlebar-menu.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/usenet.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/where-next.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/userguide/your-kde-account.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/common
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict10.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict11.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict12.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict13.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict14.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict15.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict16.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict17.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict18.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict19.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict1.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict20.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict21.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict22.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict23.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict2.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict3.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict4.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict5.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict6.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict7.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict8.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/visualdict/pict9.png
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/welcome.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/khelpcenter/whatiskde.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/khelpcenter.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/khelpcenter.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/khelpcenter.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/khelpcenter.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/khelpcenter.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/khelpcenter.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/khelpcenter.svgz
+debian/tmp/usr/share/services/khelpcenter.desktop
+
+debian/icons/khelpcenter.xpm		/usr/share/pixmaps
+debian/icons/khelpcenter-16.xpm		/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/kdeprint.menu
+++ kdebase-3.5.7/debian/kdeprint.menu
@@ -0,0 +1,35 @@
+?package(kdeprint):\
+	needs="X11"\
+	section="Applications/System/Monitoring"\
+	hints="KDE"\
+	title="KJobViewer"\
+	icon32x32="/usr/share/pixmaps/kjobviewer.xpm"\
+	icon16x16="/usr/share/pixmaps/kjobviewer-16.xpm"\
+	command="/usr/bin/kjobviewer --show --all"
+
+?package(kdeprint):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KPrinter"\
+	icon32x32="/usr/share/pixmaps/kdeprint.xpm"\
+	icon16x16="/usr/share/pixmaps/kdeprint-16.xpm"\
+	command="/usr/bin/kprinter"
+
+?package(kdeprint):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KDEPrintFax"\
+	icon32x32="/usr/share/pixmaps/kdeprintfax.xpm"\
+	icon16x16="/usr/share/pixmaps/kdeprintfax-16.xpm"\
+	command="/usr/bin/kdeprintfax"
+
+# Icon 32x32 kdeprint/kjobviewer/cr32-app-kjobviewer.png kjobviewer.xpm
+# Icon 16x16 kdeprint/kjobviewer/cr16-app-kjobviewer.png kjobviewer-16.xpm
+
+# Icon 32x32 kdeprint/printmgr/cr32-app-printmgr.png kdeprint.xpm
+# Icon 16x16 kdeprint/printmgr/cr16-app-printmgr.png kdeprint-16.xpm
+
+# Icon 32x32 kdeprint/kdeprintfax/cr32-app-kdeprintfax.png kdeprintfax.xpm
+# Icon 16x16 kdeprint/kdeprintfax/cr16-app-kdeprintfax.png kdeprintfax-16.xpm
--- kdebase-3.5.7.orig/debian/kate.lintian
+++ kdebase-3.5.7/debian/kate.lintian
@@ -0,0 +1,2 @@
+kate: shlib-missing-in-control-file libkdeinit_kwrite.so usr/lib/libkdeinit_kwrite.so
+kate: shlib-missing-in-control-file libkdeinit_kate.so usr/lib/libkdeinit_kate.so
--- kdebase-3.5.7.orig/debian/kdebase-bin.lintian
+++ kdebase-3.5.7/debian/kdebase-bin.lintian
@@ -0,0 +1,6 @@
+kdebase-bin: setgid-binary usr/bin/kdesud 2755 root/nogroup
+kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kcminit.so
+kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_khotkeys.so
+kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kxkb.so
+kdebase-bin: postinst-must-call-ldconfig usr/lib/libkdeinit_khotkeys.so
+kdebase-bin: postrm-should-call-ldconfig usr/lib/libkdeinit_khotkeys.so
--- kdebase-3.5.7.orig/debian/kdebase-doc-html.doc-base.konqueror
+++ kdebase-3.5.7/debian/kdebase-doc-html.doc-base.konqueror
@@ -0,0 +1,11 @@
+Document: kdebase-doc-html-konqueror
+Title: Konqueror Handbook
+Author: Pamela Roberts
+Abstract: Konqueror is KDE's advanced File Manager, Web Browser and
+ Universal Viewing Application.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/konqueror/index.html
+Files: /usr/share/doc/kde/HTML/en/konqueror/*.html
+
--- kdebase-3.5.7.orig/debian/kate.install
+++ kdebase-3.5.7/debian/kate.install
@@ -0,0 +1,80 @@
+debian/tmp/etc/kde3/katerc
+debian/tmp/usr/bin/kate
+debian/tmp/usr/bin/kwrite
+debian/tmp/usr/lib/kde3/kate.la
+debian/tmp/usr/lib/kde3/kate.so
+debian/tmp/usr/lib/kde3/kwrite.la
+debian/tmp/usr/lib/kde3/kwrite.so
+debian/tmp/usr/lib/libkateinterfaces.so.0
+debian/tmp/usr/lib/libkateinterfaces.so.0.0.0
+debian/tmp/usr/lib/libkateutils.so.0
+debian/tmp/usr/lib/libkateutils.so.0.0.0
+debian/tmp/usr/lib/libkdeinit_kate.so
+debian/tmp/usr/lib/libkdeinit_kwrite.so
+debian/tmp/usr/share/applications/kde/kate.desktop
+debian/tmp/usr/share/applications/kde/kwrite.desktop
+debian/tmp/usr/share/apps/kate/externaltools
+debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png
+debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png
+debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/modified.png
+debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/modmod.png
+debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/modonhd.png
+debian/tmp/usr/share/apps/kate/icons/crystalsvg/16x16/actions/null.png
+debian/tmp/usr/share/apps/kate/icons/crystalsvg/32x32/actions/highlighting.png
+debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/curfiledir.png
+debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/indent.png
+debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/modified.png
+debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/modmod.png
+debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/modonhd.png
+debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/null.png
+debian/tmp/usr/share/apps/kate/icons/locolor/16x16/actions/unindent.png
+debian/tmp/usr/share/apps/kate/icons/locolor/22x22/actions/indent.png
+debian/tmp/usr/share/apps/kate/icons/locolor/22x22/actions/unindent.png
+debian/tmp/usr/share/apps/kate/kateui.rc
+debian/tmp/usr/share/apps/kate/pics/sessionchooser.png
+debian/tmp/usr/share/apps/kate/tips
+debian/tmp/usr/share/apps/kconf_update/kate-2.4.upd
+debian/tmp/usr/share/apps/kwrite/kwriteui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kate/advanced.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/common
+debian/tmp/usr/share/doc/kde/HTML/en/kate/configdialog01.png
+debian/tmp/usr/share/doc/kde/HTML/en/kate/configdialog02.png
+debian/tmp/usr/share/doc/kde/HTML/en/kate/configuring.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/fundamentals.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/highlighted.png
+debian/tmp/usr/share/doc/kde/HTML/en/kate/highlighting.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kate/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/kate.png
+debian/tmp/usr/share/doc/kde/HTML/en/kate/man-kate.1.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/mdi.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/menus.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/mimetypechooser.png
+debian/tmp/usr/share/doc/kde/HTML/en/kate/part.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/plugins.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/regular-expressions.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kate/TODO
+debian/tmp/usr/share/doc/kde/HTML/en/kate/unhighlighted.png
+debian/tmp/usr/share/doc/kde/HTML/en/kwrite/common
+debian/tmp/usr/share/doc/kde/HTML/en/kwrite/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kwrite/index.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kate.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kwrite.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kate.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kwrite.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kate.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kwrite.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kate.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kwrite.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kate.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kwrite.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kate.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kwrite.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kate2.svgz
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kwrite2.svgz
+debian/tmp/usr/share/servicetypes/kateplugin.desktop
+
+debian/icons/kate-16.xpm	/usr/share/pixmaps
+debian/icons/kate.xpm		/usr/share/pixmaps
+debian/icons/kwrite-16.xpm	/usr/share/pixmaps
+debian/icons/kwrite.xpm		/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/kcontrol.install
+++ kdebase-3.5.7/debian/kcontrol.install
@@ -0,0 +1,238 @@
+debian/tmp/usr/bin/kaccess
+debian/tmp/usr/bin/kcontrol
+debian/tmp/usr/bin/kdeinstallktheme
+debian/tmp/usr/bin/keditfiletype
+debian/tmp/usr/bin/kfontinst
+debian/tmp/usr/bin/kfontview
+debian/tmp/usr/bin/kinfocenter
+debian/tmp/usr/bin/klocaldomainurifilterhelper
+debian/tmp/usr/bin/krandrtray
+debian/tmp/usr/bin/krdb
+debian/tmp/usr/lib/kde3/fontthumbnail.la
+debian/tmp/usr/lib/kde3/fontthumbnail.so
+debian/tmp/usr/lib/kde3/kaccess.la
+debian/tmp/usr/lib/kde3/kaccess.so
+debian/tmp/usr/lib/kde3/kcm_access.la
+debian/tmp/usr/lib/kde3/kcm_access.so
+debian/tmp/usr/lib/kde3/kcm_arts.la
+debian/tmp/usr/lib/kde3/kcm_arts.so
+debian/tmp/usr/lib/kde3/kcm_background.la
+debian/tmp/usr/lib/kde3/kcm_background.so
+debian/tmp/usr/lib/kde3/kcm_bell.la
+debian/tmp/usr/lib/kde3/kcm_bell.so
+debian/tmp/usr/lib/kde3/kcm_clock.la
+debian/tmp/usr/lib/kde3/kcm_clock.so
+debian/tmp/usr/lib/kde3/kcm_colors.la
+debian/tmp/usr/lib/kde3/kcm_colors.so
+debian/tmp/usr/lib/kde3/kcm_componentchooser.la
+debian/tmp/usr/lib/kde3/kcm_componentchooser.so
+debian/tmp/usr/lib/kde3/kcm_crypto.la
+debian/tmp/usr/lib/kde3/kcm_crypto.so
+debian/tmp/usr/lib/kde3/kcm_css.la
+debian/tmp/usr/lib/kde3/kcm_css.so
+debian/tmp/usr/lib/kde3/kcm_display.la
+debian/tmp/usr/lib/kde3/kcm_display.so
+debian/tmp/usr/lib/kde3/kcm_energy.la
+debian/tmp/usr/lib/kde3/kcm_energy.so
+debian/tmp/usr/lib/kde3/kcm_filetypes.la
+debian/tmp/usr/lib/kde3/kcm_filetypes.so
+debian/tmp/usr/lib/kde3/kcm_fontinst.la
+debian/tmp/usr/lib/kde3/kcm_fontinst.so
+debian/tmp/usr/lib/kde3/kcm_fonts.la
+debian/tmp/usr/lib/kde3/kcm_fonts.so
+debian/tmp/usr/lib/kde3/kcm_icons.la
+debian/tmp/usr/lib/kde3/kcm_icons.so
+debian/tmp/usr/lib/kde3/kcm_info.la
+debian/tmp/usr/lib/kde3/kcm_info.so
+debian/tmp/usr/lib/kde3/kcm_input.la
+debian/tmp/usr/lib/kde3/kcm_input.so
+debian/tmp/usr/lib/kde3/kcm_ioslaveinfo.la
+debian/tmp/usr/lib/kde3/kcm_ioslaveinfo.so
+debian/tmp/usr/lib/kde3/kcm_joystick.la
+debian/tmp/usr/lib/kde3/kcm_joystick.so
+debian/tmp/usr/lib/kde3/kcm_kded.la
+debian/tmp/usr/lib/kde3/kcm_kded.so
+debian/tmp/usr/lib/kde3/kcm_kdm.la
+debian/tmp/usr/lib/kde3/kcm_kdm.so
+debian/tmp/usr/lib/kde3/kcm_kdnssd.so
+debian/tmp/usr/lib/kde3/kcm_kdnssd.la
+debian/tmp/usr/lib/kde3/kcm_keys.la
+debian/tmp/usr/lib/kde3/kcm_keys.so
+debian/tmp/usr/lib/kde3/kcm_kicker.la
+debian/tmp/usr/lib/kde3/kcm_kicker.so
+debian/tmp/usr/lib/kde3/kcm_kio.la
+debian/tmp/usr/lib/kde3/kcm_kio.so
+debian/tmp/usr/lib/kde3/kcm_knotify.la
+debian/tmp/usr/lib/kde3/kcm_knotify.so
+debian/tmp/usr/lib/kde3/kcm_konqhtml.la
+debian/tmp/usr/lib/kde3/kcm_konqhtml.so
+debian/tmp/usr/lib/kde3/kcm_konq.la
+debian/tmp/usr/lib/kde3/kcm_konq.so
+debian/tmp/usr/lib/kde3/kcm_kthememanager.la
+debian/tmp/usr/lib/kde3/kcm_kthememanager.so
+debian/tmp/usr/lib/kde3/kcm_kurifilt.la
+debian/tmp/usr/lib/kde3/kcm_kurifilt.so
+debian/tmp/usr/lib/kde3/kcm_launch.la
+debian/tmp/usr/lib/kde3/kcm_launch.so
+debian/tmp/usr/lib/kde3/kcm_locale.la
+debian/tmp/usr/lib/kde3/kcm_locale.so
+debian/tmp/usr/lib/kde3/kcm_nic.la
+debian/tmp/usr/lib/kde3/kcm_nic.so
+debian/tmp/usr/lib/kde3/kcm_performance.la
+debian/tmp/usr/lib/kde3/kcm_performance.so
+debian/tmp/usr/lib/kde3/kcm_privacy.la
+debian/tmp/usr/lib/kde3/kcm_privacy.so
+debian/tmp/usr/lib/kde3/kcm_randr.la
+debian/tmp/usr/lib/kde3/kcm_randr.so
+debian/tmp/usr/lib/kde3/kcm_samba.la
+debian/tmp/usr/lib/kde3/kcm_samba.so
+debian/tmp/usr/lib/kde3/kcm_screensaver.la
+debian/tmp/usr/lib/kde3/kcm_screensaver.so
+debian/tmp/usr/lib/kde3/kcm_smserver.la
+debian/tmp/usr/lib/kde3/kcm_smserver.so
+debian/tmp/usr/lib/kde3/kcm_spellchecking.la
+debian/tmp/usr/lib/kde3/kcm_spellchecking.so
+debian/tmp/usr/lib/kde3/kcm_style.la
+debian/tmp/usr/lib/kde3/kcm_style.so
+debian/tmp/usr/lib/kde3/kcm_taskbar.la
+debian/tmp/usr/lib/kde3/kcm_taskbar.so
+debian/tmp/usr/lib/kde3/kcm_usb.la
+debian/tmp/usr/lib/kde3/kcm_usb.so
+debian/tmp/usr/lib/kde3/kcm_view1394.la
+debian/tmp/usr/lib/kde3/kcm_view1394.so
+debian/tmp/usr/lib/kde3/kcm_xinerama.la
+debian/tmp/usr/lib/kde3/kcm_xinerama.so
+debian/tmp/usr/lib/kde3/kcontrol.la
+debian/tmp/usr/lib/kde3/kcontrol.so
+debian/tmp/usr/lib/kde3/kfile_font.la
+debian/tmp/usr/lib/kde3/kfile_font.so
+debian/tmp/usr/lib/kde3/kio_fonts.la
+debian/tmp/usr/lib/kde3/kio_fonts.so
+debian/tmp/usr/lib/kde3/kstyle_keramik_config.la
+debian/tmp/usr/lib/kde3/kstyle_keramik_config.so
+debian/tmp/usr/lib/kde3/libkfontviewpart.la
+debian/tmp/usr/lib/kde3/libkfontviewpart.so
+debian/tmp/usr/lib/kde3/libkshorturifilter.la
+debian/tmp/usr/lib/kde3/libkshorturifilter.so
+debian/tmp/usr/lib/kde3/libkuriikwsfilter.la
+debian/tmp/usr/lib/kde3/libkuriikwsfilter.so
+debian/tmp/usr/lib/kde3/libkurisearchfilter.la
+debian/tmp/usr/lib/kde3/libkurisearchfilter.so
+debian/tmp/usr/lib/kde3/liblocaldomainurifilter.la
+debian/tmp/usr/lib/kde3/liblocaldomainurifilter.so
+debian/tmp/usr/lib/libkdeinit_kaccess.so
+debian/tmp/usr/lib/libkdeinit_kcontrol.so
+debian/tmp/usr/lib/libkfontinst.so.0
+debian/tmp/usr/lib/libkfontinst.so.0.0.0
+debian/tmp/usr/share/applications/kde/arts.desktop
+debian/tmp/usr/share/applications/kde/background.desktop
+debian/tmp/usr/share/applications/kde/bell.desktop
+debian/tmp/usr/share/applications/kde/cache.desktop
+debian/tmp/usr/share/applications/kde/cdinfo.desktop
+debian/tmp/usr/share/applications/kde/clock.desktop
+debian/tmp/usr/share/applications/kde/colors.desktop
+debian/tmp/usr/share/applications/kde/componentchooser.desktop
+debian/tmp/usr/share/applications/kde/cookies.desktop
+debian/tmp/usr/share/applications/kde/crypto.desktop
+debian/tmp/usr/share/applications/kde/desktopbehavior.desktop
+debian/tmp/usr/share/applications/kde/desktop.desktop
+debian/tmp/usr/share/applications/kde/desktoppath.desktop
+debian/tmp/usr/share/applications/kde/devices.desktop
+debian/tmp/usr/share/applications/kde/display.desktop
+debian/tmp/usr/share/applications/kde/dma.desktop
+debian/tmp/usr/share/applications/kde/ebrowsing.desktop
+debian/tmp/usr/share/applications/kde/filebrowser.desktop
+debian/tmp/usr/share/applications/kde/filetypes.desktop
+debian/tmp/usr/share/applications/kde/fonts.desktop
+debian/tmp/usr/share/applications/kde/icons.desktop
+debian/tmp/usr/share/applications/kde/installktheme.desktop
+debian/tmp/usr/share/applications/kde/interrupts.desktop
+debian/tmp/usr/share/applications/kde/ioports.desktop
+debian/tmp/usr/share/applications/kde/ioslaveinfo.desktop
+debian/tmp/usr/share/applications/kde/joystick.desktop
+debian/tmp/usr/share/applications/kde/kcm_kdnssd.desktop
+debian/tmp/usr/share/applications/kde/kcmaccess.desktop
+debian/tmp/usr/share/applications/kde/kcmcss.desktop
+debian/tmp/usr/share/applications/kde/kcmfontinst.desktop
+debian/tmp/usr/share/applications/kde/kcmkded.desktop
+debian/tmp/usr/share/applications/kde/kcmlaunch.desktop
+debian/tmp/usr/share/applications/kde/kcmnotify.desktop
+debian/tmp/usr/share/applications/kde/kcmperformance.desktop
+debian/tmp/usr/share/applications/kde/kcmsmserver.desktop
+debian/tmp/usr/share/applications/kde/kcmtaskbar.desktop
+debian/tmp/usr/share/applications/kde/kcmusb.desktop
+debian/tmp/usr/share/applications/kde/kcmview1394.desktop
+debian/tmp/usr/share/applications/kde/KControl.desktop
+debian/tmp/usr/share/applications/kde/kdm.desktop
+debian/tmp/usr/share/applications/kde/keys.desktop
+debian/tmp/usr/share/applications/kde/kfontview.desktop
+debian/tmp/usr/share/applications/kde/khtml_behavior.desktop
+debian/tmp/usr/share/applications/kde/khtml_fonts.desktop
+debian/tmp/usr/share/applications/kde/khtml_java_js.desktop
+debian/tmp/usr/share/applications/kde/kinfocenter.desktop
+debian/tmp/usr/share/applications/kde/krandrtray.desktop
+debian/tmp/usr/share/applications/kde/kthememanager.desktop
+debian/tmp/usr/share/applications/kde/lanbrowser.desktop
+debian/tmp/usr/share/applications/kde/language.desktop
+debian/tmp/usr/share/applications/kde/media.desktop
+debian/tmp/usr/share/applications/kde/memory.desktop
+debian/tmp/usr/share/applications/kde/mouse.desktop
+debian/tmp/usr/share/applications/kde/netpref.desktop
+debian/tmp/usr/share/applications/kde/nic.desktop
+debian/tmp/usr/share/applications/kde/opengl.desktop
+debian/tmp/usr/share/applications/kde/panel_appearance.desktop
+debian/tmp/usr/share/applications/kde/panel.desktop
+debian/tmp/usr/share/applications/kde/partitions.desktop
+debian/tmp/usr/share/applications/kde/pci.desktop
+debian/tmp/usr/share/applications/kde/privacy.desktop
+debian/tmp/usr/share/applications/kde/processor.desktop
+debian/tmp/usr/share/applications/kde/proxy.desktop
+debian/tmp/usr/share/applications/kde/screensaver.desktop
+debian/tmp/usr/share/applications/kde/scsi.desktop
+debian/tmp/usr/share/applications/kde/smbstatus.desktop
+debian/tmp/usr/share/applications/kde/sound.desktop
+debian/tmp/usr/share/applications/kde/spellchecking.desktop
+debian/tmp/usr/share/applications/kde/style.desktop
+debian/tmp/usr/share/applications/kde/useragent.desktop
+debian/tmp/usr/share/applications/kde/xserver.desktop
+debian/tmp/usr/share/applnk/.hidden/energy.desktop
+debian/tmp/usr/share/applnk/.hidden/fileappearance.desktop
+debian/tmp/usr/share/applnk/.hidden/filebehavior.desktop
+debian/tmp/usr/share/applnk/.hidden/filepreviews.desktop
+debian/tmp/usr/share/applnk/.hidden/kcmkonqyperformance.desktop
+debian/tmp/usr/share/applnk/.hidden/kicker_config_appearance.desktop
+debian/tmp/usr/share/applnk/.hidden/kicker_config.desktop
+debian/tmp/usr/share/applnk/.hidden/randr.desktop
+debian/tmp/usr/share/applnk/.hidden/smb.desktop
+debian/tmp/usr/share/applnk/.hidden/xinerama.desktop
+debian/tmp/usr/share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
+debian/tmp/usr/share/applnk/Settings/LookNFeel/panel_appearance.desktop
+debian/tmp/usr/share/applnk/Settings/LookNFeel/panel.desktop
+debian/tmp/usr/share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
+debian/tmp/usr/share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+debian/tmp/usr/share/applnk/Settings/WebBrowsing/nsplugin.desktop
+debian/tmp/usr/share/applnk/Settings/WebBrowsing/smb.desktop
+debian/tmp/usr/share/apps/kcm_componentchooser/kcm_browser.desktop
+debian/tmp/usr/share/apps/kcm_componentchooser/kcm_kemail.desktop
+debian/tmp/usr/share/apps/kcm_componentchooser/kcm_terminal.desktop
+debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/installfont.desktop
+debian/tmp/usr/share/locale/en_US/entry.desktop
+debian/tmp/usr/share/mimelnk/application/x-ktheme.desktop
+debian/tmp/usr/share/mimelnk/fonts/folder.desktop
+debian/tmp/usr/share/mimelnk/fonts/package.desktop
+debian/tmp/usr/share/mimelnk/fonts/system-folder.desktop
+debian/tmp/usr/share/services/fonts.protocol
+debian/tmp/usr/share/services/fontthumbnail.desktop
+debian/tmp/usr/share/services/kaccess.desktop
+debian/tmp/usr/share/services/kfile_font.desktop
+debian/tmp/usr/share/services/kfontviewpart.desktop
+debian/tmp/usr/share/services/kshorturifilter.desktop
+debian/tmp/usr/share/services/kuriikwsfilter.desktop
+debian/tmp/usr/share/services/kurisearchfilter.desktop
+debian/tmp/usr/share/services/localdomainurifilter.desktop
+
+debian/icons/kcontrol.xpm		/usr/share/pixmaps
+debian/icons/kcontrol-16.xpm		/usr/share/pixmaps
+debian/icons/kinfocenter.xpm		/usr/share/pixmaps
+debian/icons/kinfocenter-16.xpm		/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/kpersonalizer.menu
+++ kdebase-3.5.7/debian/kpersonalizer.menu
@@ -0,0 +1,11 @@
+?package(kpersonalizer):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KPersonalizer"\
+	icon32x32="/usr/share/pixmaps/kpersonalizer.xpm"\
+	icon16x16="/usr/share/pixmaps/kpersonalizer-16.xpm"\
+	command="/usr/bin/kpersonalizer"
+
+# Icon 32x32 kpersonalizer/cr32-app-kpersonalizer.png kpersonalizer.xpm
+# Icon 16x16 kpersonalizer/cr16-app-kpersonalizer.png kpersonalizer-16.xpm
--- kdebase-3.5.7.orig/debian/kfind.install
+++ kdebase-3.5.7/debian/kfind.install
@@ -0,0 +1,25 @@
+debian/tmp/usr/bin/kfind
+debian/tmp/usr/lib/kde3/libkfindpart.la
+debian/tmp/usr/lib/kde3/libkfindpart.so
+debian/tmp/usr/share/applications/kde/Kfind.desktop
+debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
+debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/delete.png
+debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/idea.png
+debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/info.png
+debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png
+debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/save.png
+debian/tmp/usr/share/apps/kfindpart/icons/locolor/22x22/actions/search.png
+debian/tmp/usr/share/doc/kde/HTML/en/kfind/common
+debian/tmp/usr/share/doc/kde/HTML/en/kfind/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kfind/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kfind/man-kfind.1.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kfind.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kfind.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kfind.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kfind.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kfind.png
+debian/tmp/usr/share/services/kfindpart.desktop
+debian/tmp/usr/share/servicetypes/findpart.desktop
+
+debian/icons/kfind.xpm		/usr/share/pixmaps
+debian/icons/kfind-16.xpm	/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/po/ro.po
+++ kdebase-3.5.7/debian/po/ro.po
@@ -0,0 +1,101 @@
+# Romanian translation of kdebase_4.
+# Copyright (C) 2006 THE kdebase_4'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kdebase_4 package.
+# mutulica <stan.ieugen@gmail.com>, 2006.
+# , fuzzy
+# mutulica <stan.ieugen@gmail.com>, 2006.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: kdebase_4 3.5.4-2\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-09 19:07+0200\n"
+"PO-Revision-Date: 2006-09-15 01:01+0300\n"
+"Last-Translator: Stan Ioan-Eugen <stan.ieugen@gmail.com>\n"
+"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid "Default display manager:"
+msgstr "Alegeţi administratorul de ecran implicit, pe care îl doriţi."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Un administrator de ecran este un program ce oferă capabilităţi de "
+"autentificare în mod grafic pentru Sistemul X Window."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Doar un singur administrator de ecran poate administra un server X dat, dar "
+"sunt instalaţi mai mulţi administratori. Alegeţi care administrator de ecran "
+"să ruleze implicit."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"(Simultan pot rula mai mulţi administratori de ecran dacă sunt configuraţi "
+"să administreze servere diferite; pentru a obţine acest lucru, configuraţi "
+"administratorul de ecran pentru această funcţie, editaţi scripturile de "
+"iniţiere din /etc/init.d, şi dezactivaţi opţiunea de verificare a "
+"administratorului de ecran implicit.)"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid "Stop the kdm daemon?"
+msgstr "Doriţi să opriţi demonul kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea "
+"pachetuluişi la eliminarea sa, dar se pare că acum administrează o sesiune X "
+"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o "
+"administrează va fi oprită. O alternativă ar fi să lăsaţi kdm să ruleze, iar "
+"noua versiune va ruladata viitoare când demonul va fi repornit."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea "
+"pachetuluişi la eliminarea sa, dar se pare că acum administrează o sesiune X "
+"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o "
+"administrează va fi oprită. O alternativă ar fi să lăsaţi kdm să ruleze, iar "
+"noua versiune va ruladata viitoare când demonul va fi repornit."
--- kdebase-3.5.7.orig/debian/po/fr.po
+++ kdebase-3.5.7/debian/po/fr.po
@@ -0,0 +1,115 @@
+# translation of fr.po to French
+# debconf templates for xorg-x11 package
+# French translation
+#
+# $Id: fr.po 1053 2006-01-10 19:20:06Z ender $
+#
+# Copyrights:
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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.
+#
+# Branden Robinson, 2000-2004.
+# Thomas Morin, 2001.
+# Patrice Karatchentzeff, 2001.
+# Jérôme Schell, 2001.
+# Jean-Christophe Dubacq, 2002.
+# Christian Perrier <bubulle@debian.org>, 2003, 2004, 2006, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-05 20:10+0200\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@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.11.4\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
+"\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Gestionnaire graphique de session par défaut :"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Un gestionnaire graphique de session est un programme qui permet de se "
+"connecter depuis le système X Window."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Un seul gestionnaire graphique de session peut s'occuper d'un serveur X "
+"donné, bien que plusieurs gestionnaires puissent être installés "
+"simultanément. Veuillez choisir celui qui sera utilisé par défaut."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Plusieurs gestionnaires graphiques peuvent être lancés en même temps, s'ils "
+"gèrent des serveurs X différents ; pour cela, configurez correctement chacun "
+"des gestionnaires graphiques, modifiez leurs scripts de lancement dans /etc/"
+"init.d, et désactivez le test de gestionnaire graphique par défaut."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Faut-il arrêter le démon kdm ?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Le gestionnaire de sessions KDE (kdm) est généralement arrêté lors de la mise "
+"à jour ou de la suppression du paquet. Cependant, il semble qu'il gère "
+"actuellement encore au moins une session X."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Si kdm est arrêté maintenant, toutes les sessions X qu'il gère seront "
+"terminées. L'autre possibilité est de laisser fonctionner kdm, la nouvelle "
+"version ne devenant active qu'au prochain redémarrage du démon."
+
--- kdebase-3.5.7.orig/debian/po/da.po
+++ kdebase-3.5.7/debian/po/da.po
@@ -0,0 +1,100 @@
+# translation of da.po to
+#
+#    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.
+#
+# Claus Hindsgaul <claus_h@image.dk>, 2004.
+# Sune Vuorela <Sune@Vuorela.dk>, 2007.
+# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: da\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-09 19:07+0200\n"
+"PO-Revision-Date: 2007-04-09 20:27+0200\n"
+"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
+"Language-Team: Danish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Standard logind-h�ndtering:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"En logind-h�ndtering er et program, der giver mulighed for grafisk logind "
+"under X-Windowsystemet."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"En given X-server kan kun h�ndteres af �n logind-h�ndtering, men der er "
+"installeret flere logind-h�ndteringspakker. V�lg den logind-h�ndtering, der "
+"som udgangspunkt skal k�res."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Flere logind-h�ndteringer kan godt k�re samtidig, hvis de er sat op til at "
+"h�ndtere forskellige servere. For at opn� dette, skal du s�tte logind-"
+"h�ndteringerne op til det, ved at redigere deres respektive scripter i /etc/"
+"init.d, hvor du skal deaktivere tjekket for en standard-logindh�ndtering."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Stop kdm-d�monen?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Skrivebordsh�ndterings-d�monen kdm stoppes typisk ved opgradering og "
+"fjernelse af pakken, men den lader til at v�re besk�ftiget med mindst �n "
+"k�rende X-session."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Hvis kdm stoppes nu, vil de X-sessioner, den h�ndterer, "
+"blive afsluttet. Ellers kan du lade kdm k�re. S� vil den nye version f�rst "
+"tage over n�r d�monen genstartes."
+
--- kdebase-3.5.7.orig/debian/po/el.po
+++ kdebase-3.5.7/debian/po/el.po
@@ -0,0 +1,135 @@
+# debconf templates for xorg-x11 package
+# Greek translation
+#
+# $Id: el.po 1042 2006-01-09 07:55:08Z ender $
+#
+# Copyrights:
+# Branden Robinson, 2000-2004
+# Konstantinos Margaritis <markos@debian.org>, 2004
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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: el\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2005-12-19 18:40+0200\n"
+"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
+"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid "Default display manager:"
+msgstr "Επιλέξτε τον επιθυμητό διαχειριστή οθόνης."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Ο διαχειριστής οθόνης είναι ένα πρόγραμμα που προσφέρει τη δυνατότητα "
+"σύνδεσης στο σύστημα παραθύρων X μέσω γραφικού περιβάλλοντος."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Μόνο ένας διαχειριστής οθόνης μπορεί να χειρίζεται ένα συγκεκριμένο "
+"εξυπηρετητή X, αλλά περισσότεροι από ένας είναι εγκατεστημένοι. Παρακαλώ "
+"επιλέξτε τον διαχειριστή οθόνης που θα εκτελείται ως προκαθορισμένος."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Πολλαπλοί διαχειριστές οθόνης μπορούν να τρέχουν ταυτόχρονα, αν έχουν "
+"ρυθμιστεί να χειρίζονται διαφορετικούς διακομιστές X. Για να επιτευχθεί "
+"αυτό, ρυθμίστε τους διαχειριστές οθόνης κατάλληλα, επεξεργαστείτε τα αρχεία "
+"εκκίνησής τους στον κατάλογο /etc/init.d, και απενεργοποιήστε τον έλεγχο για "
+"προκαθορισμένο διαχειριστή οθόνης."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid "Stop the kdm daemon?"
+msgstr "Θέλετε να σταματήσετε να χρησιμοποιείτε τον δαίμονα kdm;"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (kdm) "
+"διακόπτεται με κάθε αναβάθμιση και διαγραφή του πακέτου, αλλά στη "
+"συγκεκριμένη περίπτωση φαίνεται ότι διαχειρίζεται ήδη τουλάχιστον μια "
+"συνεδρία των X (X session). Αν ο kdm τερματιστεί τώρα, οποιεσδήποτε "
+"συνεδρίες των X χειρίζεται θα τερματιστούν επίσης. Διαφορετικά, μπορείτε να "
+"αφήσετε τον kdm να συνεχίσει τη λειτουργία του και η νέα έκδοση να "
+"χρησιμοποιηθεί την επόμενη φορά που θα τρέξει ο δαίμονας."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (kdm) "
+"διακόπτεται με κάθε αναβάθμιση και διαγραφή του πακέτου, αλλά στη "
+"συγκεκριμένη περίπτωση φαίνεται ότι διαχειρίζεται ήδη τουλάχιστον μια "
+"συνεδρία των X (X session). Αν ο kdm τερματιστεί τώρα, οποιεσδήποτε "
+"συνεδρίες των X χειρίζεται θα τερματιστούν επίσης. Διαφορετικά, μπορείτε να "
+"αφήσετε τον kdm να συνεχίσει τη λειτουργία του και η νέα έκδοση να "
+"χρησιμοποιηθεί την επόμενη φορά που θα τρέξει ο δαίμονας."
+
+#, fuzzy
+#~ msgid ""
+#~ "The X display manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session."
+#~ msgstr ""
+#~ "Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (kdm) "
+#~ "διακόπτεται με κάθε αναβάθμιση και διαγραφή του πακέτου, αλλά στη "
+#~ "συγκεκριμένη περίπτωση φαίνεται ότι διαχειρίζεται ήδη τουλάχιστον μια "
+#~ "συνεδρία των X (X session). Αν ο kdm τερματιστεί τώρα, οποιεσδήποτε "
+#~ "συνεδρίες των X χειρίζεται θα τερματιστούν επίσης. Διαφορετικά, μπορείτε "
+#~ "να αφήσετε τον kdm να συνεχίσει τη λειτουργία του και η νέα έκδοση να "
+#~ "χρησιμοποιηθεί την επόμενη φορά που θα τρέξει ο δαίμονας."
--- kdebase-3.5.7.orig/debian/po/tr.po
+++ kdebase-3.5.7/debian/po/tr.po
@@ -0,0 +1,97 @@
+# Turkish translation of kdebase.
+# This file is distributed under the same license as the kdebase package.
+# Recai Oktaş <roktas@omu.edu.tr>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdebase\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-09 19:07+0200\n"
+"PO-Revision-Date: 2004-05-10 18:07+0300\n"
+"Last-Translator: Recai Oktaş <roktas@omu.edu.tr>\n"
+"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid "Default display manager:"
+msgstr "Kullanmak istediğiniz öntanımlı ekran yöneticisini seçin."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Ekran yöneticisi, X Window Sistemi'ne grafik arayüz ile giriş yapmayı sağlar."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Sadece bir ekran yöneticisi verilen X sunucusunu yönetebilir, ancak birden "
+"fazla ekran yöneticisi kurulu durumda.  Lütfen, öntanımlı olarak çalıştırmak "
+"istediğiniz ekran yöneticisini seçin."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"(Eğer farklı sunucuları çalıştırmak için ayarlanırsa birden fazla ekran "
+"yöneticisi kullanılabilir.  Bunun için /etc/init.d içindeki ilgili betikleri "
+"değiştirin ve öntanımlı ekran yöneticisini denetleyen işlevleri devre dışı "
+"bırakın.)"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid "Stop the kdm daemon?"
+msgstr "kdm servisini durdurmak istiyor musunuz?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında "
+"genellikle durdurulur.  Fakat öyle görünüyor ki kdm, çalışan (en az) bir X "
+"oturumunu yönetiyor.  Eğer kdm şimdi durdurulursa, yönetilen X oturumları da "
+"sonlandırılacaktır.  Böyle yapmak yerine kdm'i çalışır vaziyette "
+"bırakabilirsiniz.  Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında "
+"etkin olacaktır."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında "
+"genellikle durdurulur.  Fakat öyle görünüyor ki kdm, çalışan (en az) bir X "
+"oturumunu yönetiyor.  Eğer kdm şimdi durdurulursa, yönetilen X oturumları da "
+"sonlandırılacaktır.  Böyle yapmak yerine kdm'i çalışır vaziyette "
+"bırakabilirsiniz.  Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında "
+"etkin olacaktır."
--- kdebase-3.5.7.orig/debian/po/sv.po
+++ kdebase-3.5.7/debian/po/sv.po
@@ -0,0 +1,126 @@
+# debconf templates for xorg-x11 package
+# Swedish translation
+#
+# $Id: sv.po 1042 2006-01-09 07:55:08Z ender $
+#
+# Copyrights:
+# Branden Robinson, 2000-2004
+# André Dahlqvist, 2001
+# Peter Toneby, 2002
+# Mikael Hedin, 2002
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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: xserver-xorg\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-05 09:38+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: SWEDEN\n"
+"X-Poedit-SourceCharset: iso-8859-1\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Standarddisplayhanterare:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "A display manager is a program that provides graphical login capabilities for the X Window System."
+msgstr "En displayhanterare är ett program som tillhandahåller grafiska inloggningsmöjligheter för X Window System."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default."
+msgstr "Endast en displayhanterare kan hantera en angiven X-server men flera displayhanterarpaket är installerade. Välj vilken displayhanterare som skall köras som standard."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager."
+msgstr "Flera displayhanterare kan köras samtidigt om de är konfigurerade att hantera olika servrar. För att uppnå detta ska du konfigurera displayhanterarnas på lämpligt sätt, redigera dess init-skript under /etc/init.d och inaktivera kontrollen efter en standarddisplayhanterare."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Stoppa kdm-demonen?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session."
+msgstr "K Desktop manager-demonen (kdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar åtminstone en körande X-session."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted."
+msgstr "Om kdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om inte kommer den nya versionen att bli aktiverad nästa gång som demonen startas om."
+
+#~ msgid ""
+#~ "The X display manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session."
+#~ msgstr ""
+#~ "X-displayhanterardemonen (kdm) stoppas vanligtvis vid paketuppgradering "
+#~ "och borttagning men det verkar som om den hanterar åtminstone en körande "
+#~ "X-session."
+#~ msgid "Select the desired default display manager."
+#~ msgstr "Välj den önskade standard fönsterhanteraren."
+#~ msgid ""
+#~ "Only one display manager can manage a given X server, but multiple "
+#~ "display manager packages are installed.  Please select which display "
+#~ "manager should run by default."
+#~ msgstr ""
+#~ "Bara en fönsterhanterare kan hantera en angiven X-server men paket för "
+#~ "multipla fönsterhanterare är installerad.  Välj vilken fönsterhanterare "
+#~ "som ska köras som standard."
+#~ msgid ""
+#~ "(Multiple display managers can run simultaneously if they are configured "
+#~ "to manage different servers; to achieve this, configure the display "
+#~ "managers accordingly, edit each of their init scripts in /etc/init.d, and "
+#~ "disable the check for a default display manager.)"
+#~ msgstr ""
+#~ "(Multipla fönsterhanterare kan köras simultant om de är konfigurerade att "
+#~ "hantera olika servrar, för att göra detta, konfigurera fönsterhanterarna "
+#~ "genom att ändra respektives init-skript i /etc/init.d och stäng av "
+#~ "kontrollen för standard fönsterhanterare.)"
+#~ msgid "Do you wish to stop the kdm daemon?"
+#~ msgstr "Vill du stoppa kdm-daemonen?"
+#~ msgid ""
+#~ "The K Desktop manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session. If kdm is stopped now, any X sessions it manages will be "
+#~ "terminated. Otherwise you may leave kdm running, and the new version will "
+#~ "take effect the next time the daemon is restarted."
+#~ msgstr ""
+#~ "Daemonen (kdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering "
+#~ "och avinstallation av paketet men det verkar som om den hanterar "
+#~ "åtminstone en körande X-session. Om kdm stoppas nu kommer de X-sessioner "
+#~ "den hanterar att avslutas. Annars kan du lämna kdm körande och den nya "
+#~ "versioner blir aktiverad nästa gång daemonen startas om."
+
--- kdebase-3.5.7.orig/debian/po/ko.po
+++ kdebase-3.5.7/debian/po/ko.po
@@ -0,0 +1,85 @@
+# Korean translations for kde-base package
+# kde-base 패키지에 대한 한국어 번역문.
+# Copyright (C) 2007 THE kde-base'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kde-base package.
+# Sunjae Park <darehanl@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kde-base\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-07 19:55-0400\n"
+"Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
+"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\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
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "기본 화면관리자:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"화면 관리자는 그래픽 로그인 기능을 제공하는 X 윈도우 시스템을 위한 프로그램"
+"입니다."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"한 화면관리자는 X 서버 하나만을 관리할 수 있는데도 설치된 화면 관리자가 "
+"여러 개 있습니다. 기본으로 사용할 화면관리자를 선택해주십시오."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"서로 다른 서버를 관리하도록 설정할 경우 화면관리자를 동시에 여러 개 실행시킬 "
+"수 있습니다. 이를 위해서는 각각의 화면관리자를 적절히 설정하고 /etc/init.d에 "
+"에 있는 init 스크립트를 수정해서 기본 화면관리자 검사를 비활성하십시오."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "kdm 데몬을 중지시킬까요?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"K 데스크탑 관리자(kdm) 데몬은 일반적으로 꾸러미를 설치하고 업그레이드할 때 "
+"중지되지만 현재 하나 이상의 X 세션을 관리하는 중인 것 같습니다."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"kdm을 지금 중지시키면 kdm이 관리하고 있는 X 세션은 모두 중단됩니다. 지금 중지"
+"시키지 않으면 새로 설치한 버전은 데몬을 다시 시작할 때부터 사용됩니다."
--- kdebase-3.5.7.orig/debian/po/ca.po
+++ kdebase-3.5.7/debian/po/ca.po
@@ -0,0 +1,146 @@
+# translation of ca.po to Catalan
+# debconf templates for xorg-x11 package
+# Catalan translation
+#
+# $Id: ca.po 1273 2006-02-21 10:58:12Z ender $
+#
+# Copyrights:
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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.
+#
+# Branden Robinson, 2000-2004.
+# Ivan Vilata i Balaguer <net.selidor@ivan>, 2002-2007.
+# Leopold Palomo <lepalom@wol.es>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: ca\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-12 12:50+0200\n"
+"Last-Translator: Leopold Palomo <lepalom@wol.es>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Escolliu el gestor de pantalla:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Un gestor de pantalla (display manager) és un programa que proporciona la "
+"capacitat d’un quadre gràfic d’entrada (login) a l’X Window System."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Només un gestor de pantalla pot gestionar un servidor X determinat, però "
+"teniu instaŀlats diversos paquets de gestor de pantalla.  Per favor, "
+"escolliu quin gestor de pantalla s'executarà per defecte."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Poden haver diversos gestors de pantalla corrent simultàniament si es "
+"configuren per a gestionar diferents servidors; per a aconseguir açò, "
+"configureu adequadament els gestors de pantalla, editeu cadascun dels seus "
+"scripts d’inici en «/etc/init.d», i deshabiliteu la comprovació de gestor de "
+"pantalla per defecte."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Voleu detenir el dimoni «kdm»?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"El dimoni gestor de pantalla de KDE, (kdm), sol ser detingut en actualitzar-ne "
+"i eliminar-ne el paquet, però sembla que ara està gestionant almenys una "
+"sessió X activa."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Si es deté «kdm» ara, terminaran totes les sessions X que està gestionant.  "
+"Altrament, podeu deixar corrent «kdm», i la nova versió surtirà efecte a la "
+"següent volta que el dimoni es reinicie."
+
+msgid ""
+"The X display manager (kdm) daemon is typically stopped on package "
+"upgrade and removal, but it appears to be managing at least one running X "
+"session."
+msgstr ""
+"El dimoni gestor de pantalla d’X, «kdm», sol ser detingut en actualitzar‐ne"
+"i eliminar‐ne el paquet, però sembla que ara està gestionant almenys "
+"una sessió X activa."
+
+msgid "Select the desired default display manager."
+msgstr "Seleccioneu el quadre gràfic d'entrada per defecte que desitgeu."
+
+msgid ""
+"Only one display manager can manage a given X server, but multiple "
+"display manager packages are installed.  Please select which display "
+"manager should run by default."
+msgstr ""
+"Un quadre gràfic d'entrada sols pot gestionar alhora un únic servidor X, "
+"però podeu tindre instal·lats múltiples paquets de quadre gràfic "
+"d'entrada. Si us plau, seleccioneu quin quadre gràfic d'entrada desitgeu "
+"que s'executi per defecte."
+
+msgid ""
+"(Multiple display managers can run simultaneously if they are configured "
+"to manage different servers; to achieve this, configure the display "
+"managers accordingly, edit each of their init scripts in /etc/init.d, and "
+"disable the check for a default display manager.)"
+msgstr ""
+"(Es poden executar múltiples quadres gràfics d'entrada simultàniament, "
+"però sols si aquests estan configurats per a gestionar diferents "
+"servidors X; per a fer això, configureu els quadres gràfics d'entrada "
+"conseqüentment, editeu cadascun dels seus scripts d'arrencada en /etc/init.d "
+"i deshabiliteu la comprovació per a un quadre gràfic d'entrada per "
+"defecte.)"
+
--- kdebase-3.5.7.orig/debian/po/zh_CN.po
+++ kdebase-3.5.7/debian/po/zh_CN.po
@@ -0,0 +1,100 @@
+# debconf templates for kdebase package
+# simplified Chinese translation
+#
+# Copyrights:
+# Branden Robinson, 2000-2004
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2005
+# Ming Hua <minghua@rice.edu>, 2005,2007
+#
+# This file is distributed under the same license as the kdm package.
+# Please see debian/copyright.
+#
+#    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: 4:3.5.5a.dfsg.1-6\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-09 19:23-0500\n"
+"Last-Translator: Ming Hua <minghua@rice.edu>\n"
+"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\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
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "默认显示管理器："
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr "显示管理器是为 X 窗口系统提供图形界面登录模式的程序。"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"一个给定的 X 服务器只能由一个显示管理器来管理，但是系统中已经安装了多个显示管"
+"理器软件包。请选择一个作为默认的显示管理器。"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"如果多个显示管理器被配置为分别管理不同的 X 服务器，那么它们可以同时运行。要做"
+"到这一点，您要按照需求分别对各显示管理器进行设置，编辑它们在 /etc/init.d 目录"
+"下的 init 脚本，并且关闭对默认显示管理器的检查。"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "停止 kdm 守护进程吗？"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"K 桌面管理器 (kdm) 守护进程通常会在软件包升级和卸载时被停止，但看起来它目前在"
+"管理一个或多个正在运行的 X 会话。"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"如果 kdm 现在就被停止，它所管理的全部 X 会话都会被中止。如果不停止 kdm，新安"
+"装的版本将会在守护进程下次重新启动时生效。"
--- kdebase-3.5.7.orig/debian/po/it.po
+++ kdebase-3.5.7/debian/po/it.po
@@ -0,0 +1,110 @@
+# debconf templates for xorg-x11 package
+# Italian translation
+#
+# $Id: it.po 1042 2006-01-09 07:55:08Z ender $
+#
+# Copyrights:
+# Branden Robinson, 2000-2004
+# Matteo Dell'Amico, 2002
+# Emanuele Aina, 2002
+# Luca Monducci, 2004
+# Danilo Piazzalunga, 2004-2007
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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: xorg-x11 6.8.2.dfsg.1-10\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-07 13:30+0200\n"
+"Last-Translator: Danilo Piazzalunga <danilopiazza@gmail.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Display manager predefinito."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Un display manager è un programma che fornisce capacità di login grafico per "
+"il sistema X Window."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Solo un display manager può gestire un dato server X, ma sono installati più "
+"pacchetti di display manager. Scegliere il display manager da usare come "
+"predefinito."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Possono essere eseguiti più display manager contemporaneamente, a patto che "
+"siano impostati per gestire server diversi; per fare questo, configurare i "
+"display manager in maniera appropriata, modificare ciascuno dei loro script "
+"di avvio in /etc/init.d e disabilitare il controllo per un display manager "
+"predefinito."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Arrestare il demone kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Il demone del display manager KDE (kdm) viene tipicamente fermato in fase "
+"di aggiornamento o rimozione del pacchetto, ma pare che al momento stia "
+"gestendo almeno una sessione attiva di X."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Se kdm viene arrestato ora, anche tutte le sessioni di X che gestisce "
+"verranno terminate. In alternativa, la nuova versione sarà usata a partire "
+"dal prossimo avvio del demone."
--- kdebase-3.5.7.orig/debian/po/POTFILES.in
+++ kdebase-3.5.7/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] kdm.templates
--- kdebase-3.5.7.orig/debian/po/ja.po
+++ kdebase-3.5.7/debian/po/ja.po
@@ -0,0 +1,156 @@
+# debconf templates for xorg-x11 package
+# Japanese translation
+#
+# $Id: ja.po 1063 2006-01-11 10:46:20Z ender $
+#
+# Copyrights:
+# Branden Robinson, 2000-2004
+# ISHIKAWA Mutsumi, 2001
+# Tomohiro KUBOTA, 2001, 2002
+# Kenshi Muto, 2001, 2003, 2004
+# Takeo Nakano, 2001, 2003
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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: kdebase 4:3.5.5a\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-05 19:02+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org> and ISHIKAWA Mutsumi <ishikawa@debian.org>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "デフォルトのディスプレイマネージャ:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"ディスプレイマネージャとは、X Window System 上でのグラフィカルなログイン機能"
+"を提供するものです。"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"ひとつの X サーバを管理できるのはひとつのディスプレイマネージャだけですが、"
+"ディスプレイマネージャパッケージが複数インストールされています。どのディスプ"
+"レイマネージャをデフォルトで起動させるか選択して下さい。"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"異なるサーバを担当するように設定すれば、複数のディスプレイサーバは同時に動作"
+"できます。そのようにするには、/etc/init.d にある各ディスプレイマネージャの初"
+"期化スクリプトを編集し、デフォルトディスプレイマネージャのチェックを無効にし"
+"て下さい。"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "kdm デーモンを停止しますか?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr "K デスクトップマネージャ (kdm) デーモンは、普通、パッケージの更新や削除の際に停止させられます。しかし kdm は現在動作中の X セッションを最低ひとつは管理しているようです。"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"いま kdm を停止すると、この kdm が管理している X セッションは停止します。ある"
+"いは次にデーモンをリスタートしたときに新しいバージョンの kdm を有効にすること"
+"もできます。"
+
+#~ msgid ""
+#~ "The X display manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session."
+#~ msgstr ""
+#~ "X ディスプレイマネージャ (kdm) デーモンは、普通、パッケージの更新や削除の"
+#~ "際に停止させられます。しかし kdm は現在動作中の X セッションを最低ひとつは"
+#~ "管理しているようです。"
+
+#~ msgid "Select the desired default display manager."
+#~ msgstr "利用したいデフォルトのディスプレイマネージャを選択してください。"
+
+#~ msgid ""
+#~ "Only one display manager can manage a given X server, but multiple "
+#~ "display manager packages are installed.  Please select which display "
+#~ "manager should run by default."
+#~ msgstr ""
+#~ "1 つのディスプレイマネージャだけが与えられた X サーバを管理できますが、複"
+#~ "数のデ\n"
+#~ "ィスプレイマネージャパッケージをインストールすることはできます。デフォルト"
+#~ "で実行したいディスプレイマネージャを選んでください。"
+
+#~ msgid ""
+#~ "(Multiple display managers can run simultaneously if they are configured "
+#~ "to manage different servers; to achieve this, configure the display "
+#~ "managers accordingly, edit each of their init scripts in /etc/init.d, and "
+#~ "disable the check for a default display manager.)"
+#~ msgstr ""
+#~ "(複数のディスプレイマネージャは、もし異なるサーバを管理するよう設定されて"
+#~ "いるの\n"
+#~ "であれば同時に実行できます。これをするためには、ディスプレイマネージャを適"
+#~ "切に設定して、/etc/init.d にある各 init スクリプトを編集し、デフォルトの"
+#~ "ディスプレイマネージャの確認を無効にしてください。)"
+
+#~ msgid "Do you wish to stop the kdm daemon?"
+#~ msgstr "kdm デーモンを停止したいですか?"
+
+#~ msgid ""
+#~ "The K Desktop manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session. If kdm is stopped now, any X sessions it manages will be "
+#~ "terminated. Otherwise you may leave kdm running, and the new version will "
+#~ "take effect the next time the daemon is restarted."
+#~ msgstr ""
+#~ "K Desktop manager (kdm) デーモンは通常、パッケージの更新および削除時に停止"
+#~ "しますが、少なくとも 1 つの動作中の X セッションを管理しているようです。"
+#~ "kdm を今停止すると、これが管理する X セッションは殺されます。その代わり"
+#~ "に、kdm を動作しているままにしておき、新しいバージョンは次回のデーモンの再"
+#~ "起動時に効果を表すようにできます。"
--- kdebase-3.5.7.orig/debian/po/pt_BR.po
+++ kdebase-3.5.7/debian/po/pt_BR.po
@@ -0,0 +1,92 @@
+# kdebase Brazilian Portuguese translation
+# Copyright (C) 2007 THE kdebase'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kdebase package.
+# Please see debian/copyright.
+#
+# Branden Robinson, 2000-2004.
+# Gustavo Noronha Silva, 2001.
+# Henrique de Moraes Holschuh, 2001.
+# André Luís Lopes <andrelop@debian.org>, 2001-2005.
+# Eder L. Marques <frolic@debian-ce.org>, 2007.
+msgid ""
+msgstr "pt_BR utf-8\n"
+"Project-Id-Version: kdebase 4:3.5.5a.dfsg.1-6\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-24 15:28-0300\n"
+"Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
+"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Gerenciador de sessão padrão:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Um gerenciador de sessão é um programa que provê capacidades de login "
+"gráfico para o 'X Window System'."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Somente um gerenciador de sessão pode gerenciar um dado servidor X, mas "
+"diversos pacotes de gerenciadores de sessão estão instalados. Por favor "
+"selecione qual gerenciador de sessão deverá ser executado por padrão."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Múltiplos gerenciadores de sessão podem ser executados simultaneamente se "
+"eles estão configurados para gerenciar servidores diferentes; para conseguir "
+"isso, configure os gerenciadores de sessão apropriadamente, edite cada um "
+"dos seus scripts de inicialização em /etc/init.d, e desabilite a checagem "
+"por um gerenciador de sessão padrão."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Deseja parar o daemon kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr "O K Desktop manager (kdm) é tipicamente parado em atualizações e "
+"remoções de pacotes, mas parece que ele está gerenciando pelo menos uma " 
+"seção X em execução."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Caso o kdm seja parado agora, quaisquer sessões X que ele esteja gerenciando "
+"serão encerradas. Caso contrário a nova versão terá efeito na próxima vez "
+"que o daemon for reiniciado."
--- kdebase-3.5.7.orig/debian/po/ru.po
+++ kdebase-3.5.7/debian/po/ru.po
@@ -0,0 +1,113 @@
+# translation of ru.po to Russian
+# debconf templates for xorg-x11 package
+# Russian translation
+#
+# $Id: ru.po 1042 2006-01-09 07:55:08Z ender $
+#
+# Copyrights:
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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.
+#
+# Branden Robinson, 2000-2004.
+# Ilgiz Kalmetev, 2002, 2003.
+# Serge Winitzki, 2003.
+# asv <alyoshin@pisem.net>, 2007.
+# Yuri Kozlov <kozlov.y@gmail.com>, 2005, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: xserver-xorg_debian_po_ru\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-11 20:50+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@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.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Менеджер дисплеев по умолчанию:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Менеджер дисплеев -- это программа с графическим интерфейсом, которая "
+"обеспечивает возможность входа в систему через X Window System."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Данный X-сервер может обслуживать только один менеджер дисплеев, но "
+"установлено несколько пакетов менеджеров дисплеев. Пожалуйста, выберите "
+"менеджер дисплеев, который должен запускаться по умолчанию."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Несколько менеджеров дисплеев могут запускаться одновременно, если они "
+"настроены на обслуживание разных серверов; чтобы добиться этого,  настройте "
+"менеджеры дисплеев соответственно, отредактируйте их сценарии инициализации "
+"в /etc/init.d и отключите проверку менеджера дисплеев по умолчанию."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Остановить сервер-демон kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Сервер-демон менеджера K Desktop (kdm) обычно останавливают при обновлении "
+"или удалении пакета, но, кажется, что kdm сейчас управляет по крайней мере "
+"одним X-сеансом."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Если сейчас остановить kdm, то все управляемые им X-сеансы будут прерваны. "
+"Или вы можете не останавливать kdm, и тогда новая версия будет загружена "
+"тогда, когда kdm снова перезапустят."
+
--- kdebase-3.5.7.orig/debian/po/es.po
+++ kdebase-3.5.7/debian/po/es.po
@@ -0,0 +1,100 @@
+# Translation of kdebase to Spanish
+# This file is distributed under the same license as the kdebase package.
+#
+#  Traductores, si no conocen el formato PO, merece la pena leer la
+#  documentación de gettext, especialmente las secciones dedicadas a este
+#  formato, por ejemplo ejecutando:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+#   http://www.debian.org/intl/spanish/
+#   especialmente las notas y normas de traducción en
+#   http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+#   /usr/share/doc/po-debconf/README-trans
+#   o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Si tiene dudas o consultas sobre esta traducción consulte con el último
+# traductor (campo Last-Translator) y ponga en copia a la lista de
+# traducción de Debian al español (<debian-l10n-spanish@lists.debian.org>)
+#
+# Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>, 2003
+# Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: es\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-09 19:07+0200\n"
+"PO-Revision-Date: 2007-04-13 18:37+0200\n"
+"Last-Translator: Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>\n"
+"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Gestor de sesiones predefinido:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Un gestor de sesiones es un programa que le permite ingresar"
+"gr�ficamente en el sistema desde el entorno X Window."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr "Cada servidor X s�lo puede ser gestionado por un �nico gestor de sesiones, pero hay instalados varios paquetes de gestores de sesiones. Por favor, seleccione qu� gestor desea utilizar por omisi�n."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Se pueden ejecutar varios gestores de sesiones simult�neamente si se "
+"configuran para que gestionen servidores diferentes. Para ello, configure cada uno de los gestores de sesiones apropiadamente, edite sus guiones de inicio en /etc/init.d, y deshabilite la comprobaci�n de un gestor de sesiones predeterminado."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "�Desea detener el daemon kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (kdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr "Si detiene kdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener kdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon."
+
--- kdebase-3.5.7.orig/debian/po/nl.po
+++ kdebase-3.5.7/debian/po/nl.po
@@ -0,0 +1,125 @@
+# debconf templates for xorg-x11 package
+# Dutch translation
+#
+# $Id: nl.po 1042 2006-01-09 07:55:08Z ender $
+#
+# Copyrights:
+# Branden Robinson, 2000-2004
+# Wouter Verhelst, 2002
+# Bart Cornelis, 2003
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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: kdm\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-05 17:35+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Standaard beeldschermbeheerder:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "A display manager is a program that provides graphical login capabilities for the X Window System."
+msgstr "Een beeldschermbeheerder is een programma waarmee u zich grafisch op het systeem kunt aanmelden, waarna u in de grafische omgeving (het X Window System) terecht komt."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default."
+msgstr "Elke X-server kan door slechts één beeldschermbeheerder beheerd worden, hoewel er meerdere beeldschermbeheerders geïnstalleerd kunnen zijn. Welke beeldschermbeheerder dient standaard gebruikt te worden?"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager."
+msgstr "Het is mogelijk om meerdere beeldschermbeheerders tegelijk te draaien zolang deze verschillende servers beheren. Om dat te bereiken dient u de beeldschermbeheerders overeenkomstig in te stellen door in hun init-scripts (in /etc/init.d) de controle of ze de standaard beeldschermbeheerder zijn uit te schakelen."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Wilt u de kdm-achtergronddienst stoppen?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session."
+msgstr "Normaal wordt de kdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket kdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted."
+msgstr "Als kdm nu gestopt wordt, worden alle door kdm beheerde X-sessies afgesloten. Als u kdm nu laat draaien wordt de nieuwe versie pas actief de eerstvolgende keer dat de achtergronddienst herstart wordt. "
+
+#~ msgid ""
+#~ "The X display manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session."
+#~ msgstr ""
+#~ "Normaal wordt de beeldschermbeheerder (kdm) gestopt bij opwaardering en "
+#~ "verwijdering van dit pakket; momenteel is er echter minstens één lopende "
+#~ "X-sessie actief."
+#~ msgid "Select the desired default display manager."
+#~ msgstr "Selecteer de gewenste standaard weergavebeheerder."
+#~ msgid ""
+#~ "Only one display manager can manage a given X server, but multiple "
+#~ "display manager packages are installed.  Please select which display "
+#~ "manager should run by default."
+#~ msgstr ""
+#~ "Er kan maar één weergavebeheerder een gegeven X-server beheren, maar er "
+#~ "zijn meerdere weergavebeheerder-pakketten geïnstalleerd. Selecteer welke "
+#~ "weergavebeheerder standaard moet worden uitgevoerd."
+#~ msgid ""
+#~ "(Multiple display managers can run simultaneously if they are configured "
+#~ "to manage different servers; to achieve this, configure the display "
+#~ "managers accordingly, edit each of their init scripts in /etc/init.d, and "
+#~ "disable the check for a default display manager.)"
+#~ msgstr ""
+#~ "(Er kunnen meerdere weergavebeheerders tegelijk worden uitgevoerd als ze "
+#~ "geconfigureerd zijn om verschillende servers te beheren; om dit te "
+#~ "bereiken, configureert u de weergavebeheerders op de gepaste wijze, "
+#~ "bewerkt u hun startscripts in /etc/init.d en schakelt u de controle voor "
+#~ "een standaard weergavebeheerder uit.)"
+#~ msgid "Do you wish to stop the kdm daemon?"
+#~ msgstr "Wilt u de kdm-achtergronddienst stoppen?"
+#~ msgid ""
+#~ "The K Desktop manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session. If kdm is stopped now, any X sessions it manages will be "
+#~ "terminated. Otherwise you may leave kdm running, and the new version will "
+#~ "take effect the next time the daemon is restarted."
+#~ msgstr ""
+#~ "De K Desktop manager (kdm) achtergronddienst wordt typisch gestopt bij "
+#~ "pakketopwaarderingen en -verwijderingen, maar het blijkt minstens één "
+#~ "actieve X-sessie te beheren. Als kdm nu wordt gestopt, dan zullen alle X-"
+#~ "sessies die het beheert worden beëindigd. Anders kunt u kdm laten draaien "
+#~ "en zal de nieuwe versie gebruikt worden wanneer de achtergronddienst de "
+#~ "volgende keer wordt gestart."
+
--- kdebase-3.5.7.orig/debian/po/ml.po
+++ kdebase-3.5.7/debian/po/ml.po
@@ -0,0 +1,87 @@
+# Malayalam translation of kdm debconf template.
+# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kdm package.
+# Praveen|പ്രവീണ്‍ A|എ <pravi.a@gmail.com>, Anivar|അനിവര്‍ Aravind|അരവിന്ദ് <anivar@movingrepublic.org> 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdm 1.0\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-03-23 09:46+0530\n"
+"Last-Translator: Praveen|പ്രവീണ്‍ A|എ <pravi.a@gmail.com>\n"
+"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
+"discuss@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "ഡിഫാള്‍ട്ടായി വേണ്ട പ്രദര്‍ശന മാനേജര്‍:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"ഗ്രാഫിക്കലായി അകത്ത് കടക്കാനുള്ള കഴിവുകള്‍ നല്കുന്ന എക്സ് ജാലക സിസ്റ്റത്തിനുവേണ്ടിയുള്ള ഒരു പ്രോഗ്രാമാണ് പ്രദര്‍ശന മാനേജര്‍."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"ഏതെങ്കിലും ഒരു എക്സ് സേവകനെ ഒരേ ഒരു പ്രദര്‍ശന മാനേജര്‍‌ക്കേ നിയന്ത്രിക്കാന്‍ പറ്റൂ, പക്ഷേ "
+"ഒന്നിലധികം പ്രദര്‍ശന മാനേജര്‍ പാക്കേജുകള്‍ ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടുണ്ട്. ദയവായി ഡിഫാള്‍ട്ടായി "
+"പ്രവര്‍ത്തിപ്പിക്കേണ്ട പ്രദര്‍ശന മാനേജര്‍ ഏതാണെന്ന് തിരഞ്ഞെടുക്കുക."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"വ്യത്യസ്ത സേവകരെ നിയന്ത്രണത്തിനായി ക്രമീകരിച്ചിട്ടുണ്ടെങ്കില്‍ ഒന്നിലധികം പ്രദര്‍ശന "
+"മാനേജര്‍മാര്‍ക്ക് ഒരേ സമയം പ്രവര്‍ത്തിക്കാം; ഇത് കൈവരിക്കണമെങ്കില്‍, പ്രദര്‍ശന മാനേജര്‍മാരെ "
+"ഉചിതമായി ക്രമീകരിക്കുകയും, അവയോരോന്നിന്റേയും /etc/init.d യിലുള്ള ഇനിറ്റ് സ്ക്രിപ്റ്റുകളെ "
+"മാറ്റുകയും, ഡിഫാള്‍ട്ട് പ്രദര്‍ശന മാനേജര്‍ക്കായുള്ള പരിശോധന നിര്‍ത്തിവെക്കുകയും ചെയ്യണം."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "kdm ഡീമണെ നിര്‍ത്തിക്കോട്ടെ?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"കെ പ്രദര്‍ശന മാനേജര്‍ (kdm) ഡീമണ്‍ സാധാരണയായി പാക്കേജ്  പുതുക്കലിന്റേയും നീക്കം "
+"ചെയ്യലിന്റേയും സമയത്താണ് നിര്‍ത്താറുള്ളത്, പക്ഷേ പ്രവര്‍ത്തിച്ചുകൊണ്ടിരിക്കുന്ന ഒരു എക്സ് "
+"സെഷനെയെങ്കിലും ഇപ്പോള്‍ ഇത് നിയന്ത്രിച്ചുകൊണ്ടിരിക്കുന്നത് പോലെ തോന്നുന്നു."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"kdm ഇപ്പോള്‍ നിര്‍ത്തുകയാണെങ്കില്‍, ഇത് നിയന്ത്രിച്ചുകൊണ്ടിരിക്കുന്ന എക്സ് സെഷനുകളും "
+"അവസാനിപ്പിക്കുന്നതായിരിക്കും. അല്ലെങ്കില്‍, അടുത്ത തവണ ഡീമണ്‍ വീണ്ടും തുടങ്ങുമ്പോള്‍ പുതിയ ലക്കം "
+"നിലവില്‍ വരും."
--- kdebase-3.5.7.orig/debian/po/pl.po
+++ kdebase-3.5.7/debian/po/pl.po
@@ -0,0 +1,108 @@
+#
+#    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: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-09 19:07+0200\n"
+"PO-Revision-Date: 2004-01-21 21:17+0100\n"
+"Last-Translator: Marcin Owsiany <porridge@debian.org>\n"
+"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid "Default display manager:"
+msgstr "Wybierz domy�lny display manager."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Display manager to program, kt�ry umo�liwia logowanie si� bezpo�rednio do "
+"systemu X Window."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Tylko jeden display manager mo�e kontrolowa� dany X serwer, ale "
+"zainstalowanych jest obecnie kilka takich program�w. Wybierz, kt�ry z nich "
+"ma by� uruchamiany domy�lnie."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+#, fuzzy
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"(Mo�na uruchomi� kilka program�w \"display manager\", ale musz� one "
+"kontrolowa� r�ne serwery; mo�na to osi�gn�� konfiguruj�c odpowiednio ka�dy "
+"z nich i wy��czaj�c w ich skryptach startowych fragment sprawdzaj�cy "
+"domy�lny display manager.)"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid "Stop the kdm daemon?"
+msgstr "Czy chcesz zatrzyma� daemona kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i "
+"usuwania pakietu kdm, ale wygl�da na to, �e w tej chwili zarz�dza on "
+"conajmniej jedn� sesj� X Window. Je�li zostanie on teraz zatrzymany, "
+"wszystkie zarz�dzane przez niego sesje zostan� przerwane. Mo�na jednak nie "
+"zatrzymywa� teraz tego daemona -- nowa wersja zacznie dzia�a� przy jego "
+"najbli�szym restarcie."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+#, fuzzy
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i "
+"usuwania pakietu kdm, ale wygl�da na to, �e w tej chwili zarz�dza on "
+"conajmniej jedn� sesj� X Window. Je�li zostanie on teraz zatrzymany, "
+"wszystkie zarz�dzane przez niego sesje zostan� przerwane. Mo�na jednak nie "
+"zatrzymywa� teraz tego daemona -- nowa wersja zacznie dzia�a� przy jego "
+"najbli�szym restarcie."
--- kdebase-3.5.7.orig/debian/po/gl.po
+++ kdebase-3.5.7/debian/po/gl.po
@@ -0,0 +1,135 @@
+# debconf templates for the kdebase package
+# Galician translation
+#
+# This file is distributed under the same license as the kdebase package.
+# Please see debian/copyright.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdebase\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-07 20:11+0200\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Xestor de pantalla por defecto:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Un xestor de pantalla é un programa que fornece capacidades de inicio de "
+"sesión gráfico para o sistema X Window."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Só un xestor de pantalla pode xestionar un servidor X determinado, pero hai "
+"varios paquetes de xestores de pantalla instalados. Escolla o xestor de "
+"pantalla que se debería executar por defecto."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Pódense executar varios xestores de pantalla ao mesmo tempo se se configuran "
+"para xestionar servidores distintos; para facelo, configure os xestores de "
+"pantalla, edite cada un dos scripts de inicio de /etc/init.d e desactive a "
+"comprobación do xestor de pantalla por defecto."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "¿Deter o servizo de kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Adoita se deter o servizo do xestor de pantalla de KDE (kdm) ao actualizar "
+"ou eliminar o paquete, pero semella que está a xestionar alomenos unha "
+"sesión X en execución."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Se se detén kdm agora, hase cortar calquera sesión X que xestione. Se non, a "
+"nova versión ha tomar efecto a próxima vez que reinicie o servizo."
+
+#~ msgid ""
+#~ "The X display manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session."
+#~ msgstr ""
+#~ "Adoita se deter o servizo do xestor de pantalla de X (kdm) ao actualizar "
+#~ "ou eliminar o paquete, pero semella que está a xestionar alomenos unha "
+#~ "sesión X en execución."
+
+#~ msgid "Select the desired default display manager."
+#~ msgstr "Escolla o xestor de pantalla por defecto que desexe."
+
+#~ msgid ""
+#~ "Only one display manager can manage a given X server, but multiple "
+#~ "display manager packages are installed.  Please select which display "
+#~ "manager should run by default."
+#~ msgstr ""
+#~ "Só un xestor de pantalla pode xestionar un servidor X determinado, pero "
+#~ "hai varios paquetes de xestores de pantalla instalados. Escolla o que se "
+#~ "debería executar por defecto."
+
+#~ msgid ""
+#~ "(Multiple display managers can run simultaneously if they are configured "
+#~ "to manage different servers; to achieve this, configure the display "
+#~ "managers accordingly, edit each of their init scripts in /etc/init.d, and "
+#~ "disable the check for a default display manager.)"
+#~ msgstr ""
+#~ "(Pódense executar varios xestores de pantalla ao mesmo tempo se se "
+#~ "configuran para xestionar servidores distintos; para facelo, configure os "
+#~ "xestores de pantalla, edite os seus scripts de inicio de /etc/init.d e "
+#~ "desactive a comprobación do xestor de pantalla por defecto)."
+
+#~ msgid "Do you wish to stop the kdm daemon?"
+#~ msgstr "¿Quere deter o daemon de kdm?"
+
+#~ msgid ""
+#~ "The K Desktop manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session. If kdm is stopped now, any X sessions it manages will be "
+#~ "terminated. Otherwise you may leave kdm running, and the new version will "
+#~ "take effect the next time the daemon is restarted."
+#~ msgstr ""
+#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (kdm) ao "
+#~ "actualizar ou eliminar o paquete, pero semella que está a xestionar "
+#~ "alomenos unha sesión X en execución. Se se detén kdm agora, hase cortar "
+#~ "calquera sesión X que xestione. Se non, pode deixar kdm a se executar, e "
+#~ "a nova versión ha tomar efecto a próxima vez que reinicie o daemon."
--- kdebase-3.5.7.orig/debian/po/eu.po
+++ kdebase-3.5.7/debian/po/eu.po
@@ -0,0 +1,110 @@
+# translation of kdebase-eu.po to librezale
+# debconf templates for xorg-x11 package
+# Euskara translation
+#
+# $Id: eu.po 490 2005-08-03 09:59:07Z ender $
+#
+# Copyright:
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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 is 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.
+#
+# Branden Robinson, 2000-2004.
+# Piarres Beobide <pi@beobide.net>, 2005, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdebase-eu\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-06 00:38+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: librezale <librezale@librezale.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Lehenetsiriko pantaila kudeatzailea:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Pantaila kudeatzailea X Leiho Sistemarako saio hasiera grafiko aukera ematen "
+"duen programa bat da."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Jakindako X zerbitzari bat pantaila kudeatzaile batek bakarrik kudea dezake, "
+"baina pantaila kudeatzaile anitz daude instalaturik.  Hautatu zein pantaila "
+"kudeatzaile erabili nahi duzun lehenetsi bezala."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Pantaila kudeatzaile anitz batera martxan egon daitezke, zerbitzari "
+"ezberdinak kudeatzeko konfiguraturik badaude; hau lortzeko, pantaila "
+"kudeatzaileak behar bezala konfiguratu eta /etc/init.d-eko init script-ean "
+"lehenetsiriko pantaila kudeatzailea arakatzeko aukera ezgaitu."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Kdm deabrua gelditu?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"K Pantaila Kudeatzaile (kdm) deabrua arruntean gelditu egiten da pakete "
+"bertsio berritze edo ezabaketa egiterakoan, baina dirudienez martxan dagoen "
+"X saio bat behintzat kudeatzen ari da."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"kdm orain gelditu ezkero, kudeatzen ari den edozein X saio itxi egingo da. "
+"Bestela kdm martxan utz dezakezu eta bertsio berria deabrua abiarazten den "
+"hurrengo aldian erabiliko da."
+
--- kdebase-3.5.7.orig/debian/po/templates.pot
+++ kdebase-3.5.7/debian/po/templates.pot
@@ -0,0 +1,73 @@
+# 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@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-09 19:07+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
--- kdebase-3.5.7.orig/debian/po/vi.po
+++ kdebase-3.5.7/debian/po/vi.po
@@ -0,0 +1,73 @@
+# Vietnamese Translation for kdebase.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2007.
+# 
+msgid ""
+""
+msgstr "Project-Id-Version: kdebase_4-3.5.7-1\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-09 19:07+0200\n"
+"PO-Revision-Date: 2007-05-31 15:16+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\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"
+"X-Generator: LocFactoryEditor 1.6.3b1"
+
+#.Type: select
+#.Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Bộ quản lý trình bày mặc định:"
+
+#.Type: select
+#.Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr "Bộ quản lý trình bày là chương trình cung cấp khả năng đăng nhập kiểu đồ hoạ cho Hệ thống Cửa sổ X."
+
+#.Type: select
+#.Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr "Chỉ một bộ quản lý trình bày có quyền quản lý trình phục vụ X đã cho, nhưng nhiều bộ quản lý đã được cài đặt. Hãy chọn bộ quản lý nào nên chạy theo mặc định."
+
+#.Type: select
+#.Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr "Nhiều bộ quản lý trình bày vẫn có thể chạy đồng thời nếu mỗi điều đã cấu hình để quản lý trình phục vụ riêng; để làm như thế, cấu hình mỗi bộ quản lý như vậy, sửa mỗi văn lệnh khởi chạy trong « /etc/init.d » và tắt việc kiểm tra có bộ quản lý mặc định."
+
+#.Type: boolean
+#.Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Thôi trình nền kdm không?"
+
+#.Type: boolean
+#.Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr "Trình nền quản lý màn hình nền K (kdm) thường bị thôi khi nâng cấp/gỡ bỏ gói, nhưng hiện thời có vẻ là nó quản lý ít nhất một phiên chạy X đang hoạt động."
+
+#.Type: boolean
+#.Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr "Thôi chạy kdm ngay bây giờ thì phiên chạy X nào được quản lý bởi nó sẽ bị chấm dứt. Không thì phiên bản mới sẽ có tác động lần tới khởi chạy lại trình nền."
--- kdebase-3.5.7.orig/debian/po/pt.po
+++ kdebase-3.5.7/debian/po/pt.po
@@ -0,0 +1,139 @@
+# debconf templates for xorg-x11 package
+# Portuguese translation
+# $Id: pt.po 1042 2006-01-09 07:55:08Z ender $
+# Copyright:
+# Branden Robinson, 2000-2004
+# Eduardo Silva <jobezone@yahoo.com>, 2007
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: xserver-xorg_debian_po\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-04-09 19:07+0200\n"
+"PO-Revision-Date: 2007-04-06 03:38+0100\n"
+"Last-Translator: Eduardo Silva <jobezone@yahoo.com>\n"
+"Language-Team: Portuguese <traduz@debianPT.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Gestor de ecrã por omissão:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Um gestor de ecrã é um programa que fornece capacidades de autenticação "
+"gráfica ao X Window System."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Apenas um único gestor de ecrã pode gerir um dado servidor X, mas estão "
+"instalados múltiplos pacotes de gestores de ecrã.  Por favor seleccione qual "
+"o gestor de ecrã que deve ser executado por omissão."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Podem ser executados em simultâneo múltiplos gestores de écran se estes "
+"estiverem configurados para gerir diferentes servidores; para fazer isto, "
+"configure os gestores de ecrã de acordo, edite cada um dos seus scripts "
+"\"init\" em /etc/init.d, e desligue a verificação de um gestor de écran de "
+"omissão."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Deseja parar o daemon kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização ou "
+"remoção de pacotes, mas parece que este está a gerir pelo menos uma sessão X "
+"activa."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Se o kdm for parado agora, todas as sessões X que este estiver a gerir serão "
+"terminadas. Caso contrário, a nova versão terá efeito da próxima vez que o "
+"daemon for reiniciado."
+
+#~ msgid ""
+#~ "The X display manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session."
+#~ msgstr ""
+#~ "O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização "
+#~ "ou remoção de pacotes, mas parece que este está a gerir pelo menos uma "
+#~ "sessão X activa."
+
+#~ msgid "Select the desired default display manager."
+#~ msgstr "Seleccione o gestor de ecrã desejado, por omissão."
+
+#~ msgid ""
+#~ "Only one display manager can manage a given X server, but multiple "
+#~ "display manager packages are installed.  Please select which display "
+#~ "manager should run by default."
+#~ msgstr ""
+#~ "Apenas um gestor de ecrã pode gerir um determinado servidor X, no entanto "
+#~ "encontram-se instalados diversos gestores. Selecione qual o gestor de "
+#~ "ecrã que deve correr por omissão."
+
+#~ msgid ""
+#~ "(Multiple display managers can run simultaneously if they are configured "
+#~ "to manage different servers; to achieve this, configure the display "
+#~ "managers accordingly, edit each of their init scripts in /etc/init.d, and "
+#~ "disable the check for a default display manager.)"
+#~ msgstr ""
+#~ "(Vários gestores de ecrã podem correr em simultâneo se forem configurados "
+#~ "para gerir servidores diferentes; para tal configure os gestores de ecrã "
+#~ "e edite um dos seus 'init scripts' em /etc/init.d, e desligue a "
+#~ "verificação do gestor de ecrã por omissão.)"
+
+#~ msgid "Do you wish to stop the kdm daemon?"
+#~ msgstr "Deseja desligar o daemon kdm?"
+
+#~ msgid ""
+#~ "The K Desktop manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session. If kdm is stopped now, any X sessions it manages will be "
+#~ "terminated. Otherwise you may leave kdm running, and the new version will "
+#~ "take effect the next time the daemon is restarted."
+#~ msgstr ""
+#~ "O daemon K Destop manager (kdm) é normalmente parado quando ocorre um "
+#~ "upgrade ou remoção do pacote, no entanto parece que se encontra pelo "
+#~ "menos uma sessão X em andamento. Se o kdm for parado agora, todas as "
+#~ "sessões X serão terminadas. Por outro lado, pode deixar o kdm a correr e "
+#~ "a nova versão irá ser usada na próxima vez que o daemon for reiniciado."
--- kdebase-3.5.7.orig/debian/po/ar.po
+++ kdebase-3.5.7/debian/po/ar.po
@@ -0,0 +1,98 @@
+# translation of ar.po to Arabic
+#
+#    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.
+#
+# Ossama M. Khayat <okhayat@yahoo.com>, 2005, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: ar\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-05 12:07+0300\n"
+"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
+"Language-Team: Arabic <support@arabeyes.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=6; plural=n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : n >= 3 && n <= 10 ? "
+"3 : n >= 11 && n <= 99 ? 4 : 5;\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "مدير العرض الافتراضي:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"مدير العرض هو برنامج يقدّم قدرات تسجيل الدخول "
+"الرسومي لنظام X Window."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"يمكن لمدير عرض واحد فقط إدارة خادم X معيّن، ولكن هناك "
+"عدة حزم مدير عرض مثبّتة. الرجاء اختيار مدير العرض الذي "
+"يجب تشغيل بشكل افتراضي."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"يمكن تشغيل عدة مدراء عرض بنفس الوقت إن كانو مهيئين "
+"لإدارة خوادم مختلفة؛ لتنفيذ هذا، قم بتهيئة مدراء العرض "
+"وفقاً لذلك، وبتعديل كل من نصوص init في /etc/init.d، وتعطيل "
+"التحقق من مدير عرض افتراضي."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "هل تود إيقاف تشغيل عفريت kdm؟"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"يكون عفريت مدير سطح مكتب كي (kdm) عادة موقفاً عند ترقية الحزمة "
+"وإزالتها، ولكن يبدو أنه يدير على الأقل جلسة X واحدة تعمل حالياً."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"إن تم إيقاف kdm الآن، فستنهى أي جلسات X يقوم بإدارتها. "
+"عدى ذلك، سيسري مفعول النسخة الجديدة في المرة التالية التي "
+"يتم فيها إعادة تشغيل العفريت."
+
--- kdebase-3.5.7.orig/debian/po/nb.po
+++ kdebase-3.5.7/debian/po/nb.po
@@ -0,0 +1,84 @@
+# translation of nb.po_[ME3X8a].po to Norwegian Bokmål
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the kdebase package.
+#
+# Bjørn Steensrud <bjornst@powertech.no>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: nb.po_[ME3X8a]\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-05 17:56+0200\n"
+"Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Standard skjermstyrer:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"En skjermstyrer er et program som gjøre det mulig å logge inn via et grafisk "
+"vindu i X Window System."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Bare én skjermstyrer kan styre en gitt X-tjener, men det er installert flere "
+"pakker med skjermstyrere.  Velg hvilken som skal kjøres som standard."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Flere skjermstyrere kan kjøre samtidig hvis de er satt opp til å styre "
+"forskjellige tjenere. For å oppnå dette må skjermstyrerne settes opp "
+"tilsvarende, rediger oppstartsskriptene deres i /etc/init.d og slå av testen "
+"for en standard skjermstyrer."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Stoppe kdm-nissen?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Nissen K Desktop Manager (kdm) stoppes normalt når dens pakke fjernes eller "
+"oppgraderes, men det ser ut til at den styrer minst en pågående X-økt."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr "Hvis kdm stoppes nå blir alle X-økter den styrer avbrutt.  Ellers vil den nye versjonen blir tatt i bruk neste gang nissen startes."
+
--- kdebase-3.5.7.orig/debian/po/ta.po
+++ kdebase-3.5.7/debian/po/ta.po
@@ -0,0 +1,86 @@
+# translation of ta.po to TAMIL
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: ta\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-05 21:40+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
+"Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "முன்னிருப்பு காட்சி மேலாளர்:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"காட்சி மேலாளர் என்பது வரைகலை உள்நுழைவு இயலுமையை எக்ஸ் விண்டோஸ் அமைப்புக்கு தரும் "
+"நிரலாகும்."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"ஒரு கொடுக்கப் பட்ட X சேவையகத்தில் ஒரு காட்சி மேலாளர்தான் மேலாள இயலும். ஆனால் பல காட்சி "
+"மேலாளர்கள் நிறுவப் பட்டுள்ளன. எது முன்னிருப்பாக இருக்க வேண்டும் என தேர்ந்தெடுங்கள்"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"வெவ்வேறு சேவையகங்களை மேலாள வடிவமைத்தால் பல காட்சி மேலாளர்கள் ஒரே நேரத்தில் இயங்கக் "
+"கூடும். இதை செய்ய காட்சி மேலாளர்களை தகுந்தாற் போல வடிவமையுங்கள். அவற்றின் இனிட் சிறு "
+"நிரல்களை /etc/init.d இல் திருத்துங்கள். முன்னிருப்பு காட்சி மேலாளர் தேர்வை செயலிழக்கச் "
+"செய்யவும்."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "கேடிஎம் கிங்கரனை (kdm daemon) நிறுத்தவா?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"கே மேல்மேசை மேலாளர் (கேடிஎம்) கிங்கரன் வழக்கமாக பொதி மேலாக்கம் அல்லது நீக்கம் நிகழும் போது நிறுத்தப் படும். "
+"ஆனால் அது ஒரு எக்ஸ் அமர்வையாவது இயக்குவது போல தெரிகிறது."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"இப்போது கேடிஎம் நிறுத்தப் பட்டால் அது மேலாளும் எக்ஸ் அமர்வுகள் நிறுத்தப் படும். அல்லது "
+"புதிய பதிப்பு கிங்கரன் அடுத்த முறை இயங்கும் போது செயல் ல் படும்."
+
--- kdebase-3.5.7.orig/debian/po/sk.po
+++ kdebase-3.5.7/debian/po/sk.po
@@ -0,0 +1,91 @@
+# debconf templates for xorg-x11 package
+# Slovak translation
+# $Id: sk.po 1042 2006-01-09 07:55:08Z ender $
+#
+# Copyrights:
+# Branden Robinson, 2000-2004
+# Miroslav Kure <kurem@debian.cz>, 2004
+# Peter Mann <Peter.Mann@tuke.sk>, 2005-2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xorg-x11\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-05 09:47+0200\n"
+"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Zvoľte predvoleného správcu obrazovky:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Správca obrazovky je program, ktorý ponúka grafické prihlásenie do systému X "
+"Window."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Máte nainštalovaných viac správcov obrazovky, ale iba jeden môže obsluhovať "
+"daný X server. Zvoľte si správcu, ktorý bude predvolený."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Súbežne môže byť spustených viac správcov obrazovky, ale iba v prípade "
+"viacero rozdielnych serverov. Pre dosiahnutie takéhoto nastavenia ich musíte "
+"správne nastaviť, upraviť ich spúšťacie skripty v /etc/init.d a zakázať "
+"kontrolu predvoleného správcu obrazovky."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Zastaviť správcu obrazovky kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Správca obrazovky K desktop manager (kdm) sa zvykne zastaviť pri "
+"aktualizácii alebo odstraňovaní balíka, lenže teraz to vyzerá tak, že má na "
+"starosti aspoň jedno ďalšie spustené X sedenie."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Ak by sa teraz kdm zastavil, všetky ním ovládané X sedenia by sa ukončili. V "
+"opačnom prípade môžete nechať kdm spustený, pričom nová verzia sa spustí pri "
+"ďalšom reštarte kdm."
+
--- kdebase-3.5.7.orig/debian/po/de.po
+++ kdebase-3.5.7/debian/po/de.po
@@ -0,0 +1,117 @@
+# translation of kdebase to german
+#
+# $Id: de.po 1042 2006-01-09 07:55:08Z ender $
+#
+# Copyrights:
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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.
+#
+# Branden Robinson, 2000-2004.
+# Martin Schuster, 2001.
+# Sebastian Rittau, 2001.
+# Erich Schubert, 2001.
+# Knut Suebert, 2001.
+# Sebastian Feltel, 2001.
+# Philipp Matthias Hahn, 2001.
+# Veit Waltemath, 2002.
+# Andreas Metzler, 2002.
+# Alwin Meschede <ameschede@gmx.de>, 2004, 2005, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: de\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-07 15:05+0200\n"
+"Last-Translator: Alwin Meschede <ameschede@gmx.de>\n"
+"Language-Team: german <debian-l10n-german@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.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Standardmäßiger Display-Manager:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Ein Display-Manager ist ein Programm, welches grafische Anmeldemöglichkeiten "
+"für das X Window System zur Verfügung stellt."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Nur ein einziger Display-Manager kann einen gegebenen X-Server verwalten, es "
+"sind allerdings mehrere Display-Manager installiert. Bitte wählen Sie den "
+"Display-Manager aus, der standardmäßig ausgeführt werden soll."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Es können mehrere Display-Manager gleichzeitig laufen, wenn diese so "
+"konfiguriert sind, dass sie verschiedene X-Server verwalten. Um dies zu "
+"erreichen, konfigurieren Sie die Display-Manager entsprechend, editieren Sie "
+"jedes ihrer Init-Skripte in /etc/init.d, und schalten Sie die Überprüfung "
+"auf einen Standard-Display-Manager ab."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Soll der kdm-Dienst gestoppt werden?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Der K Display Manager (kdm) Dienst wird meist beim Aktualisieren oder "
+"Entfernen eines Pakets gestoppt, aber er scheint mindestens eine laufende X-"
+"Sitzung zu verwalten."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Wenn kdm jetzt gestoppt wird, werden alle Sitzungen beendet, die er gerade "
+"verwaltet. Alternativ können Sie kdm weiter laufen lassen, die neue Version "
+"wird dann aktiv, sobald der Dienst das nächste Mal gestartet wird."
+
--- kdebase-3.5.7.orig/debian/po/cs.po
+++ kdebase-3.5.7/debian/po/cs.po
@@ -0,0 +1,151 @@
+# debconf templates for kdm package
+# Czech translation
+#
+# $Id: cs.po 1042 2006-01-09 07:55:08Z ender $
+#
+# Copyrights:
+# Branden Robinson, 2000-2004
+# Miroslav Kure <kurem@debian.cz>, 2004-2007
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    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: kdm\n"
+"Report-Msgid-Bugs-To: debian-qt-kde@lists.debian.org\n"
+"POT-Creation-Date: 2007-03-23 07:15+0100\n"
+"PO-Revision-Date: 2007-04-10 18:15+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid "Default display manager:"
+msgstr "Výchozí správce obrazovky:"
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"A display manager is a program that provides graphical login capabilities "
+"for the X Window System."
+msgstr ""
+"Správce obrazovky je program, který nabízí grafické přihlášení do systému X "
+"Window."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Only one display manager can manage a given X server, but multiple display "
+"manager packages are installed. Please select which display manager should "
+"run by default."
+msgstr ""
+"Je nainstalováno několik správců obrazovky, ale jen jeden může obsluhovat "
+"daný X server. Vyberte, který správce se má spouštět jako výchozí."
+
+#. Type: select
+#. Description
+#: ../kdm.templates:1001
+msgid ""
+"Multiple display managers can run simultaneously if they are configured to "
+"manage different servers; to achieve this, configure the display managers "
+"accordingly, edit each of their init scripts in /etc/init.d, and disable the "
+"check for a default display manager."
+msgstr ""
+"Více správců obrazovky může běžet zároveň pouze pokud spravují různé "
+"servery. Pro dosažení takového nastavení je musíte správně nakonfigurovat, "
+"upravit jejich spouštěcí skripty v /etc/init.d a zakázat kontrolu výchozího "
+"správce obrazovky."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid "Stop the kdm daemon?"
+msgstr "Zastavit démona kdm?"
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"and removal, but it appears to be managing at least one running X session."
+msgstr ""
+"Démon kdm (K Desktop manager) je obvykle při aktualizaci nebo odstranění "
+"balíku zastaven, ale zdá se, že spravuje minimálně jedno X sezení."
+
+#. Type: boolean
+#. Description
+#: ../kdm.templates:3001
+msgid ""
+"If kdm is stopped now, any X sessions it manages will be terminated. "
+"Otherwise, the new version will take effect the next time the daemon is "
+"restarted."
+msgstr ""
+"Pokud by byl kdm zastaven nyní, všechna jím spravovaná X sezení by se "
+"ukončila. V opačném případě zůstane kdm běžet a nová verze se spustí s "
+"příštím restartem démona."
+
+#~ msgid ""
+#~ "The X display manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session."
+#~ msgstr ""
+#~ "Démon kdm (X display manager) je obvykle při aktualizaci nebo odstranění "
+#~ "balíku zastaven, ale zdá se, že spravuje minimálně jedno X sezení."
+
+#~ msgid "Select the desired default display manager."
+#~ msgstr "Vyberte implicitního správce obrazovky."
+
+#~ msgid ""
+#~ "Only one display manager can manage a given X server, but multiple "
+#~ "display manager packages are installed.  Please select which display "
+#~ "manager should run by default."
+#~ msgstr ""
+#~ "Máte nainstalováno několik správců obrazovky, ale jen jeden může "
+#~ "obsluhovat daný X server. Vyberte, který správce se má spouštět "
+#~ "standardně."
+
+#~ msgid ""
+#~ "(Multiple display managers can run simultaneously if they are configured "
+#~ "to manage different servers; to achieve this, configure the display "
+#~ "managers accordingly, edit each of their init scripts in /etc/init.d, and "
+#~ "disable the check for a default display manager.)"
+#~ msgstr ""
+#~ "(Více správců obrazovky může běžet zároveň pouze pokud spravují různé "
+#~ "servery. Pro dosažení takového nastavení je musíte správně "
+#~ "nakonfigurovat, upravit jejich spouštěcí skripty v /etc/init.d a zakázat "
+#~ "kontrolu standardního správce obrazovky.)"
+
+#~ msgid "Do you wish to stop the kdm daemon?"
+#~ msgstr "Chcete zastavit daemona kdm?"
+
+#~ msgid ""
+#~ "The K Desktop manager (kdm) daemon is typically stopped on package "
+#~ "upgrade and removal, but it appears to be managing at least one running X "
+#~ "session. If kdm is stopped now, any X sessions it manages will be "
+#~ "terminated. Otherwise you may leave kdm running, and the new version will "
+#~ "take effect the next time the daemon is restarted."
+#~ msgstr ""
+#~ "Daemon kdm (K Desktop manager) je obvykle při aktualizaci nebo odstranění "
+#~ "balíku zastaven, ale zdá se, že právě spravuje minimálně jedno X sezení. "
+#~ "Pokud by byl kdm zastaven nyní, všechna jím spravovaná X sezení by byla "
+#~ "ukončena. V opačném případě můžene nechat kdm běžet a nová verze se "
+#~ "spustí s příštím restartem daemona."
--- kdebase-3.5.7.orig/debian/klipper.menu
+++ kdebase-3.5.7/debian/klipper.menu
@@ -0,0 +1,11 @@
+?package(klipper):\
+	needs="X11"\
+	section="Applications/Editors"\
+	hints="KDE"\
+	title="Klipper"\
+	icon32x32="/usr/share/pixmaps/klipper.xpm"\
+	icon16x16="/usr/share/pixmaps/klipper-16.xpm"\
+	command="/usr/bin/klipper"
+
+# Icon 32x32 klipper/cr32-app-klipper.png klipper.xpm
+# Icon 16x16 klipper/cr16-app-klipper.png klipper-16.xpm
--- kdebase-3.5.7.orig/debian/kcontrol.preinst
+++ kdebase-3.5.7/debian/kcontrol.preinst
@@ -0,0 +1,24 @@
+#! /bin/sh -e
+
+case "$1" in
+
+    upgrade)
+	rm -f /etc/kde3/kuriikwsfilterrc
+    ;;
+
+    install)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
--- kdebase-3.5.7.orig/debian/kdm.prerm
+++ kdebase-3.5.7/debian/kdm.prerm
@@ -0,0 +1,175 @@
+#! /bin/sh
+# prerm script for kdm
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+# debconf may not be available if some massive purging is going on
+HAVE_DEBCONF=
+if [ -e /usr/share/debconf/confmodule ]; then
+  . /usr/share/debconf/confmodule
+  HAVE_DEBCONF=yes
+fi
+
+case "$1" in
+    # we NEVER want to unconditionally stop kdm; see below
+    upgrade|failed-upgrade)
+        REMOVING=
+    ;;
+
+    remove|deconfigure)
+        REMOVING=yes
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+STOP=
+# are we supposed to restart on upgrade?  if REMOVING kdm, we don't care what
+# the user says, we have to stop the daemon
+if grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options ||
+   [ -n "$REMOVING" ]; then
+  # is there an kdm process running?
+  if start-stop-daemon --stop --quiet --signal 0 --name kdm; then
+    # any children?
+    PARENTS=$(pidof /usr/bin/kdm || true)
+    CHILDREN=
+    if [ -n "$PARENTS" ]; then    
+      for PROCESS in $PARENTS; do
+        # make sure we got numbers back
+        [ $PROCESS -eq $PROCESS ] 2> /dev/null ||
+        exit
+        # FIXME - redo this part uses shell-lib.sh from xfree86
+        #  die "pidof returned non-numeric value"
+        # we could use grep -q here if ps would ignore SIGPIPE :-P
+        if (ps axj | grep "^ *$PROCESS" > /dev/null 2>&1); then
+          CHILDREN=yes
+        fi
+      done
+      if [ -n "$CHILDREN" ]; then
+        if [ -n "$HAVE_DEBCONF" ]; then
+          # ask the question
+          db_input high kdm/stop_running_server_with_children || true
+          db_go
+          # what did the user say?
+          ANSWER=
+          if db_get kdm/stop_running_server_with_children; then
+            ANSWER="$RET"
+          fi
+          if [ "$ANSWER" = "true" ]; then
+            STOP=yes
+          fi
+          # forget that we have seen the question; this is the sort of
+          # non-configuration question that should be asked every time
+          db_fset kdm/stop_running_server_with_children seen false
+        fi
+      else
+        STOP=yes
+      fi
+    fi
+  fi
+fi
+
+if [ -n "$STOP" ]; then
+  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+    invoke-rc.d kdm stop || true
+  else
+    /etc/init.d/kdm stop || true
+  fi
+else
+  if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then
+    touch /var/run/kdm.upgrade
+  fi
+fi
+
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
+  if [ -n "$HAVE_DEBCONF" ]; then
+    # disown this question
+    db_unregister shared/default-x-display-manager || true
+    # does the question still exist?
+    if db_get shared/default-x-display-manager; then
+      if db_metaget shared/default-x-display-manager owners; then
+        # FIXME - redo this part uses shell-lib.sh from xfree86
+        #observe "X display managers now available are \"$OWNERS\""
+        db_subst shared/default-x-display-manager choices "$RET"
+      fi
+      DEFAULT_DISPLAY_MANAGER=
+      if db_get shared/default-x-display-manager; then
+        DEFAULT_DISPLAY_MANAGER="$RET"
+      fi
+      # are we removing the currently selected display manager?
+      if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
+        if [ "kdm" = "$DEFAULT_DISPLAY_MANAGER" ]; then
+          if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+            if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then
+              # does the display manager file reference the current default?  if
+              # so, remove it because it will now be wrong
+              if [ -n "$RET" ]; then
+                if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then
+                  rm "$DEFAULT_DISPLAY_MANAGER_FILE"
+                fi
+              fi
+            fi
+          fi
+          # ask the user to choose a new default
+          db_fset shared/default-x-display-manager seen false
+          db_input critical shared/default-x-display-manager || true
+          db_go
+          # if the default display manager file doesn't exist, write it with
+          # the path to the new default display manager
+          if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+            DEFAULT_DISPLAY_MANAGER=
+            if db_get shared/default-x-display-manager; then
+              DEFAULT_DISPLAY_MANAGER="$RET"
+            fi
+            if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
+              # FIXME - redo this part uses shell-lib.sh from xfree86
+              #warn "new default display manager has been selected; please be" \
+              #     "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \
+              #     "is configured"
+              DAEMON_NAME=
+              if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
+                DAEMON_NAME="$RET"
+              fi
+              if [ ! -n "$DAEMON_NAME" ]; then
+                # if we were unable to determine the name of the selected daemon (for
+                # instance, if the selected default display manager doesn't provide a
+                # daemon_name question), guess
+                DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null)
+                if [ ! -n "$DAEMON_NAME" ]; then
+                  echo .
+                  # FIXME - redo this part uses shell-lib.sh from xfree86
+                  #warn "unable to determine path to default X display manager" \
+                  #     "$DEFAULT_DISPLAY_MANAGER; not updating" \
+                  #     "$DEFAULT_DISPLAY_MANAGER_FILE"
+                fi
+              fi
+              if [ -n "$DAEMON_NAME" ]; then
+                echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE"
+              fi
+            fi
+          fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+exit 0
--- kdebase-3.5.7.orig/debian/kdebase-doc-html.doc-base.kdm
+++ kdebase-3.5.7/debian/kdebase-doc-html.doc-base.kdm
@@ -0,0 +1,10 @@
+Document: kdebase-doc-html-kdm
+Title: KDM Handbook
+Author: Oswald Buddenhagen 
+Abstract: This document describes KDM, the KDE Display Manager, an X session manager.
+Section: System 
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kdm/index.html
+Files: /usr/share/doc/kde/HTML/en/kdm/*.html
+
--- kdebase-3.5.7.orig/debian/kdebase-bin.links
+++ kdebase-3.5.7/debian/kdebase-bin.links
@@ -0,0 +1 @@
+usr/share/man/man1/kdesu.1.gz usr/share/man/man1/kdesud.1.gz
--- kdebase-3.5.7.orig/debian/source.lintian-overrides
+++ kdebase-3.5.7/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+kdebase source: maintainer-script-lacks-debhelper-token debian/kdm.postinst
+kdebase source: maintainer-script-lacks-debhelper-token debian/kdm.prerm
--- kdebase-3.5.7.orig/debian/kdeprint.manpages
+++ kdebase-3.5.7/debian/kdeprint.manpages
@@ -0,0 +1,3 @@
+debian/man/kdeprintfax.1
+debian/man/kjobviewer.1
+debian/man/kprinter.1
--- kdebase-3.5.7.orig/debian/kdebase-doc-html.doc-base.konsole
+++ kdebase-3.5.7/debian/kdebase-doc-html.doc-base.konsole
@@ -0,0 +1,10 @@
+Document: kdebase-doc-html-konsole
+Title: Konsole Handbook
+Author: Jonathan Singer, Kurt Hindenburg
+Abstract: Konsole is an X terminal emulator for KDE.
+Section: Xshells 
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/konsole/index.html
+Files: /usr/share/doc/kde/HTML/en/konsole/*.html
+
--- kdebase-3.5.7.orig/debian/konqueror.postinst
+++ kdebase-3.5.7/debian/konqueror.postinst
@@ -0,0 +1,20 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/konqueror 100 \
+	--slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz "/usr/share/man/man1/konqueror.1.gz"
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- kdebase-3.5.7.orig/debian/kdepasswd.menu
+++ kdebase-3.5.7/debian/kdepasswd.menu
@@ -0,0 +1,6 @@
+?package(kdepasswd):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="kdepasswd"\
+	command="/usr/bin/kdepasswd"
--- kdebase-3.5.7.orig/debian/kicker.install
+++ kdebase-3.5.7/debian/kicker.install
@@ -0,0 +1,284 @@
+debian/tmp/usr/bin/appletproxy
+debian/tmp/usr/bin/extensionproxy
+debian/tmp/usr/bin/kasbar
+debian/tmp/usr/bin/kicker
+debian/tmp/usr/lib/kconf_update_bin/kicker-3.4-reverseLayout
+debian/tmp/usr/lib/kde3/appletproxy.la
+debian/tmp/usr/lib/kde3/appletproxy.so
+debian/tmp/usr/lib/kde3/clock_panelapplet.la
+debian/tmp/usr/lib/kde3/clock_panelapplet.so
+debian/tmp/usr/lib/kde3/dockbar_panelextension.la
+debian/tmp/usr/lib/kde3/dockbar_panelextension.so
+debian/tmp/usr/lib/kde3/extensionproxy.la
+debian/tmp/usr/lib/kde3/extensionproxy.so
+debian/tmp/usr/lib/kde3/kasbar_panelextension.la
+debian/tmp/usr/lib/kde3/kasbar_panelextension.so
+debian/tmp/usr/lib/kde3/kicker.la
+debian/tmp/usr/lib/kde3/kickermenu_find.la
+debian/tmp/usr/lib/kde3/kickermenu_find.so
+debian/tmp/usr/lib/kde3/kickermenu_kate.so
+debian/tmp/usr/lib/kde3/kickermenu_kate.la
+debian/tmp/usr/lib/kde3/kickermenu_kdeprint.la
+debian/tmp/usr/lib/kde3/kickermenu_kdeprint.so
+debian/tmp/usr/lib/kde3/kickermenu_konqueror.la
+debian/tmp/usr/lib/kde3/kickermenu_konqueror.so
+debian/tmp/usr/lib/kde3/kickermenu_konsole.la
+debian/tmp/usr/lib/kde3/kickermenu_konsole.so
+debian/tmp/usr/lib/kde3/kickermenu_prefmenu.la
+debian/tmp/usr/lib/kde3/kickermenu_prefmenu.so
+debian/tmp/usr/lib/kde3/kickermenu_recentdocs.la
+debian/tmp/usr/lib/kde3/kickermenu_recentdocs.so
+debian/tmp/usr/lib/kde3/kickermenu_remotemenu.la
+debian/tmp/usr/lib/kde3/kickermenu_remotemenu.so
+debian/tmp/usr/lib/kde3/kickermenu_systemmenu.la
+debian/tmp/usr/lib/kde3/kickermenu_systemmenu.so
+debian/tmp/usr/lib/kde3/kicker.so
+debian/tmp/usr/lib/kde3/launcher_panelapplet.la
+debian/tmp/usr/lib/kde3/launcher_panelapplet.so
+debian/tmp/usr/lib/kde3/lockout_panelapplet.la
+debian/tmp/usr/lib/kde3/lockout_panelapplet.so
+debian/tmp/usr/lib/kde3/media_panelapplet.la
+debian/tmp/usr/lib/kde3/media_panelapplet.so
+debian/tmp/usr/lib/kde3/menu_panelapplet.la
+debian/tmp/usr/lib/kde3/menu_panelapplet.so
+debian/tmp/usr/lib/kde3/minipager_panelapplet.la
+debian/tmp/usr/lib/kde3/minipager_panelapplet.so
+debian/tmp/usr/lib/kde3/naughty_panelapplet.la
+debian/tmp/usr/lib/kde3/naughty_panelapplet.so
+debian/tmp/usr/lib/kde3/run_panelapplet.la
+debian/tmp/usr/lib/kde3/run_panelapplet.so
+debian/tmp/usr/lib/kde3/sidebar_panelextension.la
+debian/tmp/usr/lib/kde3/sidebar_panelextension.so
+debian/tmp/usr/lib/kde3/systemtray_panelapplet.la
+debian/tmp/usr/lib/kde3/systemtray_panelapplet.so
+debian/tmp/usr/lib/kde3/taskbar_panelapplet.la
+debian/tmp/usr/lib/kde3/taskbar_panelapplet.so
+debian/tmp/usr/lib/kde3/taskbar_panelextension.la
+debian/tmp/usr/lib/kde3/taskbar_panelextension.so
+debian/tmp/usr/lib/kde3/trash_panelapplet.la
+debian/tmp/usr/lib/kde3/trash_panelapplet.so
+debian/tmp/usr/lib/libkasbar.so.1
+debian/tmp/usr/lib/libkasbar.so.1.0.0
+debian/tmp/usr/lib/libkdeinit_appletproxy.so
+debian/tmp/usr/lib/libkdeinit_extensionproxy.so
+debian/tmp/usr/lib/libkdeinit_kicker.so
+debian/tmp/usr/lib/libkickermain.so.1
+debian/tmp/usr/lib/libkickermain.so.1.0.0
+debian/tmp/usr/lib/libtaskbar.so.1
+debian/tmp/usr/lib/libtaskbar.so.1.2.0
+debian/tmp/usr/lib/libtaskmanager.so.1
+debian/tmp/usr/lib/libtaskmanager.so.1.0.0
+debian/tmp/usr/share/applications/kde/kcmkicker.desktop
+debian/tmp/usr/share/applnk/.hidden/kicker_config_arrangement.desktop
+debian/tmp/usr/share/applnk/.hidden/kicker_config_hiding.desktop
+debian/tmp/usr/share/applnk/.hidden/kicker_config_menus.desktop
+debian/tmp/usr/share/apps/clockapplet/pics/lcd.png
+debian/tmp/usr/share/apps/kconf_update/kicker-3.1-properSizeSetting.pl
+debian/tmp/usr/share/apps/kconf_update/kicker-3.5-kconfigXTize.pl
+debian/tmp/usr/share/apps/kconf_update/kicker-3.5-taskbarEnums.pl
+debian/tmp/usr/share/apps/kconf_update/kickerrc.upd
+debian/tmp/usr/share/apps/kicker/applets/clockapplet.desktop
+debian/tmp/usr/share/apps/kicker/applets/lockout.desktop
+debian/tmp/usr/share/apps/kicker/applets/mediaapplet.desktop
+debian/tmp/usr/share/apps/kicker/applets/menuapplet.desktop
+debian/tmp/usr/share/apps/kicker/applets/minipagerapplet.desktop
+debian/tmp/usr/share/apps/kicker/applets/naughtyapplet.desktop
+debian/tmp/usr/share/apps/kicker/applets/quicklauncher.desktop
+debian/tmp/usr/share/apps/kicker/applets/runapplet.desktop
+debian/tmp/usr/share/apps/kicker/applets/systemtrayapplet.desktop
+debian/tmp/usr/share/apps/kicker/applets/taskbarapplet.desktop
+debian/tmp/usr/share/apps/kicker/applets/trashapplet.desktop
+debian/tmp/usr/share/apps/kicker/builtins/bookmarks.desktop
+debian/tmp/usr/share/apps/kicker/builtins/browser.desktop
+debian/tmp/usr/share/apps/kicker/builtins/desktop.desktop
+debian/tmp/usr/share/apps/kicker/builtins/exec.desktop
+debian/tmp/usr/share/apps/kicker/builtins/kmenu.desktop
+debian/tmp/usr/share/apps/kicker/builtins/windowlist.desktop
+debian/tmp/usr/share/apps/kicker/default-apps
+debian/tmp/usr/share/apps/kicker/extensions/childpanelextension.desktop
+debian/tmp/usr/share/apps/kicker/extensions/dockbarextension.desktop
+debian/tmp/usr/share/apps/kicker/extensions/kasbarextension.desktop
+debian/tmp/usr/share/apps/kicker/extensions/sidebarextension.desktop
+debian/tmp/usr/share/apps/kicker/extensions/taskbarextension.desktop
+debian/tmp/usr/share/apps/kicker/icons/crystalsvg/16x16/actions/modified.png
+debian/tmp/usr/share/apps/kicker/icons/locolor/16x16/actions/modified.png
+debian/tmp/usr/share/apps/kicker/menuext/find.desktop
+debian/tmp/usr/share/apps/kicker/menuext/find/kfind.desktop
+debian/tmp/usr/share/apps/kicker/menuext/find/websearch.desktop
+debian/tmp/usr/share/apps/kicker/menuext/katesessionmenu.desktop
+debian/tmp/usr/share/apps/kicker/menuext/konquerormenu.desktop
+debian/tmp/usr/share/apps/kicker/menuext/konsolemenu.desktop
+debian/tmp/usr/share/apps/kicker/menuext/prefmenu.desktop
+debian/tmp/usr/share/apps/kicker/menuext/printmenu.desktop
+debian/tmp/usr/share/apps/kicker/menuext/recentdocs.desktop
+debian/tmp/usr/share/apps/kicker/menuext/remotemenu.desktop
+debian/tmp/usr/share/apps/kicker/menuext/systemmenu.desktop
+debian/tmp/usr/share/apps/kicker/pics/disk10.png
+debian/tmp/usr/share/apps/kicker/pics/disk1.png
+debian/tmp/usr/share/apps/kicker/pics/disk2.png
+debian/tmp/usr/share/apps/kicker/pics/disk3.png
+debian/tmp/usr/share/apps/kicker/pics/disk4.png
+debian/tmp/usr/share/apps/kicker/pics/disk5.png
+debian/tmp/usr/share/apps/kicker/pics/disk6.png
+debian/tmp/usr/share/apps/kicker/pics/disk7.png
+debian/tmp/usr/share/apps/kicker/pics/disk8.png
+debian/tmp/usr/share/apps/kicker/pics/disk9.png
+debian/tmp/usr/share/apps/kicker/pics/kside.png
+debian/tmp/usr/share/apps/kicker/pics/kside_tile.png
+debian/tmp/usr/share/apps/kicker/tiles/blue_wood_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/blue_wood_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/blue_wood_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/blue_wood_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/blue_wood_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/blue_wood_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/green_wood_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/green_wood_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/green_wood_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/green_wood_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/green_wood_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/green_wood_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/KDE_button_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/KDE_button_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/KDE_button_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/KDE_button_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/KDE_button_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/KDE_button_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_gray_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_gray_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_gray_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_gray_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_gray_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_green_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_green_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_green_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_green_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_green_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_green_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_pastel_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_pastel_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_pastel_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_pastel_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_pastel_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_purple_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_purple_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_purple_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_purple_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/light_purple_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/light_purple_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/nuts_and_bolts_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/red_wood_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/red_wood_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/red_wood_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/red_wood_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/red_wood_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/red_wood_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_blue_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_blue_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_blue_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_blue_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_blue_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_blue_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_gray_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_gray_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_gray_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_gray_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_gray_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_gray_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_green_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_green_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_green_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_green_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_green_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_green_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_orange_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_orange_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_orange_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_orange_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_orange_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_orange_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_pastel_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_purple_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_purple_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_purple_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_purple_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_purple_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_purple_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_red_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_red_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_red_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_red_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_red_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_red_tiny_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_large_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_large_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_normal_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_normal_up.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_tiny_down.png
+debian/tmp/usr/share/apps/kicker/tiles/solid_tigereye_tiny_up.png
+debian/tmp/usr/share/apps/kicker/wallpapers/deck_plate.png
+debian/tmp/usr/share/apps/kicker/wallpapers/default.png
+debian/tmp/usr/share/apps/kicker/wallpapers/green_line.png
+debian/tmp/usr/share/apps/kicker/wallpapers/rail.png
+debian/tmp/usr/share/apps/naughtyapplet/pics/naughty-happy.png
+debian/tmp/usr/share/apps/naughtyapplet/pics/naughty-sad.png
+debian/tmp/usr/share/autostart/panel.desktop
+debian/tmp/usr/share/config.kcfg/kickerSettings.kcfg
+debian/tmp/usr/share/config.kcfg/launcherapplet.kcfg
+debian/tmp/usr/share/config.kcfg/taskbar.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/bookmarks_icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/common
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/desktop_icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/k_menu_icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/man-appletproxy.1.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/man-kicker.1.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/printsys_icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/quickbrowser_icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/recent_docs_icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/screenshot_left.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/screenshot_right.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/taskbar_group.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/terminals_icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kicker/windowlist_icon.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/systemtray.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/taskbar.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kbinaryclock.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kdisknav.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kicker.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/panel.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/runprocesscatcher.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/systemtray.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/taskbar.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/window_list.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kbinaryclock.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/runprocesscatcher.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/systemtray.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/taskbar.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kbinaryclock.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kdisknav.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/runprocesscatcher.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/systemtray.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/taskbar.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/window_list.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kbinaryclock.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kdisknav.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/systemtray.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/taskbar.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/window_list.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/systemtray.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/taskbar.png
+debian/tmp/usr/share/icons/crystalsvg/scalable/apps/kbinaryclock.svgz
+debian/tmp/usr/share/icons/crystalsvg/scalable/apps/systemtray.svgz
+
+debian/icons/kicker.xpm		/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/kate.manpages
+++ kdebase-3.5.7/debian/kate.manpages
@@ -0,0 +1,2 @@
+debian/man/kate.1
+debian/man/kwrite.1
--- kdebase-3.5.7.orig/debian/kdepasswd.install
+++ kdebase-3.5.7/debian/kdepasswd.install
@@ -0,0 +1,35 @@
+debian/tmp/usr/bin/kdepasswd
+debian/tmp/usr/lib/kde3/kcm_useraccount.la
+debian/tmp/usr/lib/kde3/kcm_useraccount.so
+debian/tmp/usr/share/applications/kde/kcm_useraccount.desktop
+debian/tmp/usr/share/applications/kde/kdepasswd.desktop
+debian/tmp/usr/share/apps/kdm/pics/users/Apple.png
+debian/tmp/usr/share/apps/kdm/pics/users/BeachBall.png
+debian/tmp/usr/share/apps/kdm/pics/users/Blowfish.png
+debian/tmp/usr/share/apps/kdm/pics/users/Bug.png
+debian/tmp/usr/share/apps/kdm/pics/users/Butterfly.png
+debian/tmp/usr/share/apps/kdm/pics/users/Car.png
+debian/tmp/usr/share/apps/kdm/pics/users/Cow.png
+debian/tmp/usr/share/apps/kdm/pics/users/Daemon.png
+debian/tmp/usr/share/apps/kdm/pics/users/Dog.png
+debian/tmp/usr/share/apps/kdm/pics/users/Elephant.png
+debian/tmp/usr/share/apps/kdm/pics/users/Flower.png
+debian/tmp/usr/share/apps/kdm/pics/users/Frog.png
+debian/tmp/usr/share/apps/kdm/pics/users/Ghost.png
+debian/tmp/usr/share/apps/kdm/pics/users/Guitar.png
+debian/tmp/usr/share/apps/kdm/pics/users/Heart.png
+debian/tmp/usr/share/apps/kdm/pics/users/Konqui.png
+debian/tmp/usr/share/apps/kdm/pics/users/Lion.png
+debian/tmp/usr/share/apps/kdm/pics/users/Monkey.png
+debian/tmp/usr/share/apps/kdm/pics/users/Penguin.png
+debian/tmp/usr/share/apps/kdm/pics/users/Pig.png
+debian/tmp/usr/share/apps/kdm/pics/users/Rabbit.png
+debian/tmp/usr/share/apps/kdm/pics/users/Ring.png
+debian/tmp/usr/share/apps/kdm/pics/users/Scream.png
+debian/tmp/usr/share/apps/kdm/pics/users/Shark.png
+debian/tmp/usr/share/apps/kdm/pics/users/Splash.png
+debian/tmp/usr/share/apps/kdm/pics/users/Star.png
+debian/tmp/usr/share/apps/kdm/pics/users/Teddybear.png
+debian/tmp/usr/share/apps/kdm/pics/users/Turtle.png
+debian/tmp/usr/share/config.kcfg/kcm_useraccount.kcfg
+debian/tmp/usr/share/config.kcfg/kcm_useraccount_pass.kcfg
--- kdebase-3.5.7.orig/debian/not-installed.list
+++ kdebase-3.5.7/debian/not-installed.list
@@ -0,0 +1,53 @@
+The following files are not installed in any binary package.
+This is deliberate.
+
+/usr/share/apps/kdm/sessions/*.desktop
+ - many .desktop files are not included since they either do not have Debian
+   packages, or their Debian packages include their own .desktop session
+   files for gdm/kdm, or they're not intended to be stand-alone window
+   managers. Eventually, these should ALL be dropped, since they aren't
+   really maintained upstream, and kdm isn't the correct place to ship these
+   anyway. Here's the current list of those dropped:
+
+   aewm++
+   afterstep
+   amiwm
+   blackbox
+   cde
+   cwwm
+   enlightenment
+   fluxbox
+   fvwm95
+   fvwm
+   gnome
+   golem
+   icewm
+   ion
+   kde
+   larswm
+   metacity
+   openbox
+   phluid
+   qvwm
+   ratpoison
+   sapphire
+   sawfish
+   w9wm
+   waimea
+   wmaker
+   xfce4
+   xfce
+
+/etc/kde3/kdm/README
+ - useless comments, not intended for the end user.
+
+/usr/share/fonts/override/fonts.dir
+ - cruft, as kdebase no longer installs any system fonts.
+
+/usr/share/apps/kappfinder/apps/Office/lyx.desktop
+ - a lyx.desktop that works in KDE is provided by lyx-qt, so this just
+   confuses users.
+
+/usr/share/apps/kcmview1394/oui.db
+ - this file is installed, but manually, in debian/rules, since the
+   KDE build system can't be relied on to do it itself on !Linux.
--- kdebase-3.5.7.orig/debian/usermap.pl
+++ kdebase-3.5.7/debian/usermap.pl
@@ -0,0 +1,59 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2005 Mandriva
+# Olivier Blin
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+my %flags = (
+    idVendor => 0x0001,
+    idProduct => 0x0002,
+);
+
+sub parse_usermap_line {
+    local $_ = shift;
+    /^#/ and next;
+    my %match;
+    @match{module, match_flags, idVendor, idProduct} = 
+	/^(\S+)\s+0x(\w{2,})\s+0x(\w{2,})\s+0x(\w{2,})\s+0x(\w{2,})\s+0x(\w{2,})\s+0x(\w{2})\s+0x(\w{2})\s+0x(\w{2})\s+0x(\w{2})\s+0x(\w{2})\s+0x(\w{2})(?:\s+0x(\w{2,}))?/
+	or die qq(unable to parse line "$_");
+    $match{match_flags} = hex($match{match_flags});
+    $match{driver_info} ||= 0;
+
+    my @rule;
+    while (my ($key, $flag) = each(%flags)) {
+	hex($match{match_flags}) & $flag and push @rule, qq(SYSFS{$key}=="$match{$key}",);
+    }
+    push @rule,
+    (
+     qq(MODE="660",),
+     );
+    push @rule,
+    (
+     qq(GROUP="plugdev"),
+     );
+    print join(' ', @rule) . "\n";
+}
+
+print "BUS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n";
+print "ACTION!=\"add\"\, GOTO=\"kcontrol_rules_end\"\n";
+print "SUBSYSTEM!=\"usb_device\"\, GOTO=\"kcontrol_rules_end\"\n\n";
+
+foreach my $usermap (@ARGV) {
+    open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap";
+    parse_usermap_line($_) foreach <$IN>;
+}
+
+print "\nLABEL=\"kcontrol_rules_end\"\n";
--- kdebase-3.5.7.orig/debian/konqueror-nsplugins.install
+++ kdebase-3.5.7/debian/konqueror-nsplugins.install
@@ -0,0 +1,8 @@
+debian/tmp/usr/bin/nspluginscan
+debian/tmp/usr/bin/nspluginviewer
+debian/tmp/usr/lib/kde3/kcm_nsplugins.la
+debian/tmp/usr/lib/kde3/kcm_nsplugins.so
+debian/tmp/usr/lib/kde3/libnsplugin.la
+debian/tmp/usr/lib/kde3/libnsplugin.so
+debian/tmp/usr/share/applications/kde/khtml_plugins.desktop
+debian/tmp/usr/share/apps/plugin/nspluginpart.rc
--- kdebase-3.5.7.orig/debian/kdm.config
+++ kdebase-3.5.7/debian/kdm.config
@@ -0,0 +1,80 @@
+#!/bin/sh
+# Debian kdm package configuration script
+# stolen from the xdm scripts
+# Copyright 2000--2003 Branden Robinson.
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+
+set -e
+
+# source debconf library
+. /usr/share/debconf/confmodule
+
+THIS_PACKAGE=kdm
+
+# set default display manager
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+OWNERS=
+if db_metaget shared/default-x-display-manager owners; then
+  OWNERS="$RET"
+fi
+
+CHOICES=
+if db_metaget shared/default-x-display-manager choices; then
+  CHOICES="$RET"
+fi
+
+if [ "$OWNERS" != "$CHOICES" ]; then
+  # FIXME - redo this part uses shell-lib.sh from xfree86
+  # observe "X display managers now available are \"$OWNERS\""
+  db_subst shared/default-x-display-manager choices "$OWNERS"
+  db_fset shared/default-x-display-manager seen false
+fi
+
+# debconf is not a registry; use the current contents of the default display
+# manager file to pre-answer the question if possible
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+  CURRENT_DEFAULT=$(basename "$(grep -v '^[[:space:]]*#' \
+                                "$DEFAULT_DISPLAY_MANAGER_FILE" |
+                                head -n 1)")
+  if [ -n "$CURRENT_DEFAULT" ]; then
+    if ! which "$CURRENT_DEFAULT" > /dev/null 2>&1; then
+      echo .
+      # FIXME - redo this part uses shell-lib.sh from xfree86
+      #observe "default display manager \"$CURRENT_DEFAULT\" specified in" \
+      #        "$DEFAULT_DISPLAY_MANAGER_FILE does not exist or is not" \
+      #        "executable"
+    fi
+    db_set shared/default-x-display-manager "$CURRENT_DEFAULT"
+  fi
+else
+  CURRENT_DEFAULT=
+  if db_get shared/default-x-display-manager; then
+    CURRENT_DEFAULT="$RET"
+  fi
+fi
+
+db_input high shared/default-x-display-manager || true
+db_go
+
+# using this display manager?
+NEW_DEFAULT=
+if db_get shared/default-x-display-manager; then
+  NEW_DEFAULT="$RET"
+fi
+
+# move the default display manager file if we're going to change it
+if [ -n "$NEW_DEFAULT" ]; then
+  if [ "$NEW_DEFAULT" != "$CURRENT_DEFAULT" ]; then
+    if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+      # FIXME - redo this part uses shell-lib.sh from xfree86
+      # observe "preparing to change default X display manager from" \
+      #     "\"$CURRENT_DEFAULT\" to \"$NEW_DEFAULT\""
+      mv "$DEFAULT_DISPLAY_MANAGER_FILE" \
+         "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
+    fi
+  fi
+fi
+
+exit 0
--- kdebase-3.5.7.orig/debian/kdebase-doc.install
+++ kdebase-3.5.7/debian/kdebase-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/kde/HTML/en/kdebase*-apidocs/* /usr/share/doc/kde/HTML/en/kdebase-apidocs
--- kdebase-3.5.7.orig/debian/kappfinder.install
+++ kdebase-3.5.7/debian/kappfinder.install
@@ -0,0 +1,222 @@
+debian/tmp/usr/bin/kappfinder
+debian/tmp/usr/share/applications/kde/kappfinder.desktop
+debian/tmp/usr/share/applnk/System/kappfinder.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Development/assistant.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Development/ddd.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Development/designer.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Development/dlgedit.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Development/eclipse.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Development/Forte.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Development/j2mewtk.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Development/linguist.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Development/pose.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/alephone.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/alephone-nogl.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/ClanBomber.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/cxhextris.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/Gnibbles.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/GnobotsII.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/Mures.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/SuperMethaneBrothers.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/Trophy.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/TuxRacer.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/XKobo.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Arcade/XSoldier.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gataxx.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gchess.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Glines.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gmahjongg.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gmines.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gnotravex.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gnotski.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Gstones.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Iagno.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/SameGnome.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/xboard.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Board/Xgammon.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Card/AisleRiot.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Card/FreeCell.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Card/PySol.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Card/XPat2.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Clanbomber.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/defendguin.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Emulators/qmamecat.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/GTali.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/penguin-command.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/angband.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/moria.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/nethack.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/rogue.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/tome.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Roguelikes/zangband.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/TacticStrategy/xscorch.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Toys/xeyes.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/Toys/xpinguin.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Games/xshipwars.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/bitmap.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/blender.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/ElectricEyes.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/ghostview.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/gimp.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/GnomeColorSelector.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/GnomeIconEditor.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/GPhoto.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/Gqview.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/gv.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/inkscape.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/Sketch.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/sodipodi.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/tgif.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/xdvi.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/xfig.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/xpaint.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/Xpcd.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/xv.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Graphics/Xwpick.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/arena.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/balsa.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/BlueFish.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/btdownloadgui.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/coolmail.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/dc_gui.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Dpsftp.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/DrakSync.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/ed2k_gui.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/epiphany.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/ethereal.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Evolution.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Faces.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Fetchmailconf.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Gabber.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/gaim.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Galeon.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/gFTP.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/GnomeICU.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/gnomemeeting.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/gnometalk.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/gtelnet.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/ickle.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/javaws.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/knews.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/licq.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/mldonkey_gui.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/mozilla.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/mozilla-thunderbird.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/netscape6.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/netscape.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Netscapemessenger.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Nmapfe.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/opera.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Pan.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Sylpheed.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/lftp.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/Links.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/mutt.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/pine.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/silc.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/slrn.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/Terminal/w3m.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/wireshark.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/xbiff.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/xchat.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/xfmail.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Internet/xftp.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/alevt.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/audacity.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/Aumix.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/aviplay.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/bcast2000.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/Grip.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/gtv.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/jazz.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/MP3info.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/mplayer.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/mtv.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ogle.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/realplayer.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/rezound.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/slab.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/sweep.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xawtv.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xcam.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xine.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xmms.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/XMovie.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/abiword.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/acroread.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/Applix.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/Dia.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/Gnome-Cal.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/Gnome-Card.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/GnomeTimeTracker.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/gnucash.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/Gnumeric.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/Guppi.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/Ical.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/mrproject.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/netscapeaddressbook.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/plan.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/pybliographic.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/scribus.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/WordPerfect2000.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/WordPerfect.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/XAcc.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/xpdf.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Office/XsLite.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/System/citrix_ica.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/System/editres.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/System/sam.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/System/Terminal/aterm.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/System/Terminal/procinfo.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/System/Terminal/rxvt.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/System/Terminal/vmstat.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/System/wine.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/System/xosview.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/calctool.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/emacs.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/gedit.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/lemacs.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/nano.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/nedit.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/pico.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/xedit.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/Editors/xemacs.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/e-notes.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/GKrellM.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/GnomeWho.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/oclock.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/SystemInfo.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/SystemLogViewer.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/xgnokii.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xcalc.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xclipboard.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xclock.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xconsole.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/Xkill.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xload.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xmag.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/Xrefresh.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
+debian/tmp/usr/share/apps/kappfinder/apps/Utilities/XUtilities/Xtraceroute.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kappfinder/man-kappfinder.1.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kappfinder.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kappfinder.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kappfinder.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kappfinder.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kappfinder.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kappfinder.png
+
+debian/icons/kappfinder.xpm		/usr/share/pixmaps
+debian/icons/kappfinder-16.xpm		/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/rules
+++ kdebase-3.5.7/debian/rules
@@ -0,0 +1,67 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-qt-kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_KDE_APIDOX := yes
+
+CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-shadow --without-java --with-pam=kde \
+	--with-kcp-pam=kcheckpass --with-kdm-pam=kdm --with-kss-pam=kscreensaver \
+	--with-extra-includes=/usr/include/sasl --with-usbids=/usr/share/misc/usb.ids
+
+DEB_FIXPERMS_EXCLUDE := usr/bin/kdesud
+
+DEB_DH_STRIP_ARGS  := --dbg-package=kdebase-dbg
+
+DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter kdesu knetattach kioslave kxkb kdebugdialog kdcop
+
+PACKAGES_WITH_LIBS := kate kcontrol kdebase-bin kicker konqueror ksplash \
+			ksysguard kwin libkonq4
+
+DEB_DH_MAKESHLIBS_ARGS_kate		:= -V'kate (>= 4:3.5.7-1)'
+DEB_DH_MAKESHLIBS_ARGS_kcontrol		:= -V'kcontrol (>= 4:3.5.7-1)'
+DEB_DH_MAKESHLIBS_ARGS_kdebase-bin	:= -V'kdebase-bin (>= 4:3.5.7-1)'
+DEB_DH_MAKESHLIBS_ARGS_kicker		:= -V'kicker (>= 4:3.5.7-1)'
+DEB_DH_MAKESHLIBS_ARGS_konqueror	:= -V'konqueror (>= 4:3.5.7-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksplash		:= -V'ksplash (>= 4:3.5.7-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksysguard	:= -V'ksysguard (>= 4:3.5.7-1)'
+DEB_DH_MAKESHLIBS_ARGS_kwin		:= -V'kwin (>= 4:3.5.7-1)'
+DEB_DH_MAKESHLIBS_ARGS_libkonq4		:= -V'libkonq4 (>= 4:3.5.7-1)'
+
+#shlibs_ver = 4:3.5.0-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+
+
+common-install-prehook-arch::
+	grep -v -e joystick -e view1394  debian/kcontrol.install > debian/kcontrol.install.kfreebsd-i386
+	grep -v -e joystick -e view1394  debian/kcontrol.install > debian/kcontrol.install.kfreebsd-amd64
+	grep -v -e media_propsdlgplugin  debian/kdebase-kio-plugins.install > debian/kdebase-kio-plugins.install.kfreebsd-i386
+	grep -v -e media_propsdlgplugin  debian/kdebase-kio-plugins.install > debian/kdebase-kio-plugins.install.kfreebsd-amd64
+
+clean::
+	rm -f debian/kcontrol.install.kfreebsd* debian/kdebase-kio-plugins.install.kfreebs*
+
+binary-install/kdebase-bin::
+	install -p -D -m644 debian/kcheckpass.pam debian/kdebase-bin/etc/pam.d/kcheckpass
+	install -p -D -m644 debian/kscreensaver.pam debian/kdebase-bin/etc/pam.d/kscreensaver
+
+binary-install/kdebase-data::
+	# hack the oui.db install, as under kfreebsd it does not get installed and then breaks at dh_install time
+	# it's in fact a linux specific file...
+	install -p -D -m644 kcontrol/view1394/oui.db debian/kdebase-data/usr/share/apps/kcmview1394/oui.db
+	
+binary-install/kdm::
+	install -p -D -m644 debian/kdm.pam debian/kdm/etc/pam.d/kdm
+	install -p -D -m644 debian/kdm-np.pam debian/kdm/etc/pam.d/kdm-np
+
+binary-install/kcontrol::
+	install -p -D -m755 kcontrol/input/consoleUserPerms debian/kcontrol/etc/hotplug/usb/logitechmouse
+	cat kcontrol/input/logitechmouse.usermap | sed -e 's/consoleUserPerms/logitechmouse/' \
+		> debian/kcontrol/etc/hotplug/usb/logitechmouse.usermap
+	mkdir -p debian/kcontrol/etc/udev/rules.d
+	chmod +x debian/usermap.pl
+	debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/kcontrol/etc/udev/logitechmouse.rules
--- kdebase-3.5.7.orig/debian/kdesktop.preinst
+++ kdebase-3.5.7/debian/kdesktop.preinst
@@ -0,0 +1,25 @@
+#! /bin/sh -e
+
+case "$1" in
+
+    upgrade)
+	rm -f /etc/kde3/debian/debian.desktop
+	rm -f /etc/kde3/debian/debian.html
+    ;;
+
+    install)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
--- kdebase-3.5.7.orig/debian/icons/kappfinder.xpm
+++ kdebase-3.5.7/debian/icons/kappfinder.xpm
@@ -0,0 +1,245 @@
+/* XPM */
+static char *kappfinder[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 207 2",
+"   c black",
+".  c #635B67",
+"X  c #0032A4",
+"o  c #053AA9",
+"O  c #083FAD",
+"+  c #0234C7",
+"@  c #0336E3",
+"#  c #0941AE",
+"$  c #0A44B0",
+"%  c #0E4AB3",
+"&  c #104EB6",
+"*  c #1353BA",
+"=  c #1759BE",
+"-  c #185BBF",
+";  c #29448D",
+":  c #195EC1",
+">  c #0349FF",
+",  c #0A4FFF",
+"<  c #0D53FF",
+"1  c #1157FF",
+"2  c #145AFF",
+"3  c #195FFF",
+"4  c #1D64C5",
+"5  c #1F68C8",
+"6  c #1C62FF",
+"7  c #226CCA",
+"8  c #2572CE",
+"9  c #2775D0",
+"0  c #297AD3",
+"q  c #2166FF",
+"w  c #2368FF",
+"e  c #286EFF",
+"r  c #2B70FF",
+"t  c #3174FE",
+"y  c #357BFF",
+"u  c #3A7FFF",
+"i  c #666685",
+"p  c #757793",
+"a  c #787793",
+"s  c #7B7B96",
+"d  c #2E82D9",
+"f  c #3186DB",
+"g  c #338BDE",
+"h  c #368FE1",
+"j  c #3D82FF",
+"k  c #3894E4",
+"l  c #7F8AA7",
+"z  c #5D99DD",
+"x  c #4187FF",
+"c  c #4489FF",
+"v  c #498EFF",
+"b  c #4E93FF",
+"n  c #5A8EF9",
+"m  c #5196FF",
+"M  c #559AFF",
+"N  c #589DFF",
+"B  c #4AA1EB",
+"V  c #5EA3FF",
+"C  c #609CDF",
+"Z  c #609EE0",
+"A  c #63A3E3",
+"S  c #66A8E6",
+"D  c #65ABE9",
+"F  c #69ADE9",
+"G  c #65A9FF",
+"H  c #6AAEFF",
+"J  c #6DB1FF",
+"K  c #71B5FF",
+"L  c #76BAFF",
+"P  c #78BCFF",
+"I  c #7DC2FD",
+"U  c #8A5D38",
+"Y  c #955E28",
+"T  c #9B6428",
+"R  c #A26929",
+"E  c #A96F2A",
+"W  c #AD7026",
+"Q  c #AD7129",
+"!  c #B47526",
+"~  c #B17529",
+"^  c #B6792A",
+"/  c #BB7B27",
+"(  c #BC7D29",
+")  c #A27447",
+"_  c #A2774C",
+"`  c #DF951E",
+"'  c #C28027",
+"]  c #C3832A",
+"[  c #C98628",
+"{  c #CC892A",
+"}  c #C98A30",
+"|  c #D18C29",
+" . c #E0971F",
+".. c #E39A21",
+"X. c #C89246",
+"o. c #D39B43",
+"O. c #D09849",
+"+. c #D9A863",
+"@. c #E3AF4B",
+"#. c #F1BB56",
+"$. c #F1BC59",
+"%. c #F3C75F",
+"&. c #EDC565",
+"*. c #E9C071",
+"=. c #F0C661",
+"-. c #868296",
+";. c #82869E",
+":. c #8989A2",
+">. c #8590AD",
+",. c #8D99AE",
+"<. c #8499B4",
+"1. c #938FA1",
+"2. c #9394AB",
+"3. c #999EB2",
+"4. c #A7A7BB",
+"5. c #ABAABC",
+"6. c #8FAED0",
+"7. c #99A9C7",
+"8. c #A4B1C2",
+"9. c #A8B5C4",
+"0. c #A4B5D0",
+"q. c #A7B8D4",
+"w. c #ACBCD7",
+"e. c #B2B2C3",
+"r. c #BBBBCB",
+"t. c #A5B7E6",
+"y. c #AFBBEB",
+"u. c #86C4F6",
+"i. c #82C6FF",
+"p. c #89C7F7",
+"a. c #88CCFF",
+"s. c #95C1EB",
+"d. c #98C4EF",
+"f. c #9ECCEF",
+"g. c #95CDF3",
+"h. c #91CDF8",
+"j. c #96D1F8",
+"k. c #99D4F8",
+"l. c #9ED8F9",
+"z. c #A0C5D8",
+"x. c #ADC2D4",
+"c. c #B0C1CE",
+"v. c #B0C5D1",
+"b. c #B1CAD5",
+"n. c #BBC9DD",
+"m. c #A6C3E7",
+"M. c #A0CEE7",
+"N. c #A9C6E9",
+"B. c #A9CEE9",
+"V. c #ADD1E6",
+"C. c #A0D6F4",
+"Z. c #A3DCFA",
+"A. c #B5C7F5",
+"S. c #BCCEF0",
+"D. c #BACCFB",
+"F. c #BED0FE",
+"G. c #A7E0FA",
+"H. c #ABE3FA",
+"J. c #BAE7EF",
+"K. c #B0E7FB",
+"L. c #B3EAFC",
+"P. c #BAE9F4",
+"I. c #BBEFFD",
+"U. c #BDF2FD",
+"Y. c #D8BB84",
+"T. c #C2BEC4",
+"R. c #F8DB96",
+"E. c #F8DD99",
+"W. c #FEF3BD",
+"Q. c #C0C0CE",
+"!. c #CCC7CD",
+"~. c #CEC9CF",
+"^. c #C3C5D2",
+"/. c #CACAD5",
+"(. c #CECDD9",
+"). c #D1CFDB",
+"_. c #D5D4DE",
+"`. c #C4CCE1",
+"'. c #C3D2E6",
+"]. c #C2D3E8",
+"[. c #CBD3E9",
+"{. c #CFDBE2",
+"}. c #CEDFFC",
+"|. c #D6D5E0",
+" X c #D8D7E0",
+".X c #DCDCE4",
+"XX c #C2F5FD",
+"oX c #C6FAFE",
+"OX c #CCF1F4",
+"+X c #CAF5FD",
+"@X c #CBFCFE",
+"#X c #D8EBEF",
+"$X c #D4E5FF",
+"%X c #DAECFF",
+"&X c #D3FEFE",
+"*X c #DFF0FF",
+"=X c #DBFEFF",
+"-X c #E4E3EB",
+";X c #E9E9EE",
+":X c #EDEDF1",
+">X c #E3FFFF",
+",X c #EBFEFE",
+"<X c #F1F1F5",
+"1X c #F5F5F8",
+"2X c #F3FFFF",
+"3X c #FEFEFE",
+"4X c None",
+/* pixels */
+"4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X",
+"k k k h g f d 0 0 9 8 7 5 4 : - = * % % $ O o o X X 4X4X4X4X4X4X",
+"k I a.i.I P J H V N m v x u t r q 6 2 < > > > > + X 4X4X4X4X4X4X",
+"B a.i.I L J H G V M b c j u t e q 3 1 , > > > > @ X 4X4X4X4X4X4X",
+"B i.I P J J G G N m b x j y n t 6 2 1 , > > > > @ X 4X4X4X4X4X4X",
+"D >X%X%X%X%X$X$X$X$X}.S.[.'.'.'.`.t.A.F.D.D.D.D.y.X 4X4X4X4X4X4X",
+"F 3X3X3X3X3X3X3X3X;X'.d.u.h.j.k.j.f.n._.1X1X1X1X-XX 4X4X4X4X4X4X",
+"F 3X3X3X3X3X3X3X;XN.p.k.l.Z.G.H.H.L.Z.B./.<X1X1X-XX 4X4X4X4X4X4X",
+"F 3X3X3X3X3X3X;Xm.h.l.H.L.L.L.Z.l.K.I.L.V.^.<X<X-XX 4X4X4X4X4X4X",
+"F 3X3X3X3X3X1Xn.u.Z.L.U.oX@XL.oXK.K.L.U.L.x.|.<X.XX 4X4X4X4X4X4X",
+"S 3X3X3X3X3X.Xs.j.H.U.@X=X=XL.+XU.U.U.U.@XP.9.<X.XX 4X4X4X4X4X4X",
+"F 3X3X3X3X3X^.u.Z.L.oX=X,X2XI.XX@XoXoX@X@X@X5.-X_.X 4X4X4X4X4X4X",
+"A 3X3X3X3X1Xq.j.Z.L.@X=X2X>XU.+X&X&X&X&X&X&Xb.(._.X 4X4X4X4X4X4X",
+"A 3X3X3X3X;Xw.l.Z.H.L.+X+XXXoX>X&X=X&X=X=X=Xx.r._.X 4X4X4X4X4X4X",
+"A 3X3X3X3X;X0.l.G.L.L.H.L.XX=X>X=X=X>X>X>X=Xc.r._.X 4X4X4X4X4X4X",
+"A 3X3X3X3X3X7.j.G.Z.L.oX+X=X=X=X=X>X,X,X,X,X9.).).X 4X4X4X4X4X4X",
+"A 3X3X3X3X3X5.g.H.G.G.L.U.@X&X=X>X,X2X2X2X,X;..X).X 4X4X4X4X4X4X",
+"A 3X3X3X3X3X/.6.G.L.G.L.XX@X&X>X>X,X2X3X2X{.2.-X(.X 4X4X4X4X4X4X",
+"A 3X3X3X3X3X1X2.g.L.L.L.XX@X&X=X>X,X2X3X3Xl e.-X(.X 4X4X4X4X4X4X",
+"C 3X3X3X3X3X3X_.>.l.U.U.U.@X&X=X>X,X,X2X3.:.:.-X(.X 4X4X4X4X4X4X",
+"z 3X3X3X3X3X1X3X/.l f.U.@X@X@X=X=X>X#X:.:.2.5.!.+.; 4X4X4X4X4X4X",
+"C 3X3X3X3X1X1X1X1X.X:.<.z.J.@XOXb.,.a 5.2.e.T.O...} | 4X4X4X4X4X",
+"z 1X1X<X:X:X:X;X;X-X-XQ.2.s s s :.5._._.|./.X.*.$...| { 4X4X4X4X",
+"0 8 7 7 7 4 - = * * & % # O o X X X X X X . @.W.E.$...[ ] 4X4X4X",
+"4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X] [ %.W.E.$...' ( 4X4X",
+"4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X( ( =.W.E.$.../ ^ 4X",
+"4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X~ ^ =.W.E.#.` ! Q ",
+"4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4XQ ~ &.W.R.#.` W ",
+"4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4XR E &.W.R.o._ ",
+"4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4XT R &.Y.) 1.",
+"4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4XY T U -.i ",
+"4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X4X"
+};
--- kdebase-3.5.7.orig/debian/icons/kfm.xpm
+++ kdebase-3.5.7/debian/icons/kfm.xpm
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kfm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c black",
+".  c #000015",
+"X  c #000024",
+"o  c #03062E",
+"O  c #00003B",
+"+  c #050E33",
+"@  c #01024C",
+"#  c #050C42",
+"$  c #000055",
+"%  c #00015B",
+"&  c #091749",
+"*  c #081657",
+"=  c #0A1B59",
+"-  c #000063",
+";  c #00006D",
+":  c #050D6E",
+">  c #000172",
+",  c #040B7A",
+"<  c #040973",
+"1  c #09186D",
+"2  c #081462",
+"3  c #07117F",
+"4  c #08127A",
+"5  c #091874",
+"6  c #0E256C",
+"7  c #0E2778",
+"8  c #091381",
+"9  c #0B1985",
+"0  c #0A1D89",
+"q  c #0E2485",
+"w  c #0F298E",
+"e  c #0D2389",
+"r  c #0F2891",
+"t  c #14288F",
+"y  c #13218E",
+"u  c #142A97",
+"i  c #13328D",
+"p  c #123299",
+"a  c #163B9A",
+"s  c #19339C",
+"d  c #1636AB",
+"f  c #1538AF",
+"g  c #1F36A3",
+"h  c #1836AA",
+"j  c #1B3FA4",
+"k  c #153AA2",
+"l  c #282F8E",
+"z  c #283B99",
+"x  c #213FA8",
+"c  c #1742A7",
+"v  c #1943A6",
+"b  c #1B46A8",
+"n  c #1D4BAB",
+"m  c #1742AE",
+"M  c #1B47B8",
+"N  c #1E51B1",
+"B  c #34419A",
+"V  c #2743AB",
+"C  c #2249AB",
+"Z  c #2D4BAC",
+"A  c #2245A6",
+"S  c #2B4FBB",
+"D  c #294AB5",
+"F  c #2C50AF",
+"G  c #2055B2",
+"H  c #2259B6",
+"J  c #235CB9",
+"K  c #2858B6",
+"L  c #2C59B8",
+"P  c #354AA1",
+"I  c #304BB3",
+"U  c #3252B3",
+"Y  c #395CB4",
+"T  c #345ABB",
+"R  c #2560BC",
+"E  c #3462BB",
+"W  c #3D62B8",
+"Q  c #1B57C3",
+"!  c #1D50D7",
+"~  c #1F61CA",
+"^  c #2054C1",
+"/  c #2353D4",
+"(  c #3058C2",
+")  c #2057E0",
+"_  c #2463C5",
+"`  c #276DCF",
+"'  c #2C66C0",
+"]  c #2669D2",
+"[  c #2C65D9",
+"{  c #2C76DB",
+"}  c #3C64C1",
+"|  c #3C6FC4",
+" . c #3465D6",
+".. c #3C6AD4",
+"X. c #396BD8",
+"o. c #3D74D5",
+"O. c #3978DB",
+"+. c #2F6DE5",
+"@. c #2578EB",
+"#. c #336FEB",
+"$. c #386FE5",
+"%. c #316FE4",
+"&. c #346EF0",
+"*. c #3571E2",
+"=. c #3874E4",
+"-. c #3C7AE5",
+";. c #3E79ED",
+":. c #3577EA",
+">. c #3979FE",
+",. c #2969F8",
+"<. c #435EB2",
+"1. c #4567BF",
+"2. c #446BBD",
+"3. c #4768B7",
+"4. c #5061AD",
+"5. c #5C6AB6",
+"6. c #5171BC",
+"7. c #6C7DBF",
+"8. c #4469C4",
+"9. c #4C78C8",
+"0. c #4378D9",
+"q. c #547AC4",
+"w. c #5378C4",
+"e. c #407DE5",
+"r. c #437EEA",
+"t. c #407FFE",
+"y. c #2E81EE",
+"u. c #3785E7",
+"i. c #3D8CED",
+"p. c #3589F5",
+"a. c #398BF4",
+"s. c #3C93FD",
+"d. c #4781D7",
+"f. c #4D85DB",
+"g. c #4C8ADA",
+"h. c #5381CB",
+"j. c #5B8ED3",
+"k. c #568BD9",
+"l. c #5E95DB",
+"z. c #4582E5",
+"x. c #4A83EA",
+"c. c #4A88E7",
+"v. c #4582FE",
+"b. c #4987FE",
+"n. c #4C8AFE",
+"m. c #4196FD",
+"M. c #4599FE",
+"N. c #4B9DFD",
+"B. c #548AEA",
+"V. c #528EFE",
+"C. c #5A93E9",
+"Z. c #5C98EE",
+"A. c #5492FE",
+"S. c #5995FD",
+"D. c #5D99FE",
+"F. c #5E99F5",
+"G. c #4EA0FE",
+"H. c #53A3FD",
+"J. c #5AA3FE",
+"K. c #5CA9FE",
+"L. c #6489CA",
+"P. c #6A88C7",
+"I. c #6C8FCE",
+"U. c #648ED0",
+"Y. c #6F90D0",
+"T. c #7A8DC8",
+"R. c #738FCA",
+"E. c #7793CC",
+"W. c #7B9DD5",
+"Q. c #6197E6",
+"!. c #639BE7",
+"~. c #619EFE",
+"^. c #6D9FFE",
+"/. c #6CAAEA",
+"(. c #65A1FE",
+"). c #62ADFE",
+"_. c #6AA5FE",
+"`. c #6EA9FE",
+"'. c #65B0FE",
+"]. c #6BB4FE",
+"[. c #74AEEC",
+"{. c #7AACEE",
+"}. c #76A4E9",
+"|. c #73ADFE",
+" X c #7AAFFE",
+".X c #71ABF3",
+"XX c #74B2EA",
+"oX c #7CB6EC",
+"OX c #7CB9ED",
+"+X c #73B4FE",
+"@X c #73BAFF",
+"#X c #7AB5FF",
+"$X c #79BBFE",
+"%X c #7CC0FF",
+"&X c #8E95C7",
+"*X c #8A9DD0",
+"=X c #85A8DA",
+"-X c #99ABD9",
+";X c #84ABF0",
+":X c #84BBEB",
+">X c #8CBAE7",
+",X c #82B4FE",
+"<X c #82BCFF",
+"1X c #8AB0F7",
+"2X c #B8BCDB",
+"3X c #86C0EF",
+"4X c #8EC1ED",
+"5X c #82C3FF",
+"6X c #87C8FF",
+"7X c #8AC3FF",
+"8X c #8CCAFF",
+"9X c #95C1EB",
+"0X c #9DC6EC",
+"qX c #93CBFF",
+"wX c #99C8FB",
+"eX c #93D0FF",
+"rX c #9BD3FE",
+"tX c #9ED8FF",
+"yX c #A7C8EB",
+"uX c #ACC8FF",
+"iX c #A1D2FF",
+"pX c #A4DBFF",
+"aX c #AFD6FF",
+"sX c #A8DDFF",
+"dX c #B5C6E7",
+"fX c #B7C8E8",
+"gX c #BACCEC",
+"hX c #BAD6F7",
+"jX c #B9D5FF",
+"kX c #BCDAF6",
+"lX c #BDDAFF",
+"zX c #B2D6F5",
+"xX c #ADE1FF",
+"cX c #B2E3FF",
+"vX c #BBE6FF",
+"bX c #CDDAEF",
+"nX c #C4DEF5",
+"mX c #C1DBFB",
+"MX c #C9D9F4",
+"NX c #D2DFF3",
+"BX c #C3E2FC",
+"VX c #C0E9FF",
+"CX c #C9E5FF",
+"ZX c #CCECFF",
+"AX c #CCE1F5",
+"SX c #D3E4F5",
+"DX c #D2ECFE",
+"FX c #D9E8F8",
+"GX c #D2E1FA",
+"HX c #D7F1FF",
+"JX c #DCF2FF",
+"KX c #E6F6FF",
+"LX c #EBF5FF",
+"PX c #EEF9FF",
+"IX c gray100",
+"UX c #F5FCFF",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXn n v v a     YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXn n n Q @.@.v a &   YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXN N N ~ y.s.s.s.p.M p 6     YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXG N N ` a.M.M.M.m.m.s.s.Q p 7     YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXG H N { m.G.G.G.G.G.G.M.M.M.m.] p q &   YXYXYXYXYX",
+"YXYXYXYXYXH H _ { N.K.H.H.K.H.H.H.G.H.G.G.M.M.y.k e *     YXYXYX",
+"YXYXR J J _ u.H.K.K.K.K.K.K.K.K.K.K.H.H.G.G.G.m.a.f 0 1     YXYX",
+"YXR J ` i.H.K.K.).'.'.'.'.].'.'.).K.K.K.H.H.G.G.N.m.Q 0 5     YX",
+"YXR }.G.K.K.).).].].].@X@X].@X].].].).K.K.K.H.H.N.M.m.] 0 4     ",
+"YXJ B.jX+X).].].@X@X@X@X%X$X@X@X@X@X].].).K.K.H.H.N.m.S.#.8     ",
+"YXH #.v.uXwX@X@X$X$X%X5X5X5X%X5X$X$X@X@X].).).K.H.~.D.>.,.8     ",
+"YXH :.>.t.,XaX$X%X6X6X6X8X8X6X6X6X5X$X$X@X].#X_.A.&.D D ) ,     ",
+"YXG :.v.b.b.^.lXeX6X8XeXeXeXeX8X6X6X5X$X5X|.V.$.( 7.gX5.! ,     ",
+"YXG ;.b.n.V.A.D.jXsXrXrXtXtXtXrXeXeXiX+XA.X.} *XMX1X:.f ! ,     ",
+"YXN r.V.A.S.S.D.D.wXBXpXxXxXpXsXwX XS.o.w.-XMX;X-.=.%.d / <     ",
+"YXN x.S.S.D.D.D.~.~.,XDXvXvXiX|.F.o.Y.fXkX{.c.0.e.-.*.h / >     ",
+"YXn c.D.~.~.(._._._.`.|.LX,XZ.d.W.MXkXXX/.0.n 8 z.e.=.u [ >     ",
+"YXn B.(._._.`.`.|.|.|.|.lX+Xh.SXzXOXXX/.' k u T 0.S g S r.>     ",
+"YXn B.`.`.|.|.|.+X#X#X#XlX#Xh.kX3XOXoX/.E 9.k.U V V 5.5. .>     ",
+"YXv B.|.|.+X#X#X#X,X<X<XmX<Xq.nX9X>X:XXXj.T Z U T.MX;XI  .>     ",
+"YXv C.#X#X,X<X<X5X7X7X<XBX7Xw.NXyX9XL.8.F W -XNX{.e.+.d  .>     ",
+"YXv Q.#X<X<X7X7X7X7X8XwXCX8X6.bXR.2.T q.dXmX{.c.e.=.%.d ..>     ",
+"YXk Q.<X<X7X7X8XwXqXqXrXZXrXw.2.| I.NXzX{.C.0.v r.e.*.d ..>     ",
+"YXa L .X7X8XqXqXrXrXrXrXZXtXj.=XFXzXoX/.g.K w 9 z.e.D g 0.>     ",
+"YX  i C !.qXrXrXtXtXpXpXDXpXh.AX3XoXXX/.n A } k.V U 8.s > $     ",
+"YX    7 a q.rXpXsXsXxXcXHXcXq.BX4X:XoXXXl.l.I 1.8.y ; $ .       ",
+"YXYX    = w Y wXxXcXvXvXJXvX6.AX0X9X:Xj.Y q.8.4 ; @             ",
+"YXYXYX    + q z >XvXZXZXKXDX6.FXyXL.6.U.<., ; O             YXYX",
+"YXYXYXYX      5 t E.DXJXPXJX<.T.P.=XB > % O             YXYXYXYX",
+"YXYXYXYXYXYX    2 9 4.SXUXPXgX=XB ; - X             YXYXYXYXYXYX",
+"YXYXYXYXYXYXYX    # 4 z 2X&Xl < % .             YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYX    o : , : @               YXYXYXYXYXYXYXYXYXYX"
+};
--- kdebase-3.5.7.orig/debian/icons/kinfocenter-16.xpm
+++ kdebase-3.5.7/debian/icons/kinfocenter-16.xpm
@@ -0,0 +1,193 @@
+/* XPM */
+static char * kinfocenter_16_xpm[] = {
+"16 16 174 2",
+"  	c None",
+". 	c #A6DBF4",
+"+ 	c #CFEBF9",
+"@ 	c #C9EAF9",
+"# 	c #A1DCF7",
+"$ 	c #CEE0F3",
+"% 	c #D9E4F4",
+"& 	c #E6EEF8",
+"* 	c #E7EEF8",
+"= 	c #DCE5F5",
+"- 	c #BCE3FF",
+"; 	c #256589",
+"> 	c #64B0E5",
+", 	c #B2CBEA",
+"' 	c #A3C5E9",
+") 	c #DEEAF7",
+"! 	c #B4CDED",
+"~ 	c #5CB5F0",
+"{ 	c #419CDF",
+"] 	c #86B0DF",
+"^ 	c #7CACDF",
+"/ 	c #B8D2EE",
+"( 	c #86AFDF",
+"_ 	c #3CA2EB",
+": 	c #004D85",
+"< 	c #A3A3CF",
+"[ 	c #9188AD",
+"} 	c #034A82",
+"| 	c #0884DF",
+"1 	c #428FD6",
+"2 	c #5995D6",
+"3 	c #DAE7F6",
+"4 	c #DBE7F6",
+"5 	c #3E8ED5",
+"6 	c #0683DD",
+"7 	c #005FA0",
+"8 	c #8B8BAC",
+"9 	c #ACA3B8",
+"0 	c #01386D",
+"a 	c #0078DA",
+"b 	c #0072CE",
+"c 	c #1377CD",
+"d 	c #CAE0F4",
+"e 	c #1177CD",
+"f 	c #0071D9",
+"g 	c #0F7B8C",
+"h 	c #378B1E",
+"i 	c #399D25",
+"j 	c #34A721",
+"k 	c #0D7A05",
+"l 	c #4C4C5F",
+"m 	c #ABA4C5",
+"n 	c #0A3C47",
+"o 	c #006DC9",
+"p 	c #0067C9",
+"q 	c #0067C8",
+"r 	c #CAE1F4",
+"s 	c #0068C8",
+"t 	c #0063C8",
+"u 	c #3C9E7A",
+"v 	c #80E35A",
+"w 	c #5DCF47",
+"x 	c #80DB6D",
+"y 	c #2B9022",
+"z 	c #8989B1",
+"A 	c #9D98BD",
+"B 	c #254925",
+"C 	c #358FAE",
+"D 	c #0056C6",
+"E 	c #005BC3",
+"F 	c #8EB8E3",
+"G 	c #005BC2",
+"H 	c #0059CC",
+"I 	c #2775BB",
+"J 	c #8BA78C",
+"K 	c #739B66",
+"L 	c #14A100",
+"M 	c #54C841",
+"N 	c #2E8F29",
+"O 	c #9D9DCD",
+"P 	c #9792B8",
+"Q 	c #254B25",
+"R 	c #A2ED8B",
+"S 	c #3589A8",
+"T 	c #0057BA",
+"U 	c #0058C3",
+"V 	c #0059C8",
+"W 	c #005AC2",
+"X 	c #096F88",
+"Y 	c #4DA653",
+"Z 	c #75906A",
+"` 	c #415E3E",
+" .	c #089000",
+"..	c #4CC33F",
+"+.	c #2B8D29",
+"@.	c #9A9AC8",
+"#.	c #9691B8",
+"$.	c #204624",
+"%.	c #BAED84",
+"&.	c #B4EF90",
+"*.	c #55B464",
+"=.	c #4B9092",
+"-.	c #489093",
+";.	c #59A87D",
+">.	c #67C14F",
+",.	c #7ACF60",
+"'.	c #96C38D",
+").	c #7EAB78",
+"!.	c #70C06C",
+"~.	c #7ED279",
+"{.	c #218821",
+"].	c #9491B8",
+"^.	c #254022",
+"/.	c #D7A95B",
+"(.	c #8CE254",
+"_.	c #A0E879",
+":.	c #86847C",
+"<.	c #699351",
+"[.	c #6FD35D",
+"}.	c #65C173",
+"|.	c #79CC6C",
+"1.	c #919091",
+"2.	c #555455",
+"3.	c #70B06E",
+"4.	c #88D688",
+"5.	c #1F861F",
+"6.	c #938FB6",
+"7.	c #214325",
+"8.	c #BAD581",
+"9.	c #86E262",
+"0.	c #7BDA61",
+"a.	c #92B98F",
+"b.	c #3BAB1A",
+"c.	c #48AB88",
+"d.	c #548DF3",
+"e.	c #4BC042",
+"f.	c #46AA3E",
+"g.	c #31942F",
+"h.	c #2AA72A",
+"i.	c #62CC62",
+"j.	c #289028",
+"k.	c #908BB4",
+"l.	c #234729",
+"m.	c #D6F289",
+"n.	c #DAEA82",
+"o.	c #C2E56D",
+"p.	c #E2EA86",
+"q.	c #B0E85D",
+"r.	c #8BB66D",
+"s.	c #447F68",
+"t.	c #4C8F4B",
+"u.	c #4A9148",
+"v.	c #4B924B",
+"w.	c #4D8E4D",
+"x.	c #498E49",
+"y.	c #0D650D",
+"z.	c #A0A0CE",
+"A.	c #9490BA",
+"B.	c #234A27",
+"C.	c #E6E569",
+"D.	c #F0E26C",
+"E.	c #F1E978",
+"F.	c #EFD85C",
+"G.	c #F5FA8B",
+"H.	c #8EA842",
+"I.	c #000100",
+"J.	c #686699",
+"K.	c #0C1E12",
+"L.	c #1E4018",
+"M.	c #1D3D18",
+"N.	c #1E3E18",
+"O.	c #1D3D17",
+"P.	c #1E3F1A",
+"Q.	c #183815",
+"          . + @ #               ",
+"        $ % & * = - ;           ",
+"      > , ' ) ) ' ! ~           ",
+"      { ] ^ / / ^ ( _ :         ",
+"< [ } | 1 2 3 4 2 5 6 7         ",
+"8 9 0 a b c d d e b f g h i j k ",
+"l m n o p q r r q s t u v w x y ",
+"z A B C D E F F G H I J K L M N ",
+"O P Q R S T U V W X Y 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.              ",
+"                                "};
--- kdebase-3.5.7.orig/debian/icons/kdeprintfax.xpm
+++ kdebase-3.5.7/debian/icons/kdeprintfax.xpm
@@ -0,0 +1,132 @@
+/* XPM */
+static char *kdeprintfax[] = {
+/* 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 @ ..........",
+"....................    .     .     .   .     .       .........."
+};
--- kdebase-3.5.7.orig/debian/icons/kdeprint-16.xpm
+++ kdebase-3.5.7/debian/icons/kdeprint-16.xpm
@@ -0,0 +1,159 @@
+/* XPM */
+static char *kdeprint-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 137 2",
+"   c black",
+".  c gray5",
+"X  c #252525",
+"o  c #313131",
+"O  c #323232",
+"+  c #333335",
+"@  c #464646",
+"#  c #4D4D4F",
+"$  c #545455",
+"%  c #555556",
+"&  c #56565B",
+"*  c #59595B",
+"=  c #58585D",
+"-  c #5A5A62",
+";  c #5C5C68",
+":  c #606065",
+">  c #6C6C6E",
+",  c #6F6F74",
+"<  c #707073",
+"1  c #76767E",
+"2  c #7C7C80",
+"3  c #7F7F84",
+"4  c #008CFD",
+"5  c #008EFF",
+"6  c #239EFF",
+"7  c #498ADF",
+"8  c #538FDE",
+"9  c #40A1ED",
+"0  c #4BB5FD",
+"q  c #51B8FD",
+"w  c #6699DE",
+"e  c #6A9CDE",
+"r  c #7EA7DF",
+"t  c #76C7FD",
+"y  c #84848C",
+"u  c #878792",
+"i  c #898990",
+"p  c #898993",
+"a  c #93939E",
+"s  c #8B9AB2",
+"d  c #9999A7",
+"f  c #9A9AA6",
+"g  c #90A3BF",
+"h  c #A3A3AB",
+"j  c #A0A0AC",
+"k  c #A6A6AD",
+"l  c #A3A3B2",
+"z  c #A9A9B2",
+"x  c #AFAFB6",
+"c  c #AFAFB7",
+"v  c #A5BABC",
+"b  c #B0B0B7",
+"n  c #B1B1B6",
+"m  c #B1B1B9",
+"M  c #B4B4BD",
+"N  c #83A9DE",
+"B  c #8FB1D3",
+"V  c #8BB2DA",
+"C  c #9BB6DE",
+"Z  c #9EB7DF",
+"A  c #B3B3C1",
+"S  c #B3B3C2",
+"D  c #B1B1C5",
+"F  c #B9B9C0",
+"G  c #B9B9C4",
+"H  c #BEBECA",
+"J  c #BDBDCE",
+"K  c #8BCDFC",
+"L  c #A8C2E4",
+"P  c #A9C3E6",
+"I  c #AAC3E5",
+"U  c #ACC7E7",
+"Y  c #ADC7E7",
+"T  c #AFC9E8",
+"R  c #B9D5F0",
+"E  c #C0C0C9",
+"W  c #C7C7CE",
+"Q  c #C0C5D7",
+"!  c #C4C6D7",
+"~  c #C8C8D2",
+"^  c #CACAD6",
+"/  c #CBCBD6",
+"(  c #CACDD4",
+")  c #CDCDDA",
+"_  c #CFD4DC",
+"`  c #D0D0D1",
+"'  c #D2D2D2",
+"]  c #D0D0DC",
+"[  c #D5D5DB",
+"{  c #D5D5DE",
+"}  c #D6D6E1",
+"|  c #D7D7E0",
+" . c #D8D8E2",
+".. c #DADAE3",
+"X. c #DBDBE3",
+"o. c #DDDDE2",
+"O. c #DFDFE6",
+"+. c #C9E5F9",
+"@. c #CBE6FA",
+"#. c #CEE8FA",
+"$. c #D5EBFB",
+"%. c #DBEEFB",
+"&. c #DCEEFB",
+"*. c #E0E1E7",
+"=. c #E1E1E9",
+"-. c #E2E2E8",
+";. c #E3E3E9",
+":. c #E2E2EA",
+">. c #E3E3EB",
+",. c #E4E4E8",
+"<. c #E4E4E9",
+"1. c #E5E5EB",
+"2. c #E6E6EB",
+"3. c #E6E6EC",
+"4. c #E8E8EC",
+"5. c #E9E9EE",
+"6. c #E2E8F1",
+"7. c #EBEBF0",
+"8. c #E9ECF3",
+"9. c #EBEFF6",
+"0. c #ECECF0",
+"q. c #ECF2F8",
+"w. c #F4F4F7",
+"e. c #F0F5FA",
+"r. c #F1F5FA",
+"t. c #F2F6FA",
+"y. c #F6F6F8",
+"u. c #F5F9FB",
+"i. c #F6F8FC",
+"p. c #F8FBFD",
+"a. c #FBFBFC",
+"s. c #F9FCFD",
+"d. c #FAFCFD",
+"f. c #FCFCFD",
+"g. c #FEFFFF",
+"h. c gray100",
+"j. c None",
+/* pixels */
+"j.j.j.j.A =.;.;.;.;.*.f j.j.j.j.",
+"j.j.j.j.H h.h.h.h.d.d.j j.j.j.j.",
+"j.j.j.j.G h.h.h.d.u.i.f j.j.j.j.",
+"j.j.j.j.M h.h.h.u.q.u.a j.j.j.j.",
+"j.j.j.j.z h.d.u.t.9.9.p j.j.j.j.",
+"j.@ # m x d.u.q.q.6.8.k c @ O j.",
+"% | =.=.g T Y Y P P P s | | ~ O ",
+"F 3.3.,.R &.&.$.#.@.@.V ) v ) 3 ",
+"{ 5.3.( K t q 0 0 0 0 9 |  . .b ",
+"k ,.3.B 6 5 5 5 5 5 5 5 { 2...i ",
+"u D D Q C r w 7 8 e N Z ! D D 1 ",
+"y J A = & & & & & & & & : J J , ",
+"2 ) H < ' ' ' ' ' ' ' ( > ^ ) * ",
+"% W =.{ h.h.h.h.h.h.h.h.( *.x X ",
+"j.. - w.h.h.h.h.h.h.d.y.o.+   j.",
+"j.j.l 4.0.5.5.0.5.4.4.,.o.; j.j."
+};
--- kdebase-3.5.7.orig/debian/icons/kpager-16.xpm
+++ kdebase-3.5.7/debian/icons/kpager-16.xpm
@@ -0,0 +1,35 @@
+/* XPM */
+static char *kpager-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 13 1",
+"  c black",
+". c gray19",
+"X c #404000",
+"o c #585858",
+"O c #008080",
+"+ c #00C0C0",
+"@ c #808080",
+"# c #A0A0A0",
+"$ c #C3C3C3",
+"% c gainsboro",
+"& c #C0C0FF",
+"* c gray100",
+"= c None",
+/* pixels */
+"             ===",
+" o@O+O+OOOo@ ===",
+" #$++OO+OO#$.===",
+" oX.XoXXooXoX=X=",
+" ***********Xo  ",
+" ***********X  =",
+" ******#oX.o. ==",
+" ******%##oX.  =",
+" **********o.  .",
+" *********&..=  ",
+" ********#Xo.  =",
+"               =",
+"========  === ==",
+"=======o ===  ==",
+"=======.===== o=",
+"================"
+};
--- kdebase-3.5.7.orig/debian/icons/kfind.xpm
+++ kdebase-3.5.7/debian/icons/kfind.xpm
@@ -0,0 +1,224 @@
+/* XPM */
+static char *kfind[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 186 2",
+"   c black",
+".  c #381E06",
+"X  c #4F4F74",
+"o  c #545477",
+"O  c #56567B",
+"+  c #5B5A7E",
+"@  c #5F5E82",
+"#  c #5E658F",
+"$  c #4B69AD",
+"%  c #5167A2",
+"&  c #526CAC",
+"*  c #605E80",
+"=  c #636284",
+"-  c #63668B",
+";  c #66698B",
+":  c #686788",
+">  c #6B6A8A",
+",  c #6E6E90",
+"<  c #6F7294",
+"1  c #6F799F",
+"2  c #74728F",
+"3  c #757492",
+"4  c #757896",
+"5  c #7F7E9B",
+"6  c #6A76A4",
+"7  c #7593CB",
+"8  c #77ABF7",
+"9  c #83460C",
+"0  c #965208",
+"q  c #945D24",
+"w  c #8E6035",
+"e  c #AA6B0C",
+"r  c #BB6F08",
+"t  c #A46A2D",
+"y  c #A46B31",
+"u  c #A97030",
+"i  c #B4792D",
+"p  c #866045",
+"a  c #D07D02",
+"s  c #B08350",
+"d  c #B89675",
+"f  c #DC8501",
+"g  c #DF921A",
+"h  c #D9982F",
+"j  c #E6A134",
+"k  c #E5A238",
+"l  c #E9A73D",
+"z  c #ECAD37",
+"x  c #FFB935",
+"c  c #FFBB39",
+"v  c #C69C6C",
+"b  c #D6A45B",
+"n  c #EBB85D",
+"m  c #E5B878",
+"M  c #F4C44E",
+"N  c #F9CF5C",
+"B  c #F9D05C",
+"V  c #F6CC72",
+"C  c #81819D",
+"Z  c #848C9D",
+"A  c #918C9F",
+"S  c #90949D",
+"D  c #8386A3",
+"F  c #8788A4",
+"G  c #8A8AA5",
+"H  c #8D8EA9",
+"J  c #8E90AA",
+"K  c #8394B1",
+"L  c #8890B7",
+"P  c #9494AD",
+"I  c #9896AE",
+"U  c #9A9AB2",
+"Y  c #9CA0B7",
+"T  c #A38C81",
+"R  c #AC9FA0",
+"E  c #A09FB6",
+"W  c #A2A2B6",
+"Q  c #A5A6BB",
+"!  c #A9A9BC",
+"~  c #91A3C3",
+"^  c #99A9C4",
+"/  c #8EB5E2",
+"(  c #84B2F5",
+")  c #87BDFA",
+"_  c #89B5F7",
+"`  c #A1ADC4",
+"'  c #A3ABCE",
+"]  c #AAABC0",
+"[  c #A5B1C4",
+"{  c #ACB0C7",
+"}  c #AEB9D6",
+"|  c #AEBEDD",
+" . c #B1B1C3",
+".. c #B5B7CA",
+"X. c #B4BACF",
+"o. c #BABACC",
+"O. c #B5BDD0",
+"+. c #ABBCE0",
+"@. c #99C0F5",
+"#. c #9AC4FB",
+"$. c #9EC9FE",
+"%. c #B5C3DC",
+"&. c #BAC0D5",
+"*. c #BBC6DE",
+"=. c #A2C2ED",
+"-. c #A5C4F4",
+";. c #A3CAF6",
+":. c #A6CAFE",
+">. c #A4D0FE",
+",. c #AFD0F3",
+"<. c #ABD2FE",
+"1. c #ADD9FD",
+"2. c #B5C5E0",
+"3. c #BDCAE2",
+"4. c #B8CFEE",
+"5. c #B8D0ED",
+"6. c #B3D4FE",
+"7. c #B0DCFF",
+"8. c #BADBFF",
+"9. c #B6E0FE",
+"0. c #BDE5FE",
+"q. c #CCBDB1",
+"w. c #C1BFCF",
+"e. c #FFE696",
+"r. c #FFE897",
+"t. c #FFE99C",
+"y. c #FFFDB3",
+"u. c #FFFEB8",
+"i. c #C2C0CF",
+"p. c #C4C3D2",
+"a. c #C5C8D7",
+"s. c #C3C9DB",
+"d. c #CACAD7",
+"f. c #CACCDA",
+"g. c #C8D0DF",
+"h. c #D3D3DE",
+"j. c #DBD4D2",
+"k. c #DAD8DD",
+"l. c #C1CEE4",
+"z. c #C4D0E5",
+"x. c #C4D2E9",
+"c. c #CBD1E2",
+"v. c #CAD6EA",
+"b. c #CED9EC",
+"n. c #C2DFFF",
+"m. c #CEDAF0",
+"M. c #D5D7E2",
+"N. c #D1DEE6",
+"B. c #D2DBED",
+"V. c #DCDBE2",
+"C. c #DADFEE",
+"Z. c #D3DEF0",
+"A. c #C4E2F5",
+"S. c #C3E4FE",
+"D. c #C4EAFF",
+"F. c #C8E4FF",
+"G. c #CBEAFE",
+"H. c #CDF0FF",
+"J. c #D6E0F2",
+"K. c #D3EDFE",
+"L. c #DBE4F3",
+"P. c #DBE6F8",
+"I. c #DBE9F3",
+"U. c #DEE8FA",
+"Y. c #D4F4FF",
+"T. c #DCF5FE",
+"R. c #DEF9FF",
+"E. c #E6DBD0",
+"W. c #E1DEDB",
+"Q. c #E4E0DC",
+"!. c #E2E2E9",
+"~. c #EBEBEF",
+"^. c #E0E7F6",
+"/. c #E1E9F6",
+"(. c #E3EBF9",
+"). c #EBEEF3",
+"_. c #E8EEFB",
+"`. c #E4F9FE",
+"'. c #ECF1F4",
+"]. c #EBF2FD",
+"[. c #EDFCFE",
+"{. c #F3F3F6",
+"}. c #F0F6FE",
+"|. c #F4FAFE",
+" X c #FEFEFE",
+".X c None",
+/* pixels */
+".X.X.X.X.X.X.Xz.z.z.z.z.z.z.z.z.z.z.z.z.z.z.Y .X.X.X.X.X.X.X.X.X",
+".X.X.X.X.X.X.Xz. X X X X X X X X X X|.].(.J.x.[ .X.X.X.X.X.X.X.X",
+".X.X.X.X.X.X.Xz. X X X X X X X X X X}.].^.Z.3.].[ .X.X.X.X.X.X.X",
+".X.X.X.X.X.X.Xz. X X X X X X X X X X|.]._.J.z.}.U.[ .X.X.X.X.X.X",
+".X.X.X.X.X.X.Xz. X X X X X X X X X X|.}._.L.z. X_.P.[ .X.X.X.X.X",
+".X.X.X.X.X.X.Xz. X X X X X X X X X X X}.].^.z. X X].U.[ .X.X.X.X",
+".X.X.X.X.X.X.Xz. X X X{.V.k.k.V.~.{. X|.].(.3.}.]./.P.A.Y .X.X.X",
+".X.X.X.X.X.X.Xz. X XM.]  ...&.i.&.d.). X}._.v.^ ^ ^ ^ ^ ^ ^ .X.X",
+".X.X.X.X.X.X.Xz.'.! U ! X.s.g.g.a.a.&.h.}.]._./.J.l.%.%.| K   .X",
+".X.X.X.X.X.X.X*.I I ` A.T.`.[.|.[.I.f.p.f.].(.^.v.3.3.2.%.K   .X",
+".X.X.X.X.X.X.XH G ~ 0.Y.R.`.[.[.[.`.Y.f.p.M._.B.c.z.l.l.3.K   .X",
+".X.X.X.X.X, , C K 1.D.Y.T.R.`.`.`.R.T.G.a.p.B.B.v.v.x.c.x.K   .X",
+".X.X.X.X.X: > 5 / 1.0.H.Y.Y.T.T.T.Y.H.0.5.i.a.B.b.b.v.v.v.K   .X",
+".X.X.X.X.X: 3 6 ) 1.8.0.G.H.Y.T.Y.H.D.9.,.&.p.J.Z.Z.B.B.m.K   .X",
+".X.X.X.X.X: 2 & 8 #.1.8.0.D.D.D.0.0.8.1.;.| d.J.J.J.Z.Z.Z.K   .X",
+".X.X.X.X.X* > $ _ #.:.<.7.8.8.8.7.<.>.>.#.| i.L.L.L.J.J.J.K   .X",
+".X.X.X.X.X@ : % _ :.<.8.n.F.F.n.n.6.<.:.) O.w.^.^.L.L.L.J.K   .X",
+".X.X.X.X.XO @ # ( <.n.n.K.K.K.Y.G.S.6.<.-.X.w././.^.^.L.P.K   .X",
+".X.X.X.X.Xo o = 7 8.S.K.T.`.`.`.T.K.n.6.|  .s.(.(.(.^.^.P.K   .X",
+".X.X.X.X.X.XX @ - +.G.T.`.[.[.[.`.T.K.4.] ] C._.(./.^.^.U.K   .X",
+".X.X.X.X.X.X.XD @ 6 4.T.[.|. X X}.`.x.{ Q ' W.(.(.(.^.^.U.K   .X",
+".X.X.X.X.X.X.Xz.D @ < ` N.'.'.'.L.X.U P W ' q.m E./.U.(.U.K   .X",
+".X.X.X.X.X.X.Xz. X! > = 4 P Q Y H J P F L A s z l Q././.U.K   .X",
+".X.X.X.X.X.X.Xl. X X!.E F 5 C F I o./.}.R w n y.B j W.(.U.K   .X",
+".X.X.X.X.X.X.Xz. X X X X|.'.'.].|.|.}.}.d r c t.u.B k W.U.K   .X",
+".X.X.X.X.X.X.Xz. X X X X X|. X|.}.}.}.[.j.u f x e.u.N j W.K   .X",
+".X.X.X.X.X.X.Xz. X X X X|. X|.|.|.}.}.}.].!.t f c e.u.N k S   .X",
+".X.X.X.X.X.X.Xz. X X X|. X|.|.|.|.|.}.}.].].V.y f c e.u.B h e .X",
+".X.X.X.X.X.X.Xz.|. X X X X|. X|.}.|.}.}.].]._.k.t f c r.u.M g   ",
+".X.X.X.X.X.X.Xz.K K K K K K K K K K K K K K K K Z q f c V b v   ",
+".X.X.X.X.X.X.X.X                                  . 0 a i T P   ",
+".X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X.X9 0 p 3 ;   "
+};
--- kdebase-3.5.7.orig/debian/icons/kpager.xpm
+++ kdebase-3.5.7/debian/icons/kpager.xpm
@@ -0,0 +1,100 @@
+/* XPM */
+static char *kpager[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 62 1",
+"  c black",
+". c #010101",
+"X c #020202",
+"o c gray1",
+"O c #040404",
+"+ c gray2",
+"@ c #070707",
+"# c gray3",
+"$ c #090909",
+"% c #0B0B0B",
+"& c #0C0C0C",
+"* c gray5",
+"= c gray8",
+"- c #181818",
+"; c #1D1D1D",
+": c gray12",
+"> c #323232",
+", c gray30",
+"< c #585858",
+"1 c #7A7979",
+"2 c #7C7C7C",
+"3 c #7E7E7E",
+"4 c #008586",
+"5 c #00898A",
+"6 c #008D8F",
+"7 c #009193",
+"8 c #009598",
+"9 c #00999C",
+"0 c #009EA1",
+"q c #00A2A5",
+"w c #00A6AA",
+"e c #00AAAE",
+"r c #00AEB3",
+"t c #818181",
+"y c gray51",
+"u c #848484",
+"i c #888888",
+"p c #8B8B8B",
+"a c gray65",
+"s c gray66",
+"d c #A9A9A9",
+"f c #AAAAAA",
+"g c #AEAEAC",
+"h c #B1B1B1",
+"j c gray70",
+"k c #B6B6B6",
+"l c gray74",
+"z c #C3C3C3",
+"x c #C5C5C5",
+"c c #DADADA",
+"v c #DDDBDB",
+"b c #E1E1E1",
+"n c gray92",
+"m c gray93",
+"M c #EEEEEE",
+"N c #F1F1F1",
+"B c gray95",
+"V c #F8F8F8",
+"C c #FDFDFD",
+"Z c #FEFEFE",
+"A c gray100",
+"S c None",
+/* pixels */
+"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS",
+"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS",
+"                          SSSSSS",
+" AAA,45678990qwwrAAA,AAA, SSSSSS",
+" All,45678990qwwrAll,All, SSSSSS",
+" All,45678990qwwrAll,All, SSSSSS",
+" ,,,,,,,,,,,,,,,,,,,,,,,, SSSSSS",
+" uggAAAAAAAAAACAAAAAAACAz SSSSSS",
+" uggAAAAAAAAACACACACACACz SS   S",
+" uvvAAAAAAAAAACACACACACAz S    S",
+" uvvAAAAAAAAACAAACACACAAz S    S",
+" uvvAAAAAAAAAAAAnVCACAAAz S   SS",
+" uvvAAAAAAAAAAAMahnbx111<  = SSS",
+" uvvAAAAAAAAAAA111111111<  :SSSS",
+" uvvAAAAAAAAAAAh2yapy211<    SSS",
+" uvvAAAAAAAAAAACAAAAMf12<  O  SS",
+" uvvAAAAAAAAACACAACAAV11<  O  %S",
+" uvvAAAAAAAAAACAAAACAAu1< %S O  ",
+" uvvAAAAAAAAAAACACCAAc11<%SSSOO ",
+" uggAAAAAAAAACAACACCk111<  S O:S",
+" uggAAAAAAAAAAAAACnf1111<     SS",
+" uzzzzzzzzzzzxzzzz2<<<<<< * SSSS",
+"                  % -        SSS",
+"SSSSSSSSSSSSSSSSS   >SSSS    SSS",
+"SSSSSSSSSSSSSSSS   OSSSSSSO :SSS",
+"SSSSSSSSSSSSSSSSS OSSSSSS  %SSSS",
+"SSSSSSSSSSSSSSSS %OSSSSS  *SSSSS",
+"SSSSSSSSSSSSSSS  %SSSSSS   SSSSS",
+"SSSSSSSSSSSSSSS  SSSSSSSS   SSSS",
+"SSSSSSSSSSSSSSSSSSSSSSSSSS  SSSS",
+"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS",
+"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS"
+};
--- kdebase-3.5.7.orig/debian/icons/konqueror.xpm
+++ kdebase-3.5.7/debian/icons/konqueror.xpm
@@ -0,0 +1,280 @@
+/* XPM */
+static char *konqueror[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 242 2",
+"   c #000000",
+".  c #040409",
+"X  c #000414",
+"o  c #000019",
+"O  c #00081A",
+"+  c #0A0A13",
+"@  c #13131B",
+"#  c #18181F",
+"$  c #00062C",
+"%  c #000431",
+"&  c #00043F",
+"*  c #000933",
+"=  c #001238",
+"-  c #131321",
+";  c #191926",
+":  c #1B1B2A",
+">  c #111F3D",
+",  c #212126",
+"<  c #22222C",
+"1  c #28282D",
+"2  c #252534",
+"3  c #2D2D36",
+"4  c #2D2C3C",
+"5  c #34343F",
+"6  c #001B5D",
+"7  c #082F74",
+"8  c #313146",
+"9  c #31314B",
+"0  c #3A3A44",
+"q  c #3B3B4D",
+"w  c #404051",
+"e  c #42425D",
+"r  c #4A4953",
+"t  c #52525B",
+"y  c #474762",
+"u  c #4F4F65",
+"i  c #515164",
+"p  c #56566F",
+"a  c #5C5C6A",
+"s  c #626270",
+"d  c #64647A",
+"f  c #6B6A7E",
+"g  c #002E82",
+"h  c #0021BF",
+"j  c #002BC5",
+"k  c #002DC8",
+"l  c #0033C7",
+"z  c #0033C8",
+"x  c #003ACA",
+"c  c #084091",
+"v  c #0347AB",
+"b  c #2A4EBA",
+"n  c #275CA3",
+"m  c #2E52BC",
+"M  c #3656BA",
+"N  c #3758BA",
+"B  c #0142CC",
+"V  c #0349CE",
+"C  c #0846CC",
+"Z  c #0046D0",
+"A  c #014CD1",
+"S  c #004EDC",
+"D  c #0955C9",
+"F  c #0152D4",
+"G  c #045CD8",
+"H  c #0B56D4",
+"J  c #0F52DB",
+"K  c #0958D5",
+"L  c #1052D1",
+"P  c #1155D9",
+"I  c #1D5CD5",
+"U  c #015FE5",
+"Y  c #1665D9",
+"T  c #146ADD",
+"R  c #1B67D5",
+"E  c #1964DB",
+"W  c #1C68DB",
+"Q  c #245FD1",
+"!  c #236EDC",
+"~  c #2A65D3",
+"^  c #2B68D9",
+"/  c #2271DC",
+"(  c #2C76DD",
+")  c #3678D9",
+"_  c #2171E3",
+"`  c #2C7AE2",
+"'  c #347CE1",
+"]  c #3A7FE2",
+"[  c #6D6D80",
+"{  c #6E6E8A",
+"}  c #70708C",
+"|  c #7F7F8E",
+" . c #7E7E9B",
+".. c #4074DB",
+"X. c #5E7AC6",
+"o. c #5378DB",
+"O. c #3A83E4",
+"+. c #398AE3",
+"@. c #738FB7",
+"#. c #5581DC",
+"$. c #598CDB",
+"%. c #4185E4",
+"&. c #4E81E1",
+"*. c #4C8EE5",
+"=. c #4693E9",
+"-. c #528AE4",
+";. c #5193E6",
+":. c #5197E9",
+">. c #539BEC",
+",. c #5C90E2",
+"<. c #5897E9",
+"1. c #5EA4EF",
+"2. c #5DA7F6",
+"3. c #738ECF",
+"4. c #6494E2",
+"5. c #619EEB",
+"6. c #7595E4",
+"7. c #6FAAEC",
+"8. c #61A6F0",
+"9. c #66ACF5",
+"0. c #6DB5F5",
+"q. c #75ADEE",
+"w. c #72ABF2",
+"e. c #7EB3EF",
+"r. c #71B4F5",
+"t. c #77BAF6",
+"y. c #7BBAF5",
+"u. c #818197",
+"i. c #82829D",
+"p. c #8B8A9A",
+"a. c #8C8BA4",
+"s. c #9494A6",
+"d. c #9393AC",
+"f. c #9A99AA",
+"g. c #9C9BB2",
+"h. c #A1A1B5",
+"j. c #A5A5BB",
+"k. c #ACABBD",
+"l. c #B0AFB7",
+"z. c #88A8DD",
+"x. c #94B5DE",
+"c. c #83A8E5",
+"v. c #8CA7EB",
+"b. c #8EB1EA",
+"n. c #86B9F4",
+"m. c #8DBFF4",
+"M. c #95B2ED",
+"N. c #ADAEC1",
+"B. c #A4B3D8",
+"V. c #A3BADE",
+"C. c #B0AFC1",
+"Z. c #B3B2C4",
+"A. c #B4B4C9",
+"S. c #BAB9C6",
+"D. c #BBBAC9",
+"F. c #BEBED0",
+"G. c #85C0F6",
+"H. c #81C6FA",
+"J. c #8CC1F6",
+"K. c #8BC2F9",
+"L. c #8BCAFB",
+"P. c #8FD3FF",
+"I. c #94C2F4",
+"U. c #92C5F9",
+"Y. c #90C8FC",
+"T. c #9AC6F5",
+"R. c #99C3FF",
+"E. c #9BC9F7",
+"W. c #9ECCFA",
+"Q. c #91D2FE",
+"!. c #99D8FF",
+"~. c #BCC9DE",
+"^. c #A4C1E2",
+"/. c #A3C8EA",
+"(. c #AAC2EC",
+"). c #ACC8E7",
+"_. c #AAC8E9",
+"`. c #A4C9F5",
+"'. c #A4CEFB",
+"]. c #A8CFF9",
+"[. c #ADD1EF",
+"{. c #A4D0F9",
+"}. c #A2DBFF",
+"|. c #ACD3F9",
+" X c #B3CAEC",
+".X c #BEC9E2",
+"XX c #B9CEEB",
+"oX c #BFD1EC",
+"OX c #B4D5F9",
+"+X c #B5D8FA",
+"@X c #BAD7FA",
+"#X c #BEDBFD",
+"$X c #A3E2FF",
+"%X c #ACE5FF",
+"&X c #AFEBFF",
+"*X c #B1E5FF",
+"=X c #B1EBFF",
+"-X c #B8E1FF",
+";X c #BCEDFF",
+":X c #BEF2FF",
+">X c #C9C7CF",
+",X c #C3C3D3",
+"<X c #C4C4DA",
+"1X c #CAC9D2",
+"2X c #CDCDDB",
+"3X c #D0CCD3",
+"4X c #D0CEDB",
+"5X c #D3D1D7",
+"6X c #C2CCE3",
+"7X c #CEDDF9",
+"8X c #D4D4E2",
+"9X c #D5DBEB",
+"0X c #D9D9E3",
+"qX c #DCDCEA",
+"wX c #C4EBFF",
+"eX c #CCE7FF",
+"rX c #CBE9FF",
+"tX c #C4F5FF",
+"yX c #C8F7FF",
+"uX c #CCF9FF",
+"iX c #D4EEFF",
+"pX c #DCE3F2",
+"aX c #D2FCFF",
+"sX c #DAF6FF",
+"dX c #DBFEFF",
+"fX c #E1DDE5",
+"gX c #E3E1E5",
+"hX c #E2E2EA",
+"jX c #E9E4EA",
+"kX c #E5EAF2",
+"lX c #ECECF3",
+"zX c #EBEBF9",
+"xX c #E2FFFF",
+"cX c #EBFEFF",
+"vX c #F2EEF2",
+"bX c #F3F2F6",
+"nX c #F2F2FB",
+"mX c #F4FDFF",
+"MX c #FBF6F6",
+"NX c #FBF6F9",
+"BX c #FEFEFE",
+"VX c None",
+/* pixels */
+"VXVX  t 1 VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX",
+"VXVX, zX0X0 s + VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX",
+"VXVX  t 2X0XnXN.4   VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX",
+"VXVXVX. S.BXBXBX2Xp     r   VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX",
+"VXVXVX. k.BXBXBXBXhXi.>XbX> & 6 g g 6 %   VXVXVXVXVXVXVXVXVXVXVX",
+"VXVXVXVX3 8XBXBXBX0XMX7X4.$.R.iXcXcXiX'.,.7   VXVXVXVXVXVXVXVXVX",
+"VXVXVXVX  d zXBX0XMXb.-.@XmXBXmXmXcXmXmXBXsX$.$ VXVXVXVXVXVXVXVX",
+"VXVXVXVXVX. d.4XMXc.*.iXiXeXeXeXeXrXrXeXrXiXsXw.* VXVXVXVXVXVXVX",
+"VXVXVXVXVXVXi NX(.! '.OXOXOX@X#X+X|.].|.|.|.|.#XO.o VXVXVXVXVXVX",
+"VXVXVXVXVX  l.mXR +.].`.].].|.|.I.I.I.I.I.J.J.I.2.v   VXVXVXVXVX",
+"VXVXVXVXVX3 BXb.F :.T.I.E.'.'.n.7.q.q.e.q.7.q.q.:.U = VXVXVXVXVX",
+"VX. @ 5 q f.BX) G <.m.J.U.U.<.;.;.;.;.;.;.;.;.<.( S c   VXVXVXVX",
+"| j.S.8XqX0XpXY T =.n.K.J.K.%.( ' ' ] ' ' ' %.] F x D   VXVXVXVX",
+"2XBXBXBXBXgXoXF x V ` y.L.L.r.( W W E E E E W K F S G X VXVXVXVX",
+"1XBXBXBXNXgX XB k k k E t.P.P.L.L.O.B A A A B T / T _ O VXVXVXVX",
+"Z.nXBXBXBXfXXXB x l l j ) P.P.!.$X8.x x k j ` 0.` ' >.O VXVXVXVX",
+"< w f a.k.2X9XV B l h F L.$X%X=X;XY.L V l H H.>.! 9.;.  VXVXVXVX",
+"VXVX    + p.NX~ B B B 1.&X;X;XtXyX;X^ C I r.$X:.B J n   VXVXVXVX",
+"VXVXVXVXVX0 BXz.l &.L.&X:XtXyXyXyXaXq.~ J.tXr.r.) P @.4   VXVXVX",
+"VXVXVXVXVX  S.kXQ -.aX=XyXyXuXaXaXaXuXtXaXyXy.;X|.w.9Xi   VXVXVX",
+"VXVXVXVXVXVXf vXV.^ wXdXaXuXaXaXaXaXaXaXuXaXdXdX$X6XN.- VXVXVXVX",
+"VXVXVXVXVX1 N.D.jXx.=XxXcXcXxXxXxXxXxXxXcXcXxX=X_.D. .f   VXVXVX",
+"VXVXVXVX  s.lXhXD.fX^.*XxXmXBXBXBXBXBXmXmXdX%X).~.p.2Xj.2 VXVXVX",
+"VXVXVXVXa 0XBXBX0XD.gX~./.#.o.6.M.v.M.7XwX[..XS.a.2XlX2X}   VXVX",
+"VXVXVX, <XBXBXBXBXZ.i.2X9XB.X.M M b N 3.6X2Xf. .,XlXhXhXA.9   VX",
+"VXVXVX@ ,XBXBXbXh.e . @ f C.3X5X1X>X2XD.a.q . 5 a.D.hXjX,Xe   VX",
+"VXVXVXVX@ Z.8X{ -   VXVX  1 d.C.N.N.d.y     VXVX. u g.F.a.Z.#   ",
+"VXVXVXVXVX@ 8   VXVXVXVXVX. h.zXbXbXF.2 VXVXVXVXVX  : 9 w zXa.  ",
+"VXVXVXVXVXVX  VXVXVXVXVXVX   .qXlXlXd.+ VXVXVXVXVXVXVX    4 +   ",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVXi 0XbXlX{   VXVXVXVXVXVXVXVXVXVXVXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVX4 <XhX<Xy   VXVXVXVXVXVXVXVXVXVXVXVX",
+"VXVXVXVXVXVXVXVXVXVXVXVXVXVX  < : - .   VXVXVXVXVXVXVXVXVXVXVXVX"
+};
--- kdebase-3.5.7.orig/debian/icons/kpersonalizer-16.xpm
+++ kdebase-3.5.7/debian/icons/kpersonalizer-16.xpm
@@ -0,0 +1,149 @@
+/* XPM */
+static char *kpersonalizer-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 127 2",
+"   c black",
+".  c #001D00",
+"X  c #061A37",
+"o  c #002000",
+"O  c #002400",
+"+  c #002800",
+"@  c #002C00",
+"#  c #003000",
+"$  c #043601",
+"%  c #003D0C",
+"&  c #000F42",
+"*  c #001049",
+"=  c #00155D",
+"-  c #001660",
+";  c #04205E",
+":  c #0B2D5A",
+">  c #092D67",
+",  c #004600",
+"<  c #055900",
+"1  c #0F5003",
+"2  c #166113",
+"3  c #225F22",
+"4  c #30792D",
+"5  c #032684",
+"6  c #002097",
+"7  c #002492",
+"8  c #0B3A8C",
+"9  c #073291",
+"0  c #05339F",
+"q  c #0A2EA0",
+"w  c #012DB4",
+"e  c #0028C6",
+"r  c #0231C2",
+"t  c #0339E7",
+"y  c #0035FE",
+"u  c #093FFE",
+"i  c #0B40BC",
+"p  c #0E49B1",
+"a  c #2254AD",
+"s  c #1759C4",
+"d  c #175FC0",
+"f  c #1954D0",
+"g  c #0840F3",
+"h  c #0F4CFE",
+"j  c #1958E2",
+"k  c #1654FE",
+"l  c #385FD8",
+"z  c #255BF9",
+"x  c #296DD5",
+"c  c #2277D5",
+"v  c #2574D4",
+"b  c #396DDA",
+"n  c #3178D1",
+"m  c #2467F6",
+"M  c #337BE9",
+"N  c #3075FE",
+"B  c #387DFE",
+"V  c #487DC6",
+"C  c #417BFC",
+"Z  c #168404",
+"A  c #2A8C19",
+"S  c #3F8B34",
+"D  c #39AE1D",
+"F  c #469F35",
+"G  c #56B03E",
+"H  c #578D58",
+"J  c #65C04C",
+"K  c #2D86DF",
+"L  c #3A89E1",
+"P  c #3E89F2",
+"I  c #799F81",
+"U  c #7F9F9A",
+"Y  c #4E91DD",
+"T  c #4783E4",
+"R  c #4598EC",
+"E  c #4B92ED",
+"W  c #5380FD",
+"Q  c #5096E0",
+"!  c #539AE2",
+"~  c #5596FE",
+"^  c #529BFC",
+"/  c #4BA0EE",
+"(  c #5CA7FE",
+")  c #5DAEF6",
+"_  c #6B98D7",
+"`  c #6D9CFE",
+"'  c #69AFEE",
+"]  c #75B8FE",
+"[  c #83C872",
+"{  c #8CA6D7",
+"}  c #89BDED",
+"|  c #89BEEE",
+" . c #87B8FE",
+".. c #A2B0D7",
+"X. c #95C28F",
+"o. c #A6C2A9",
+"O. c #B0CEAF",
+"+. c #B7D8B1",
+"@. c #8CC6FE",
+"#. c #B5C9E8",
+"$. c #B9D7FE",
+"%. c #DDF0D8",
+"&. c #D5E0F1",
+"*. c #DDE7FE",
+"=. c #DDEDFE",
+"-. c #E3E3ED",
+";. c #E3E8F9",
+":. c #E3EDFE",
+">. c #E8E8F1",
+",. c #EDEDF3",
+"<. c #EEEEF5",
+"1. c #F0F9ED",
+"2. c #F1F1F6",
+"3. c #F2F2F7",
+"4. c #F3F3F7",
+"5. c #F6F6F8",
+"6. c #F6F6F9",
+"7. c #F7F7F9",
+"8. c #F8F8FB",
+"9. c #F9F9FB",
+"0. c #F9F9FC",
+"q. c #FBFBFC",
+"w. c #FCFCFD",
+"e. c #FDFDFD",
+"r. c #FDFDFE",
+"t. c #FEFEFE",
+"y. c None",
+/* pixels */
+"y.y.y.y.y.y.y.0 w 6   5 7 =     ",
+"y.y.y.y.y.p i t y q 9 r e -     ",
+"y.y.y.d s j h z b f g u l *     ",
+"y.c v M N C T x m k W ;...& @ + ",
+"K R ^ ~ E L P B ` *.8.4.U % , # ",
+"/ ] $.| ) (  .:.t.q.O.4 < 2 H O ",
+"! t.t.' @.=.t.t.%.F Z A X.8.I o ",
+"! t.t.| t.t.t.t.J D [ t.t.4.I o ",
+"! e.q.@.t.t.t.t.J 1.t.t.6.<.I o ",
+"! e.e.! t.t.t.9.J t.t.q.3.>.I o ",
+"! e.t.Y t.t.t.5.J t.t.6.<.-.I o ",
+"! e.q.Y t.t.9.5.J t.q.<.o.3 .   ",
+"! e.&.n t.t.6.{ J t.+.S $       ",
+"! _ 8 n t.#.a = J G 1           ",
+"! X   n V >     J             y.",
+"      :                   y.y.y."
+};
--- kdebase-3.5.7.orig/debian/icons/ksysguard.xpm
+++ kdebase-3.5.7/debian/icons/ksysguard.xpm
@@ -0,0 +1,295 @@
+/* XPM */
+static char *ksysguard[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #010101",
+".  c #090909",
+"X  c #081022",
+"o  c #051127",
+"O  c #2C3238",
+"+  c #3B3833",
+"@  c #132D64",
+"#  c #153167",
+"$  c #3B434C",
+"%  c #49443C",
+"&  c #524A3E",
+"*  c #514F4A",
+"=  c #56534E",
+"-  c #5C5751",
+";  c #545B66",
+":  c #515D74",
+">  c #625B52",
+",  c #68635A",
+"<  c #646360",
+"1  c #6C6965",
+"2  c #74716B",
+"3  c #78756D",
+"4  c #787876",
+"5  c #194090",
+"6  c #1F4CA4",
+"7  c #254E9E",
+"8  c #2B53A5",
+"9  c #2B56AB",
+"0  c #2D5DBD",
+"q  c #3359A6",
+"w  c #3258A9",
+"e  c #315EBC",
+"r  c #3D63B0",
+"t  c #2F61CC",
+"y  c #2E64D5",
+"u  c #3264CD",
+"i  c #3A6ACE",
+"p  c #3766C3",
+"a  c #3369DA",
+"s  c #3066DB",
+"d  c #3B70DF",
+"f  c #3F78DE",
+"g  c #3B75E0",
+"h  c #5C7293",
+"j  c #5B749B",
+"k  c #5A76A4",
+"l  c #657895",
+"z  c #647999",
+"x  c #406ECF",
+"c  c #406ED0",
+"v  c #4372D3",
+"b  c #4B76D1",
+"n  c #4B79D3",
+"m  c #4979DE",
+"M  c #527BD3",
+"N  c #587CC6",
+"B  c #507EE2",
+"V  c #78859A",
+"C  c #6287BD",
+"Z  c #668ABE",
+"A  c #7085A4",
+"S  c #778EB3",
+"D  c #7B91B5",
+"F  c #6B84A9",
+"G  c #548BDE",
+"H  c #5D88D4",
+"J  c #598EDF",
+"K  c #5B84D8",
+"L  c #4C8BE9",
+"P  c #4B8DF0",
+"I  c #4E90F2",
+"U  c #518FEE",
+"Y  c #5886E8",
+"T  c #5C8BE4",
+"R  c #5586E4",
+"E  c #508FF1",
+"W  c #5591EB",
+"Q  c #5E90E7",
+"!  c #5A94ED",
+"~  c #5E98EB",
+"^  c #5292F1",
+"/  c #5897F4",
+"(  c #648DC6",
+")  c #6288CB",
+"_  c #6186D7",
+"`  c #658AD8",
+"'  c #6A8DD9",
+"]  c #6892CF",
+"[  c #6A94D9",
+"{  c #7798CA",
+"}  c #7094D1",
+"|  c #7293DA",
+" . c #789ED6",
+".. c #789DDD",
+"X. c #628AE3",
+"o. c #688FE4",
+"O. c #649BEE",
+"+. c #6993E4",
+"@. c #6C9BE0",
+"#. c #6E9DEC",
+"$. c #609AF2",
+"%. c #7196E6",
+"&. c #7299E4",
+"*. c #7B9DE5",
+"=. c #7C9DE8",
+"-. c #7B9DF2",
+";. c #6BA0ED",
+":. c #69A0F0",
+">. c #72A3ED",
+",. c #7BA3EA",
+"<. c #79A9EE",
+"1. c #71A4F1",
+"2. c #76A8F2",
+"3. c #7AAAF2",
+"4. c #85827C",
+"5. c #838483",
+"6. c #86888D",
+"7. c #8B8B8C",
+"8. c #8A8784",
+"9. c #888C95",
+"0. c #96928C",
+"q. c #979898",
+"w. c #9A9894",
+"e. c #9D9C9C",
+"r. c #9B9790",
+"t. c #8D9CAF",
+"y. c #8A97AC",
+"u. c #8398BA",
+"i. c #909DB5",
+"p. c #96A1B3",
+"a. c #95A3B8",
+"s. c #98A4B7",
+"d. c #A09E9D",
+"f. c #A19C95",
+"g. c #A6A29C",
+"h. c #ABA69E",
+"j. c #ADA89F",
+"k. c #A3A2A1",
+"l. c #A8A5A0",
+"z. c #A9A8A7",
+"x. c #B2ACA4",
+"c. c #B5B3AF",
+"v. c #BBB8AF",
+"b. c #B4B4B4",
+"n. c #BCBCBC",
+"m. c #B8B7B4",
+"M. c #859EC4",
+"N. c #819DCA",
+"B. c #8B9FC4",
+"V. c #81A0CC",
+"C. c #94A5C5",
+"Z. c #97AACD",
+"A. c #93ADD6",
+"S. c #9DAFD2",
+"D. c #9BB1D6",
+"F. c #83A5E9",
+"G. c #84AAEA",
+"H. c #8BACEB",
+"J. c #88A7E7",
+"K. c #81ADF0",
+"L. c #84A2F0",
+"P. c #8AB0EE",
+"I. c #82B0F5",
+"U. c #83B3FD",
+"Y. c #8AB2F2",
+"T. c #8CB8FC",
+"R. c #8CB7FA",
+"E. c #92ADEB",
+"W. c #92AFE1",
+"Q. c #93B2E4",
+"!. c #94B2EB",
+"~. c #9BB5EC",
+"^. c #9CB9EC",
+"/. c #9BB7E3",
+"(. c #91B6F1",
+"). c #93BAF3",
+"_. c #93BBF8",
+"`. c #9ABCF2",
+"'. c #A5B9DF",
+"]. c #B3BDD3",
+"[. c #AAB4C6",
+"{. c #A5BDE1",
+"}. c #A4BCED",
+"|. c #A9BDED",
+" X c #A2BCF1",
+".X c #A8BFF5",
+"XX c #9CC0F4",
+"oX c #9BC1FB",
+"OX c #95C1FF",
+"+X c #AFC2DF",
+"@X c #B8C1D8",
+"#X c #ADC1EC",
+"$X c #A4C4F4",
+"%X c #A2C4F8",
+"&X c #A5C9FD",
+"*X c #AAC5F2",
+"=X c #ADC8F4",
+"-X c #A9C9FA",
+";X c #B1C6F2",
+":X c #B3C8F3",
+">X c #B2CFFB",
+",X c #BACCF3",
+"<X c #B1C4F8",
+"1X c #B6D0F7",
+"2X c #BCD3F6",
+"3X c #BAD3F9",
+"4X c #C1BDB5",
+"5X c #C0BFBC",
+"6X c #C7C3BB",
+"7X c #C7C8C9",
+"8X c #CACACA",
+"9X c #CAC8C5",
+"0X c #C4CBDE",
+"qX c #CFD1D3",
+"wX c #D0CBC4",
+"eX c #D0CECD",
+"rX c #D8D4CF",
+"tX c #D5D2CC",
+"yX c #D3D3D3",
+"uX c #D7D7D8",
+"iX c #D6D8DA",
+"pX c #D8D7D8",
+"aX c #DBD9D4",
+"sX c #CCD2E0",
+"dX c #C8D7EF",
+"fX c #CDD8EA",
+"gX c #C2D4F5",
+"hX c #C2D6F8",
+"jX c #C5D8F6",
+"kX c #CBD5F3",
+"lX c #CBD9F6",
+"zX c #CCD9F9",
+"xX c #D7DCE1",
+"cX c #D6DEEE",
+"vX c #D8DFEB",
+"bX c #DDE1EE",
+"nX c #DFE1E5",
+"mX c #D6E1F6",
+"MX c #D5E1F8",
+"NX c #DAE2F4",
+"BX c #D8E3F8",
+"VX c #E0DDD7",
+"CX c #E0DEDA",
+"ZX c #E4E2DE",
+"AX c #E4E3E2",
+"SX c #E8E7E6",
+"DX c #EAE8E5",
+"FX c #ECECEB",
+"GX c #E4E5E8",
+"HX c #ECEEF6",
+"JX c #F0EFEB",
+"KX c #F2F1EF",
+"LX c #F5F5F4",
+"PX c #F9F8F6",
+"IX c #FCFCFB",
+"UX c #F8F6F3",
+"YX c None",
+/* pixels */
+"YX7 p ) | | | | | | | | | | | | | | | | | | | | | | [ N 0 X YXYX",
+"7 T kXvXMXMXNXNXBXBXBXmXMXmXNXNXNXmXMXMXBXBXBXBXmXBXmXbX,Xv   YX",
+"p kXZXFXfXzXzXkXlXlXlXjXmXFXKXKXKXFXmXkXlXlXlXlXlXlXfXDXSX.X5   ",
+"' gXsXqXgXjXjXjXjXjXhXbXFXJXPXHXLXFXFXbXjXjXjXjXjXjXdXyXsXzX8   ",
+"' ,X,X2XgXgXhXgXhX2XdXDXFXJXyXzXIXIXFXDXdX2X2XjX2XgX2X2X,XgXq . ",
+"' ,X:X1X,X2X2X2X2X3XxXSXIXIX].PXIXIXIXSXxX3X3X2X2X2X2X,X:X,Xq . ",
+"` #X#X:X>X1X1X1X1X>XaXFX|.IXLXn.IXIX|.DXaX>X3X1X1X1X:X;X#X;Xq . ",
+"_ }.}.$X=X=X=X=X:X-XrXDXIXIXIXPXIXIXIXDXrX-X=X=X=X=X*X$X}.|.q . ",
+"H ~.^.}.$X$X$X$X*X-X8XpXIXPXPXPXPXIXIXuX8X%X$X$X$X$XXXXX/.^.q . ",
+"x *.~.`.`.%X%X).3.#.S w.nXPXLXLXLXPXGX9X].XXXXXXXXXX^.).!.H.8 . ",
+"t y f L W { { ] L L U 7.w.iXIXIXIXiXq.7.<.).).'.+X#XP.P.J.J.q . ",
+"t a f H n.wXaXwXn.[ I J 6.r.w.z.w.0.6.G P ..yXVXZXaXyXW.,.*.8 . ",
+"t a n 6XpXIX*.IXqXn.Q L U C V V V C I ^ J 4XyXIX~.IXeXeX..%.8 . ",
+"t a i.eX3 m.IXIXIX9Xs.I W ^ ^ ^ ^ ^ ! L s.8XIXPXIX4.CXaX[.X.8 . ",
+"t a x.].,X5.b.PX#X].x.^ ! ! ! ! ! ! ! ^ x.].|.PXk.uXgX0X4XY 8 . ",
+"u d x.CXIXIXIXPXIXZXj.! ~ ~ ~ ~ ~ ~ ~ / j.CXIXPXIXPXIXAXv.Y 8 . ",
+"u m y.].IXLXLXPXIXn.i.~ O.O.O.O.$.O.O.$.t.n.IXLXLXLXIX5Xp.R 8 . ",
+"i M ) g.7XIXIXIX7Xg.@.:.;.:.:.:.:.:.;.:...g.7XIXIXIX7Xg.H B 8 . ",
+"i R Q } e.z.c.g.d. .1.>.2.[ ( ( ( ;.1.>.:. .d.j.b.h.g.} Q M 7 . ",
+"x X.@.;.1.{ C. .2.2.3.3.3.h 4.w., Z 3.3.3.2.2.V.V.{ ;.#.+.T 8 . ",
+"v ' &.<.3.3.T.3.I.3.K.K.I.h l.7X1 k I.3.P.3.3.U.U.U.3.,.%.o.8 . ",
+"b &.,.K.D , 4 ; T.Y.Y.Y.T.l 8.z.= j R.Y.Y.P.T.& 3 % R.,.=.%.8 . ",
+"b *.F.H.{ w.yX$ R.(.(.(._.l 5.w.* j _.(.(.(.OX2 yX= G.H.F.=.8 . ",
+"b J.H.).{ 2 d.O XX`.`.`.oXl g.8X, j oX`.XX`.oX- d.+ H.P.H.,.8 . ",
+"M E.E.`.N.5.5XO XXXXXXXXXXM.8XFXV F $XXXXXXX&X, n.% W.`.!.H.8 . ",
+"M E.`..XA.b.UX$ -X$X*X-X-X-Xp.5.- D -X*X*X-X&X7.JX< /.XX!.!.8 . ",
+"M ~.D.C.-Xs.7.: #X-X*X-X*X-X/.A A Z.*X*X-X*X-XS.6.; /.^. X~.8 . ",
+"b |.q.r.C.|.D B.=X=X=X#X#X=X=X=X*X*X;X=X=X=X#X*XM.D Z.h.6.~.7 . ",
+"e E.9.l '.:X;X:X:X*X;X<X;X;X*X*X=X;X;X;X:X:X:X<X:X:XS.2 9.-.@   ",
+"# b ~.<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.9     ",
+"YXo 6 w e k r r r r e k r r k r r r r r r r r e w k r 9 #     YX",
+"YXYX  . . . . . . . . . . . . . . . . . . . . . . . . .     YXYX"
+};
--- kdebase-3.5.7.orig/debian/icons/ksysguard-16.xpm
+++ kdebase-3.5.7/debian/icons/ksysguard-16.xpm
@@ -0,0 +1,258 @@
+/* XPM */
+static char *ksysguard-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 236 2",
+"   c black",
+".  c #051127",
+"X  c #0C1C3F",
+"o  c #0C1E43",
+"O  c #4C535F",
+"+  c #4F5765",
+"@  c #616D7F",
+"#  c #716C64",
+"$  c #7E7462",
+"%  c #24478E",
+"&  c #224793",
+"*  c #244890",
+"=  c #264890",
+"-  c #264990",
+";  c #274990",
+":  c #274A90",
+">  c #284A90",
+",  c #2A4C91",
+"<  c #2B4E91",
+"1  c #2E4F92",
+"2  c #2E4E94",
+"3  c #294E9C",
+"4  c #305092",
+"5  c #365597",
+"6  c #365697",
+"7  c #365698",
+"8  c #3064D1",
+"9  c #3164D3",
+"0  c #3569D6",
+"q  c #3775E1",
+"w  c #697489",
+"e  c #6C7689",
+"r  c #747F90",
+"t  c #647FA8",
+"y  c #4171D7",
+"u  c #4E7BD8",
+"i  c #557FD7",
+"p  c #6D82A1",
+"a  c #6E87AD",
+"s  c #7D8EA7",
+"d  c #4B81D0",
+"f  c #5685CD",
+"g  c #5D84C1",
+"h  c #5E82D5",
+"j  c #5B84DA",
+"k  c #5D90DA",
+"l  c #4A89E8",
+"z  c #408AFA",
+"x  c #4C91F8",
+"c  c #578DE2",
+"v  c #5E8EF0",
+"b  c #5A96EE",
+"n  c #5A96EF",
+"m  c #5895F1",
+"M  c #648CDC",
+"N  c #688DDD",
+"B  c #6D90C5",
+"V  c #6894D5",
+"C  c #6897DC",
+"Z  c #6F93DE",
+"A  c #7192C2",
+"S  c #7694C5",
+"D  c #7598CF",
+"F  c #7F9BC4",
+"G  c #7597D0",
+"H  c #7293D9",
+"J  c #7496DF",
+"K  c #799ED4",
+"L  c #6394E9",
+"P  c #609BF2",
+"I  c #659FF5",
+"U  c #609CF8",
+"Y  c #7B9BE1",
+"T  c #7D9BE2",
+"R  c #6DA1EF",
+"E  c #67A0F5",
+"W  c #69A1F8",
+"Q  c #7FA1E7",
+"!  c #71A6F7",
+"~  c #76ABFB",
+"^  c #79A0F1",
+"/  c #7DAAF3",
+"(  c #7FB0FF",
+")  c #86827A",
+"_  c #808C9B",
+"`  c #818C9C",
+"'  c #978F81",
+"]  c #899BB7",
+"[  c #8B9DB6",
+"{  c #8F9FB7",
+"}  c #959FAB",
+"|  c #959EAE",
+" . c #959FAE",
+".. c #979FAC",
+"X. c #9C9FA6",
+"o. c #97A1B3",
+"O. c #9EABBC",
+"+. c #A69D90",
+"@. c #B0A79D",
+"#. c #AFAEAF",
+"$. c #B9B0A2",
+"%. c #92A9C8",
+"&. c #92A7D4",
+"*. c #91AAD2",
+"=. c #97B3DC",
+"-. c #88A5E4",
+";. c #87AAF6",
+":. c #87B3F7",
+">. c #85B3F8",
+",. c #87B5FB",
+"<. c #86B7FF",
+"1. c #8EB0F4",
+"2. c #8CB5F6",
+"3. c #8BBBFF",
+"4. c #94AEE5",
+"5. c #96AEE5",
+"6. c #9FB3E1",
+"7. c #9CB9E4",
+"8. c #96BDF5",
+"9. c #92B8F8",
+"0. c #96BEF9",
+"q. c #99BBF1",
+"w. c #9BBEF2",
+"e. c #A4ADC9",
+"r. c #A2B0C4",
+"t. c #A2B3CD",
+"y. c #A9B1C0",
+"u. c #AEB8D0",
+"i. c #A3BAE0",
+"p. c #A5B9E3",
+"a. c #AABCE5",
+"s. c #A8BDEA",
+"d. c #A8BDEB",
+"f. c #A9BEE9",
+"g. c #A9BFE9",
+"h. c #A8BEEB",
+"j. c #A9BEEA",
+"k. c #A9BFEA",
+"l. c #A9BFEB",
+"z. c #ABBEE9",
+"x. c #A3BEFA",
+"c. c #9BC1F7",
+"v. c #9BC1F8",
+"b. c #98C2FF",
+"n. c #9CC0F9",
+"m. c #9DC6FF",
+"M. c #BFCCDD",
+"N. c #ADC3E2",
+"B. c #A6C3F3",
+"V. c #A4C5F6",
+"C. c #A2C0F8",
+"Z. c #A1C5FA",
+"A. c #A2C5FC",
+"S. c #A5C6F9",
+"D. c #A4C7FA",
+"F. c #ACC8F3",
+"G. c #ADC8F3",
+"H. c #ADC9F2",
+"J. c #AEC8F2",
+"K. c #ADC9F6",
+"L. c #A9CDFF",
+"P. c #ABCEFF",
+"I. c #AECBF8",
+"U. c #ADCCFD",
+"Y. c #B1CCF5",
+"T. c #B2CDF7",
+"R. c #B4CEF6",
+"E. c #B1CDF8",
+"W. c #B1CDFA",
+"Q. c #B0CDFC",
+"!. c #BACFFC",
+"~. c #BDD2F7",
+"^. c #BFD5F7",
+"/. c #BAD0F8",
+"(. c #BBD4FB",
+"). c #BED5F8",
+"_. c #BED5F9",
+"`. c #BFD6F8",
+"'. c #C7BCAE",
+"]. c #C1BFBA",
+"[. c #C6C1B7",
+"{. c #CAC2B6",
+"}. c #D2C8B9",
+"|. c #D7CDBF",
+" X c #C3C8D5",
+".X c #CCD2DB",
+"XX c #CFD1D9",
+"oX c #CFD3DD",
+"OX c #D8D1C2",
+"+X c #DCD5CB",
+"@X c #D9D8D6",
+"#X c #C3D0E3",
+"$X c #C3D6F0",
+"%X c #C3D6FF",
+"&X c #C4D7FF",
+"*X c #C5D8FF",
+"=X c #C5D9FF",
+"-X c #C5DAFF",
+";X c #C7DDFF",
+":X c #CEDDF4",
+">X c #CEDCF6",
+",X c #CADBFA",
+"<X c #C8DBFF",
+"1X c #CDDCF8",
+"2X c #CDDDF9",
+"3X c #CEDDF8",
+"4X c #CFDDF8",
+"5X c #CCDEFF",
+"6X c #D9DBE7",
+"7X c #DEE0E2",
+"8X c #DFE3EE",
+"9X c #DFE4EF",
+"0X c #E5DED0",
+"qX c #EBE1D0",
+"wX c #EAE3D7",
+"eX c #F1E9DC",
+"rX c #E0E1E1",
+"tX c #E5E4E3",
+"yX c #ECE7E0",
+"uX c #EFEEEB",
+"iX c #E7E9F1",
+"pX c #E7EDFF",
+"aX c #E8EFFF",
+"sX c #ECF2FF",
+"dX c #F3F1EB",
+"fX c #F2F1ED",
+"gX c #F1F4FF",
+"hX c #FBF7F0",
+"jX c #FDFAF5",
+"kX c #FFFDF7",
+"lX c #FDFCFB",
+"zX c #FFFFF8",
+"xX c #FFFFF9",
+"cX c #FEFEFE",
+"vX c #FFFFFE",
+"bX c gray100",
+/* pixels */
+"i 6.s.s.B.z.s.z.s.s.l.s.s.p.H   ",
+"5.eX:X>X:X:XdXjXhXiX,X1X1XrXpX& ",
+"5.~.`.`.(.6XlXXXvXuX$X`.`./.5X4 ",
+"-.J.Y.R.U.wXsXtXvX8X#XT.Y.K./.4 ",
+"Z B.D.Z.,.#.vXvXlXeXN.b.c.q.C.< ",
+"8 q %.r.k d +.+X{.p P  X.X7.;.< ",
+"9 y.[.aXqXc l g f z O.lX X0XQ : ",
+"0 }.oXuX6XF m n b x '.gX@XiX&.: ",
+"y ..lXvX|.C I R R n } lXvXOXM : ",
+"u L [ o.K ! V s a ~ R [  .D v % ",
+"j / a a <.:.B $.+ 3.,.D p ( ^ : ",
+"N 9.s # b.8.S @.O b.8.s $ 2.1.: ",
+"J A.o.) P.V.q.].w P.D.{ ' 0.x.> ",
+"Y X.i.w T.K.I.=.*.T.K.J.w t.z.% ",
+"h e.-X;X-X%X&X&X`.%X&X-X;Xu.T X ",
+". 3 6 6 5 5 5 5 5 5 6 5 5 2 o   "
+};
--- kdebase-3.5.7.orig/debian/icons/kwrite.xpm
+++ kdebase-3.5.7/debian/icons/kwrite.xpm
@@ -0,0 +1,270 @@
+/* XPM */
+static char *kwrite[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 232 2",
+"   c #000000",
+".  c #0A0802",
+"X  c #000718",
+"o  c #1C1802",
+"O  c #131413",
+"+  c #000C3A",
+"@  c #2A2509",
+"#  c #362D05",
+"$  c #342F0D",
+"%  c #38320B",
+"&  c #000A58",
+"*  c #021855",
+"=  c #031A5A",
+"-  c #031C64",
+";  c #112762",
+":  c #443319",
+">  c #4A3519",
+",  c #524C0B",
+"<  c #6F552B",
+"1  c #615739",
+"2  c #70582D",
+"3  c #7E543E",
+"4  c #505B63",
+"5  c #586162",
+"6  c #072D99",
+"7  c #082C95",
+"8  c #012BA5",
+"9  c #032DA9",
+"0  c #0630AA",
+"q  c #0832AB",
+"w  c #0B35B3",
+"e  c #0E39BA",
+"r  c #163DB8",
+"t  c #123CC4",
+"y  c #2E498E",
+"u  c #2747B1",
+"i  c #2548B6",
+"p  c #2449BD",
+"a  c #2949B1",
+"s  c #284DBC",
+"d  c #3253B5",
+"f  c #3758BB",
+"g  c #3F5DBB",
+"h  c #1640C5",
+"j  c #1A42C4",
+"k  c #1B43C9",
+"l  c #274BC7",
+"z  c #224AC9",
+"x  c #2A4EC1",
+"c  c #284ECD",
+"v  c #2B53C5",
+"b  c #2D53D0",
+"n  c #3356C4",
+"m  c #3759C8",
+"M  c #385CC5",
+"N  c #3B5FCC",
+"B  c #365BDE",
+"V  c #2951E0",
+"C  c #3E61CA",
+"Z  c #3961D0",
+"A  c #435DA9",
+"S  c #4158B2",
+"D  c #425DBA",
+"F  c #4261BD",
+"G  c #5062A9",
+"H  c #546EB6",
+"J  c #5C73B6",
+"K  c #657691",
+"L  c #6075B6",
+"P  c #707EBD",
+"I  c #4766C9",
+"U  c #4C6ACA",
+"Y  c #4365D2",
+"T  c #456BD7",
+"R  c #4970DA",
+"E  c #536CC5",
+"W  c #5A70C6",
+"Q  c #5275D3",
+"!  c #5B7ADD",
+"~  c #4166E0",
+"^  c #5173EA",
+"/  c #5679E3",
+"(  c #5D7EE4",
+")  c #597BEE",
+"_  c #697ECC",
+"`  c #637EDD",
+"'  c #637FE3",
+"]  c #7D887B",
+"[  c #7681B6",
+"{  c #5E80E4",
+"}  c #5F83EB",
+"|  c #6481C0",
+" . c #6381CF",
+".. c #6A80CC",
+"X. c #6780DD",
+"o. c #6981DC",
+"O. c #6E88DF",
+"+. c #7389D9",
+"@. c #7E93DF",
+"#. c #7C9DDF",
+"$. c #6382E4",
+"%. c #6382E8",
+"&. c #6A86E4",
+"*. c #6886EB",
+"=. c #6D88E5",
+"-. c #6E8BE8",
+";. c #6686F0",
+":. c #6A8AF4",
+">. c #6F92F1",
+",. c #738BE5",
+"<. c #758CE8",
+"1. c #788EE4",
+"2. c #7691E6",
+"3. c #7790EB",
+"4. c #759AE0",
+"5. c #7B92E5",
+"6. c #7B95E8",
+"7. c #7C9EE2",
+"8. c #7395F1",
+"9. c #834B0F",
+"0. c #844C14",
+"q. c #845B28",
+"w. c #AC7B49",
+"e. c #99851A",
+"r. c #98804D",
+"t. c #988054",
+"y. c #958A7C",
+"u. c #BC9552",
+"i. c #ABA855",
+"p. c #B3AF58",
+"a. c #BDA16E",
+"s. c #C0A61C",
+"d. c #C6BE2B",
+"f. c #CFB92F",
+"g. c #FA9F12",
+"h. c #F58D21",
+"j. c #FC8E25",
+"k. c #F98D2A",
+"l. c #FD9225",
+"z. c #FF9529",
+"x. c #FF9F34",
+"c. c #FAA218",
+"v. c #FFBC00",
+"b. c #E0AE2E",
+"n. c #F9B13F",
+"m. c #DAA74A",
+"M. c #D0AE69",
+"N. c #FFAB44",
+"B. c #FFC001",
+"V. c #FFCD0B",
+"C. c #FFD209",
+"Z. c #FFC425",
+"A. c #FFD02D",
+"S. c #FFEF13",
+"D. c #FFED1C",
+"F. c #FFF40D",
+"G. c #FFF416",
+"H. c #FFF11A",
+"J. c #FFEB23",
+"K. c #FFE63F",
+"L. c #D7D357",
+"P. c #F7D84D",
+"I. c #EFC578",
+"U. c #FFD672",
+"Y. c #FFDA7E",
+"T. c #EFEA70",
+"R. c #8D8281",
+"E. c #9E9290",
+"W. c #9E9798",
+"Q. c #9497B3",
+"!. c #94A6BA",
+"~. c #BCBF8E",
+"^. c #8C93C6",
+"/. c #8396DA",
+"(. c #969ECF",
+"). c #8397E4",
+"_. c #869AE3",
+"`. c #8098EB",
+"'. c #94A9DE",
+"]. c #9DAEDE",
+"[. c #93A6EA",
+"{. c #91A9E1",
+"}. c #96AAED",
+"|. c #9CADEC",
+" X c #97ACF1",
+".X c #9FB0ED",
+"XX c #A1B1DE",
+"oX c #A3B4ED",
+"OX c #A8B7EE",
+"+X c #ABB9EE",
+"@X c #A5B4F1",
+"#X c #A6B8F0",
+"$X c #ACBDF0",
+"%X c #B0BEF1",
+"&X c #B9C09E",
+"*X c #9BC0F4",
+"=X c #AAC6EF",
+"-X c #ADD2FF",
+";X c #B8C3EF",
+":X c #B5C1F0",
+">X c #B0C3FD",
+",X c #BAC6F2",
+"<X c #BECAF3",
+"1X c #B6D9FF",
+"2X c #BBDBFF",
+"3X c #C1C28E",
+"4X c #C0C69F",
+"5X c #C5C89F",
+"6X c #FDD381",
+"7X c #C1CCF3",
+"8X c #C6D0F5",
+"9X c #C5D6FE",
+"0X c #C6DDF7",
+"qX c #C1DFFF",
+"wX c #CCD4F4",
+"eX c #CCDCFE",
+"rX c #D2DAF7",
+"tX c #D5DCF9",
+"yX c #C3E1FF",
+"uX c #CCE6FF",
+"iX c #D6E3F7",
+"pX c #D4E4FF",
+"aX c #D3EBFF",
+"sX c #DAE2FB",
+"dX c #DAEDFF",
+"fX c #E2EBEF",
+"gX c #E4E9FA",
+"hX c #EAEDFB",
+"jX c #EBF4FF",
+"kX c #F7FBFF",
+"lX c gray100",
+"zX c None",
+/* pixels */
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXJ.m.% zXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXD.D.U.I.< zXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzX0 6 zXzXzXzXzXzXzXzXzXzXD.D.D.K.w.r.2 zXzX",
+"zXzXzXzXzXq 9 zXzXzX0 0 w = zXzXzXzXzXzXzXzXD.D.D.D.C.b.1 M.: zX",
+"zXzXzXzXzXq r 9 zX9 9 T } h * zXzXzXzXzXzXD.D.D.D.V.v.v.n.6Xu.  ",
+"zXzXzXzX8 p ,XI 8 0 R pXjX8.t * zXzXzXzXD.D.D.D.V.v.v.c.j.x.q.  ",
+"zXzXzXzX8 @.lXsXn v pXlXlXjX>.t *   zXD.D.D.D.V.v.v.c.k.z.0.    ",
+"zXzXzX8 x tXhXgXwXU XXlXlXlXjX>.t & , H.H.D.V.v.v.c.k.z.0.    zX",
+"zXzXzX9 _.hXwXwXgXwXU XXlXkXdXjX:.i d.H.D.V.v.v.c.k.z.0.    zXzX",
+"zXzX9 n 7X7X7XrXtXsX7XU '.dXjXlXfXL.G.D.V.v.v.c.k.z.0.    zXzXzX",
+"zX0 w ).:X%X7XwXwXwXrX,XC '.lXjXT.F.D.V.v.v.c.k.z.0.    zXzXzXzX",
+"zX8 n |.oX,X7X7X7X7X,X7X%XI {.iXP.G.V.v.v.c.k.z.0.    zXzXzXzXzX",
+"0 w o..X=X,X:X:X:X:X+X:X,XoXZ Q.U.A.v.v.c.k.l.9.    zXzXzXzXzXzX",
+"0 l 6..XoXoXoX+X+XoX+X+X+X#X.XD E.Y.Z.g.j.l.3 +   zXzXzXzXzXzXzX",
+"6 d ~.5XL o.5.5.6.[..X|.}..XoX(.D W.Y.N.h.w.A t * zXzXzXzXzXzXzX",
+"O p.[ 5 y D <.$.&.1.1.6.[.|./.[ ^.S R.a.y.!.eX;.t * zXzXzXzXzXzX",
+"% f.; h a E } ,.1.&.$.,.5.6...G P _ s [ 0X2XqXaX;.t * zXzXzXzXzX",
+". e.s.4 F 4X~.L ` $.,.1.&.$.,.+.O.2.-.N 7.qX2XyXpX;.t *   zXzXzX",
+"zX  # @ i.y.K y f 1.1.=.$.,.,.&.-.2.3.%.n 7.yX-X2XpX*.t *   zXzX",
+"zXzXzX$ d.; h u W =.=.$.,.,.{ &.&.-.$.$.{ n 4.1X-XaX>XV 7   zXzX",
+"zXzXzX. e.s.4 g 5X&XH  .1.$.$.=.&.$.{ $.$.! v *XuX9X^ t *   zXzX",
+"zXzXzXzX. # @ i.y.K y g =.$.+.=.$.{ $.$.( ( v =XeX^ t =     zXzX",
+"zXzXzXzXzXzX% f.; h a E o.,.,.$.{ &.$.{ { Z  .eX^ t =     zXzXzX",
+"zXzXzXzXzXzX. e.s.4 F &X&XJ ! $.&.&.{ { ( M #X) t =     zXzXzXzX",
+"zXzXzXzXzXzXzX. # @ i.] K y f ,.&.( ( *.Y Q ) t =     zXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzX$ f.; t u E $.$.$.&.` v ~ h =     zXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzX. e.s.4 g 4X&XH ! -.Y z k =     zXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzX. # @ i.] K y g ` z t =     zXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzX$ f.; t a E b w =     zXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzX. e.s.5 c B e =     zXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzX. # o - w =     zXzXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX  X     zXzXzXzXzXzXzXzXzXzXzXzX"
+};
--- kdebase-3.5.7.orig/debian/icons/kappfinder-16.xpm
+++ kdebase-3.5.7/debian/icons/kappfinder-16.xpm
@@ -0,0 +1,188 @@
+/* XPM */
+static char *kappfinder-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 166 2",
+"   c black",
+".  c #000001",
+"X  c #000005",
+"o  c #000006",
+"O  c #000205",
+"+  c #080200",
+"@  c #150B02",
+"#  c #271907",
+"$  c #2D1D08",
+"%  c #2C1D0B",
+"&  c #34333F",
+"*  c #4A321B",
+"=  c #002C99",
+"-  c #0333BD",
+";  c #2B4484",
+":  c #334B8B",
+">  c #334D8C",
+",  c #0140D6",
+"<  c #0444D6",
+"1  c #0C4ED9",
+"2  c #175BDC",
+"3  c #054CFF",
+"4  c #064CFF",
+"5  c #1155FF",
+"6  c #2065E0",
+"7  c #2365FF",
+"8  c #2B73E2",
+"9  c #357FE5",
+"0  c #3F7CFF",
+"q  c #4B61A2",
+"w  c #506BA3",
+"e  c #5A76BF",
+"r  c #6B6F88",
+"t  c #617FB2",
+"y  c #697DB5",
+"u  c #6A7EB7",
+"i  c #6C7EB0",
+"p  c #3F8AE8",
+"a  c #5081B9",
+"s  c #6081B3",
+"d  c #6386B6",
+"f  c #6C83BD",
+"g  c #6B8EBB",
+"h  c #7085BB",
+"j  c #7389BE",
+"k  c #778CBE",
+"l  c #4786FF",
+"z  c #4996EA",
+"x  c #5293FF",
+"c  c #4AA1E9",
+"v  c #53A1ED",
+"b  c #5EA1FF",
+"n  c #5DAEF1",
+"m  c #6BAEFF",
+"M  c #6AB7F6",
+"N  c #78BAFF",
+"B  c #8E682A",
+"V  c #8F682C",
+"C  c #9D7436",
+"Z  c #B0731F",
+"A  c #BC7B1D",
+"S  c #BE8A3D",
+"D  c #B4916D",
+"F  c #C6841F",
+"G  c #ECC371",
+"H  c #FDCD6D",
+"J  c #FDCF70",
+"K  c #FFD370",
+"L  c #979AAF",
+"P  c #98B9D4",
+"I  c #99BDED",
+"U  c #AEAEC3",
+"Y  c #AEB2C3",
+"T  c #A9BDEE",
+"R  c #8ACAFF",
+"E  c #92CDF5",
+"W  c #9CC4F1",
+"Q  c #9CD3F6",
+"!  c #AEC1D4",
+"~  c #AFC1D7",
+"^  c #BFCED9",
+"/  c #A1C4E2",
+"(  c #A3C9E7",
+")  c #A6C8E8",
+"_  c #A3CFF5",
+"`  c #A4CBF0",
+"'  c #ACC8F2",
+"]  c #A2DDF9",
+"[  c #B4DBE9",
+"{  c #B8DCE6",
+"}  c #B1D0F1",
+"|  c #B1D1F1",
+" . c #B2D2F2",
+".. c #B2D3F3",
+"X. c #B3D4F3",
+"o. c #B4D5F4",
+"O. c #B9D7F8",
+"+. c #B8D8F5",
+"@. c #A2E0FC",
+"#. c #A6E2FB",
+"$. c #A5E2FE",
+"%. c #AAE4FB",
+"&. c #A9E4FC",
+"*. c #A9E4FD",
+"=. c #B6E0F0",
+"-. c #B1EAFD",
+";. c #B2EAFC",
+":. c #B3EAFC",
+">. c #B4EDFC",
+",. c #B8F3FF",
+"<. c #BBF2FE",
+"1. c #BCF0FD",
+"2. c #CEB391",
+"3. c #F4D187",
+"4. c #FFE79B",
+"5. c #FFE69C",
+"6. c #C6C2D0",
+"7. c #C9C8D4",
+"8. c #C9CDD6",
+"9. c #CAD4DB",
+"0. c #C3D8EE",
+"q. c #CFDCEC",
+"w. c #C3D1FC",
+"e. c #C8D8FF",
+"r. c #D4DBE1",
+"t. c #DFDFE6",
+"y. c #C8EAEF",
+"u. c #C0F1FD",
+"i. c #C6F7FA",
+"p. c #C6F4FD",
+"a. c #C7FAFE",
+"s. c #CAF4FD",
+"d. c #C9F9FE",
+"f. c #CBFBFF",
+"g. c #CBFDFF",
+"h. c #CAFFFF",
+"j. c #CEFCFE",
+"k. c #D9E1E7",
+"l. c #DCE0E4",
+"z. c #D7E4FB",
+"x. c #DCEBFF",
+"c. c #DDEDFF",
+"v. c #D4FCFE",
+"b. c #D5FFFF",
+"n. c #D7FDFD",
+"m. c #D9FFFF",
+"M. c #DBFFFF",
+"N. c #DCFFFF",
+"B. c #E0DEE7",
+"V. c #ECE8EC",
+"C. c #E5EEF1",
+"Z. c #E5F2FF",
+"A. c #E3FAFB",
+"S. c #E3FFFF",
+"D. c #E9FEFF",
+"F. c #E9FFFF",
+"G. c #ECFFFF",
+"H. c #EDFFFF",
+"J. c #F2F0F4",
+"K. c #F6F3F5",
+"L. c #FDFAFA",
+"P. c #FFFEFA",
+"I. c #FEFCFC",
+"U. c #FFFFFE",
+"Y. c gray100",
+"T. c None",
+/* pixels */
+"c n v z p 9 8 6 2 1 < , = O T.T.",
+"M R N m b x l 0 7 5 3 3 - O T.T.",
+"_ Z.c.x.z.' W ) I T w.e.e O T.T.",
+"+.Y.Y.P.0.Q $.&.*.=.l.Y.k O T.T.",
+"o.Y.Y.q.E <.j.1.:.,.[ V.h O T.T.",
+"X.Y.L.) ] b.D.p.d.j.i.r.h O T.T.",
+"..Y.J.( *.u.s.b.M.M.n.9.i O T.T.",
+"..Y.K./ $.:.d.M.S.G.A.8.y O T.T.",
+"..Y.P.! ] ;.a.n.D.Y.k.8.f X T.T.",
+"} Y.Y.t.P >.h.N.G.C.L 6.i X T.T.",
+"O.Y.Y.Y.B.! { y.^ Y U 2.S $ T.T.",
+"e g d s t w : ; : q r G K F $ T.",
+"O O O O O O O O O O O B 4.H A # ",
+"T.T.T.T.T.T.T.T.T.T.T.+ B 4.H Z ",
+"T.T.T.T.T.T.T.T.T.T.T.T.+ C 3.D ",
+"T.T.T.T.T.T.T.T.T.T.T.T.T.@ * & "
+};
--- kdebase-3.5.7.orig/debian/icons/kjobviewer.xpm
+++ kdebase-3.5.7/debian/icons/kjobviewer.xpm
@@ -0,0 +1,168 @@
+/* XPM */
+static char *kjobviewer[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 130 2",
+"   c black",
+".  c gray5",
+"X  c #131313",
+"o  c #2F2F2F",
+"O  c #343434",
+"+  c #3B3B3B",
+"@  c #3F3F49",
+"#  c #434343",
+"$  c #4A4A4A",
+"%  c #525252",
+"&  c #5B5B5C",
+"*  c #5D5D60",
+"=  c #5D5D6B",
+"-  c #616162",
+";  c #6D6D72",
+":  c #767676",
+">  c #7C7C7E",
+",  c #036DFA",
+"<  c #0A6EF3",
+"1  c #007CFF",
+"2  c #1370ED",
+"3  c #1C73E8",
+"4  c #2075E6",
+"5  c #2B79E1",
+"6  c #757587",
+"7  c #7D7D86",
+"8  c #7B7B8E",
+"9  c #0186F5",
+"0  c #008EFF",
+"q  c #198AE3",
+"w  c #1687FF",
+"e  c #1698FF",
+"r  c #14A0FE",
+"t  c #3B81DF",
+"y  c #3FB2FE",
+"u  c #678EB5",
+"i  c #7587A0",
+"p  c #428BCB",
+"a  c #4285DF",
+"s  c #4E8DD6",
+"d  c #538FE0",
+"f  c #5B94E1",
+"g  c #4BB5FD",
+"h  c #6C9AC7",
+"j  c #6EA0E3",
+"k  c #60B9FF",
+"l  c #76A4E3",
+"z  c #6BC3FD",
+"x  c #7CC0F4",
+"c  c #838388",
+"v  c #8A8A8F",
+"b  c #838392",
+"n  c #86869B",
+"m  c #8F8F91",
+"M  c #949497",
+"N  c #93939A",
+"B  c #99999C",
+"V  c #8C8CA1",
+"C  c #8A98A7",
+"Z  c #9494A3",
+"A  c #9595AB",
+"S  c #9A9AA6",
+"D  c #9D9DAA",
+"F  c #9B9BB0",
+"G  c #80A4A0",
+"H  c #91B8AD",
+"J  c #A5A5AC",
+"K  c #A9A9AB",
+"L  c #A6A6B0",
+"P  c #A8A8B2",
+"I  c #ADADB8",
+"U  c #A7B2BF",
+"Y  c #B3B3BC",
+"T  c #BEBEBF",
+"R  c #87A5C7",
+"E  c #85B6E2",
+"W  c #A2B3C9",
+"Q  c #B2B2C4",
+"!  c #B5B5C8",
+"~  c #B4BDC7",
+"^  c #BCBCC5",
+"/  c #BCBCCC",
+"(  c #86CCFB",
+")  c #8ACEFC",
+"_  c #94D3FD",
+"`  c #B7C5C9",
+"'  c #AAC2E3",
+"]  c #A4D9FC",
+"[  c #B7CDE9",
+"{  c #BACFE9",
+"}  c #BDD1EB",
+"|  c #B2DEFC",
+" . c #B6E0FD",
+".. c #C3C3C3",
+"X. c #C4C4CE",
+"o. c #CACACC",
+"O. c #C4C4D2",
+"+. c #CACAD5",
+"@. c #CDCDD9",
+"#. c #D0D0D6",
+"$. c #D3D3DC",
+"%. c #DBDBDC",
+"&. c #C5D2E7",
+"*. c #C3D4EB",
+"=. c #C7D9EE",
+"-. c #CCD4E4",
+";. c #CBDAEE",
+":. c #D6D6E1",
+">. c #DBDBE3",
+",. c #DDDFE8",
+"<. c #D1DEF0",
+"1. c #CBE6FA",
+"2. c #CFE8FA",
+"3. c #DEE4ED",
+"4. c #D3E0F0",
+"5. c #D3EAFA",
+"6. c #DAE5F3",
+"7. c #DBEEFB",
+"8. c #E0E0E4",
+"9. c #E3E3EA",
+"0. c #E9E9EE",
+"q. c #E3EAF3",
+"w. c #ECECF1",
+"e. c #EAF1F7",
+"r. c #EDF3F8",
+"t. c #F1F2F5",
+"y. c #F3F5F9",
+"u. c #F5F8FB",
+"i. c #FDFDFE",
+"p. c None",
+/* pixels */
+"p.p.p.p.p.p.p.p.F Q / / / / / / / / / / / / D   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.A 9.i.i.i.i.i.i.i.i.i.i.i.i./   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.A 9.i.i.i.i.i.i.i.i.i.u.y.i./   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.Z ,.i.i.i.i.i.i.i.i.u.u.y.i.^   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.n 8.i.i.i.i.i.i.u.u.y.y.r.i.!   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.n ,.i.i.i.i.i.u.u.u.y.r.e.u.Y   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.8 ,.i.i.i.i.i.u.u.y.r.r.e.u.Y   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.8 %.i.i.i.i.u.u.y.r.r.e.q.u.I   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.6 %.i.i.i.u.u.u.r.r.e.q.q.y.P   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.$ * $.i.u.u.u.r.r.r.e.q.q.3.y.L + p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.$ $ $ v $.i.u.u.r.r.e.e.q.q.3.3.w.P : # $ $ p.p.p.p.p.",
+"p.p.$ $ > Y +.:.M $.u.y.y.r.r.e.q.q.3.3.,.y.D o.$.O.J ; # $ p.p.",
+"p.$ J ,.,.9.,.9.v #.y.q.6.4.=.} { } &.-.-.w.D ..9.,.3.3.%.> o p.",
+"$ ; 9.,.9.9.9.0.i [ } *.;.4.6.6.6.3.<.=.*.} ' K $.#.$.%.:.:.#   ",
+"$ #.0.0.9.9.0.0.R 7.7.7.7.7.7.7.7.5.5.5.1.1.1.C @.@.` H @.@.c X ",
+"$ 0.0.0.0.0.0.%.E  . . . . .] _ ( ( ( ( ( ( ( u >.:.` i :.$.^ O ",
+"$ w.w.w.w.0.8.o.x _ _ ) z g g g g g g g g g g p 9.>.%.%.:.:.#.O ",
+"* w.w.w.0.8.>.U z z y e r r r e e r r r e e r q %.3.3.>.>.,.>.+ ",
+"* 0.t.0.9.9.,.h z e 0 0 0 0 0 0 0 0 0 0 0 0 0 9 #.8.9.9.0.9.o.# ",
+"& Q / >.w.w.w.s w 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 W 0.0.0.@.! Z # ",
+"* Q Q Q Q / :.' j d t 5 3 2 < , , < 2 4 5 a f l -.+.! Q Q Q D @ ",
+"% ! ! ! ! Q Q ! ! ! ` +.@.@.:.,.>.%.@.+.@.` ! ! ! ! ! ! ! ! Z O ",
+"% Q / / / Q 7 7 7 7 7 7 7 7 c 7 7 7 7 7 7 7 7 7 8 b / / / / N O ",
+"% I O.O.O.L + + + + + @ + + + + + + + + + + + + + % O.O.O.O.m o ",
+"% L @.@.@.P $ % ..............................K $ * o.@.@.@.7 X ",
+"& b :.:.:.^ M K %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.c B #.:.:.$.&   ",
+"p.* >.9.9.9.@.9.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.O.,.9.9.9.Y #   ",
+"p.% M #.9.9./ i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.u.0./ 9.$.T ; . p.",
+"p.p.. # $ * +.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.t.t.i.Z $ # X     p.",
+"p.p.p.p.p.A t.i.i.i.i.i.i.i.i.i.i.i.i.i.u.t.t.w.t.X.@ p.p.p.p.p.",
+"p.p.p.p.p.Y i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.u.y.u.y.= p.p.p.p.p.",
+"p.p.p.p.F Q @.@.@.@.@.@.@.@.@.@.@.@.@.X.X./ ..^ Y Y ;   p.p.p.p."
+};
--- kdebase-3.5.7.orig/debian/icons/keditbookmarks-16.xpm
+++ kdebase-3.5.7/debian/icons/keditbookmarks-16.xpm
@@ -0,0 +1,198 @@
+/* XPM */
+static char *keditbookmarks-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 176 2",
+"   c black",
+".  c #020000",
+"X  c #030100",
+"o  c #050000",
+"O  c #050100",
+"+  c #060100",
+"@  c #080100",
+"#  c #0B0200",
+"$  c #120600",
+"%  c #220B00",
+"&  c #290900",
+"*  c #2A0E00",
+"=  c #2F0E00",
+"-  c #390E00",
+";  c #3B0F00",
+":  c #3B1300",
+">  c #391500",
+",  c #3C1500",
+"<  c #461400",
+"1  c #4B1500",
+"2  c #4F1700",
+"3  c #4F1C00",
+"4  c #501400",
+"5  c #501900",
+"6  c #511900",
+"7  c #6C1E00",
+"8  c #642800",
+"9  c #6A2500",
+"0  c #742400",
+"q  c #7F3A00",
+"w  c #822700",
+"e  c #852300",
+"r  c #8D2900",
+"t  c #923001",
+"y  c #993700",
+"u  c #A23700",
+"i  c #A73D00",
+"p  c #A83700",
+"a  c #A93E00",
+"s  c #964203",
+"d  c #B84800",
+"f  c #BC4D00",
+"g  c #BF5500",
+"h  c #B76108",
+"j  c #CB3E00",
+"k  c #CF4200",
+"l  c #CE4600",
+"z  c #CC4F00",
+"x  c #C05900",
+"c  c #D04E00",
+"v  c #DB4600",
+"b  c #DB4700",
+"n  c #D84A00",
+"m  c #DD4C00",
+"M  c #DD5000",
+"N  c #C96500",
+"B  c #D16200",
+"V  c #D26600",
+"C  c #DD6D01",
+"Z  c #DD741C",
+"A  c #E04C00",
+"S  c #E44800",
+"D  c #E05100",
+"F  c #E35001",
+"G  c #E05A00",
+"H  c #E15B00",
+"J  c #E05C00",
+"K  c #E15C00",
+"L  c #E15D00",
+"P  c #E25E00",
+"I  c #E66100",
+"U  c #E66200",
+"Y  c #E76300",
+"T  c #E76400",
+"R  c #E86300",
+"E  c #E86400",
+"W  c #E96700",
+"Q  c #E47407",
+"!  c #EE7A00",
+"~  c #ED7F00",
+"^  c #F66400",
+"/  c #F16900",
+"(  c #F56A00",
+")  c #F56C00",
+"_  c #F76E00",
+"`  c #FB6600",
+"'  c #FD6B00",
+"]  c #F67200",
+"[  c #F67300",
+"{  c #F67400",
+"}  c #F67500",
+"|  c #F37F00",
+" . c #F67900",
+".. c #F77800",
+"X. c #F67803",
+"o. c #FB7500",
+"O. c #F87900",
+"+. c #F97900",
+"@. c #FB7A00",
+"#. c #FB7B00",
+"$. c #FC7900",
+"%. c #FE7A00",
+"&. c #D88427",
+"*. c #EE8604",
+"=. c #F08100",
+"-. c #F68E01",
+";. c #F68B08",
+":. c #FD8000",
+">. c #FE8100",
+",. c #FE8200",
+"<. c #FE8400",
+"1. c #FE8500",
+"2. c #FE8800",
+"3. c #FE8900",
+"4. c #F89700",
+"5. c #FC9900",
+"6. c #FE9E00",
+"7. c #F59A1A",
+"8. c #FE9C13",
+"9. c #E08528",
+"0. c #E89827",
+"q. c #F89F26",
+"w. c #FEA800",
+"e. c #FEAA02",
+"r. c #FEAE03",
+"t. c #FEAF02",
+"y. c #FEAB08",
+"u. c #FEA01D",
+"i. c #FEB701",
+"p. c #FEB602",
+"a. c #FEB802",
+"s. c #FCBB0C",
+"d. c #FCA724",
+"f. c #FCAB2A",
+"g. c #FDAC2E",
+"h. c #FEA830",
+"j. c #F8AF39",
+"k. c #FBB631",
+"l. c #FEC308",
+"z. c #FEC408",
+"x. c #FEC809",
+"c. c #FEC909",
+"v. c #FEC416",
+"b. c #FED311",
+"n. c #FED611",
+"m. c #FED711",
+"M. c #FED818",
+"N. c #FEDC1D",
+"B. c #FEE619",
+"V. c #FEE719",
+"C. c #FEE61A",
+"Z. c #FEE71B",
+"A. c #FEED1A",
+"S. c #FEF825",
+"D. c #FEF827",
+"F. c #FEF926",
+"G. c #FEFC2D",
+"H. c #FEFE2C",
+"J. c #FEFE31",
+"K. c #FEFE34",
+"L. c #FEFE35",
+"P. c #FEFE39",
+"I. c #FEFE3D",
+"U. c #FCCB4A",
+"Y. c #FCD84D",
+"T. c #FEE851",
+"R. c #FEE85A",
+"E. c #FEFD47",
+"W. c #FEFE48",
+"Q. c #FEFE49",
+"!. c #FEFE50",
+"~. c #FEFE52",
+"^. c #FEED72",
+"/. c #FEF763",
+"(. c gray100",
+"). c None",
+/* pixels */
+").).).).).).).#.w ).).).).).).).",
+").).).).).).} u.h X ).).).).).).",
+").).).).).).} ^.k., ).).).).).).",
+").).).).).( d.~.T.s ).).).).).).",
+").:.#.o._ _ Y.J.~.&.p m k j ).).",
+"3.8.h.f.k.U.W.H.L.R.j.0.9.Z F 2 ",
+"=.7./.W.I.L.S.D.S.H.P.I.W.d.t # ",
+").B *.M.A.B.B.Z.Z.B.B.N.;.w O ).",
+").).g C s.n.b.b.b.n.v.Q 7 X ).).",
+").).).f -.x.z.z.z.z.y.u X ).).).",
+").).).R 4.i.t.t.p.i.e.d O ).).).",
+").).).T 5.6.1./ X.6.e.H & ).).).",
+").).M W :.' a > 0 c o.` - ).).).",
+").).I ( z 3 O ).).< r S e ).).).",
+").).M 8 # ).).).).).).1 - X ).).",
+").).).).).).).).).).).).).).).)."
+};
--- kdebase-3.5.7.orig/debian/icons/kate.xpm
+++ kdebase-3.5.7/debian/icons/kate.xpm
@@ -0,0 +1,270 @@
+/* XPM */
+static char *kate[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 232 2",
+"   c #000000",
+".  c #0A0802",
+"X  c #000718",
+"o  c #1C1802",
+"O  c #131413",
+"+  c #000C3A",
+"@  c #2A2509",
+"#  c #362D05",
+"$  c #342F0D",
+"%  c #38320B",
+"&  c #000A58",
+"*  c #021855",
+"=  c #031A5A",
+"-  c #031C64",
+";  c #112762",
+":  c #443319",
+">  c #4A3519",
+",  c #524C0B",
+"<  c #6F552B",
+"1  c #615739",
+"2  c #70582D",
+"3  c #7E543E",
+"4  c #505B63",
+"5  c #586162",
+"6  c #072D99",
+"7  c #082C95",
+"8  c #012BA5",
+"9  c #032DA9",
+"0  c #0630AA",
+"q  c #0832AB",
+"w  c #0B35B3",
+"e  c #0E39BA",
+"r  c #163DB8",
+"t  c #123CC4",
+"y  c #2E498E",
+"u  c #2747B1",
+"i  c #2548B6",
+"p  c #2449BD",
+"a  c #2949B1",
+"s  c #284DBC",
+"d  c #3253B5",
+"f  c #3758BB",
+"g  c #3F5DBB",
+"h  c #1640C5",
+"j  c #1A42C4",
+"k  c #1B43C9",
+"l  c #274BC7",
+"z  c #224AC9",
+"x  c #2A4EC1",
+"c  c #284ECD",
+"v  c #2B53C5",
+"b  c #2D53D0",
+"n  c #3356C4",
+"m  c #3759C8",
+"M  c #385CC5",
+"N  c #3B5FCC",
+"B  c #365BDE",
+"V  c #2951E0",
+"C  c #3E61CA",
+"Z  c #3961D0",
+"A  c #435DA9",
+"S  c #4158B2",
+"D  c #425DBA",
+"F  c #4261BD",
+"G  c #5062A9",
+"H  c #546EB6",
+"J  c #5C73B6",
+"K  c #657691",
+"L  c #6075B6",
+"P  c #707EBD",
+"I  c #4766C9",
+"U  c #4C6ACA",
+"Y  c #4365D2",
+"T  c #456BD7",
+"R  c #4970DA",
+"E  c #536CC5",
+"W  c #5A70C6",
+"Q  c #5275D3",
+"!  c #5B7ADD",
+"~  c #4166E0",
+"^  c #5173EA",
+"/  c #5679E3",
+"(  c #5D7EE4",
+")  c #597BEE",
+"_  c #697ECC",
+"`  c #637EDD",
+"'  c #637FE3",
+"]  c #7D887B",
+"[  c #7681B6",
+"{  c #5E80E4",
+"}  c #5F83EB",
+"|  c #6481C0",
+" . c #6381CF",
+".. c #6A80CC",
+"X. c #6780DD",
+"o. c #6981DC",
+"O. c #6E88DF",
+"+. c #7389D9",
+"@. c #7E93DF",
+"#. c #7C9DDF",
+"$. c #6382E4",
+"%. c #6382E8",
+"&. c #6A86E4",
+"*. c #6886EB",
+"=. c #6D88E5",
+"-. c #6E8BE8",
+";. c #6686F0",
+":. c #6A8AF4",
+">. c #6F92F1",
+",. c #738BE5",
+"<. c #758CE8",
+"1. c #788EE4",
+"2. c #7691E6",
+"3. c #7790EB",
+"4. c #759AE0",
+"5. c #7B92E5",
+"6. c #7B95E8",
+"7. c #7C9EE2",
+"8. c #7395F1",
+"9. c #834B0F",
+"0. c #844C14",
+"q. c #845B28",
+"w. c #AC7B49",
+"e. c #99851A",
+"r. c #98804D",
+"t. c #988054",
+"y. c #958A7C",
+"u. c #BC9552",
+"i. c #ABA855",
+"p. c #B3AF58",
+"a. c #BDA16E",
+"s. c #C0A61C",
+"d. c #C6BE2B",
+"f. c #CFB92F",
+"g. c #FA9F12",
+"h. c #F58D21",
+"j. c #FC8E25",
+"k. c #F98D2A",
+"l. c #FD9225",
+"z. c #FF9529",
+"x. c #FF9F34",
+"c. c #FAA218",
+"v. c #FFBC00",
+"b. c #E0AE2E",
+"n. c #F9B13F",
+"m. c #DAA74A",
+"M. c #D0AE69",
+"N. c #FFAB44",
+"B. c #FFC001",
+"V. c #FFCD0B",
+"C. c #FFD209",
+"Z. c #FFC425",
+"A. c #FFD02D",
+"S. c #FFEF13",
+"D. c #FFED1C",
+"F. c #FFF40D",
+"G. c #FFF416",
+"H. c #FFF11A",
+"J. c #FFEB23",
+"K. c #FFE63F",
+"L. c #D7D357",
+"P. c #F7D84D",
+"I. c #EFC578",
+"U. c #FFD672",
+"Y. c #FFDA7E",
+"T. c #EFEA70",
+"R. c #8D8281",
+"E. c #9E9290",
+"W. c #9E9798",
+"Q. c #9497B3",
+"!. c #94A6BA",
+"~. c #BCBF8E",
+"^. c #8C93C6",
+"/. c #8396DA",
+"(. c #969ECF",
+"). c #8397E4",
+"_. c #869AE3",
+"`. c #8098EB",
+"'. c #94A9DE",
+"]. c #9DAEDE",
+"[. c #93A6EA",
+"{. c #91A9E1",
+"}. c #96AAED",
+"|. c #9CADEC",
+" X c #97ACF1",
+".X c #9FB0ED",
+"XX c #A1B1DE",
+"oX c #A3B4ED",
+"OX c #A8B7EE",
+"+X c #ABB9EE",
+"@X c #A5B4F1",
+"#X c #A6B8F0",
+"$X c #ACBDF0",
+"%X c #B0BEF1",
+"&X c #B9C09E",
+"*X c #9BC0F4",
+"=X c #AAC6EF",
+"-X c #ADD2FF",
+";X c #B8C3EF",
+":X c #B5C1F0",
+">X c #B0C3FD",
+",X c #BAC6F2",
+"<X c #BECAF3",
+"1X c #B6D9FF",
+"2X c #BBDBFF",
+"3X c #C1C28E",
+"4X c #C0C69F",
+"5X c #C5C89F",
+"6X c #FDD381",
+"7X c #C1CCF3",
+"8X c #C6D0F5",
+"9X c #C5D6FE",
+"0X c #C6DDF7",
+"qX c #C1DFFF",
+"wX c #CCD4F4",
+"eX c #CCDCFE",
+"rX c #D2DAF7",
+"tX c #D5DCF9",
+"yX c #C3E1FF",
+"uX c #CCE6FF",
+"iX c #D6E3F7",
+"pX c #D4E4FF",
+"aX c #D3EBFF",
+"sX c #DAE2FB",
+"dX c #DAEDFF",
+"fX c #E2EBEF",
+"gX c #E4E9FA",
+"hX c #EAEDFB",
+"jX c #EBF4FF",
+"kX c #F7FBFF",
+"lX c gray100",
+"zX c None",
+/* pixels */
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXJ.m.% zXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzXD.D.U.I.< zXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzX0 6 zXzXzXzXzXzXzXzXzXzXD.D.D.K.w.r.2 zXzX",
+"zXzXzXzXzXq 9 zXzXzX0 0 w = zXzXzXzXzXzXzXzXD.D.D.D.C.b.1 M.: zX",
+"zXzXzXzXzXq r 9 zX9 9 T } h * zXzXzXzXzXzXD.D.D.D.V.v.v.n.6Xu.  ",
+"zXzXzXzX8 p ,XI 8 0 R pXjX8.t * zXzXzXzXD.D.D.D.V.v.v.c.j.x.q.  ",
+"zXzXzXzX8 @.lXsXn v pXlXlXjX>.t *   zXD.D.D.D.V.v.v.c.k.z.0.    ",
+"zXzXzX8 x tXhXgXwXU XXlXlXlXjX>.t & , H.H.D.V.v.v.c.k.z.0.    zX",
+"zXzXzX9 _.hXwXwXgXwXU XXlXkXdXjX:.i d.H.D.V.v.v.c.k.z.0.    zXzX",
+"zXzX9 n 7X7X7XrXtXsX7XU '.dXjXlXfXL.G.D.V.v.v.c.k.z.0.    zXzXzX",
+"zX0 w ).:X%X7XwXwXwXrX,XC '.lXjXT.F.D.V.v.v.c.k.z.0.    zXzXzXzX",
+"zX8 n |.oX,X7X7X7X7X,X7X%XI {.iXP.G.V.v.v.c.k.z.0.    zXzXzXzXzX",
+"0 w o..X=X,X:X:X:X:X+X:X,XoXZ Q.U.A.v.v.c.k.l.9.    zXzXzXzXzXzX",
+"0 l 6..XoXoXoX+X+XoX+X+X+X#X.XD E.Y.Z.g.j.l.3 +   zXzXzXzXzXzXzX",
+"6 d ~.5XL o.5.5.6.[..X|.}..XoX(.D W.Y.N.h.w.A t * zXzXzXzXzXzXzX",
+"O p.[ 5 y D <.$.&.1.1.6.[.|./.[ ^.S R.a.y.!.eX;.t * zXzXzXzXzXzX",
+"% f.; h a E } ,.1.&.$.,.5.6...G P _ s [ 0X2XqXaX;.t * zXzXzXzXzX",
+". e.s.4 F 4X~.L ` $.,.1.&.$.,.+.O.2.-.N 7.qX2XyXpX;.t *   zXzXzX",
+"zX  # @ i.y.K y f 1.1.=.$.,.,.&.-.2.3.%.n 7.yX-X2XpX*.t *   zXzX",
+"zXzXzX$ d.; h u W =.=.$.,.,.{ &.&.-.$.$.{ n 4.1X-XaX>XV 7   zXzX",
+"zXzXzX. e.s.4 g 5X&XH  .1.$.$.=.&.$.{ $.$.! v *XuX9X^ t *   zXzX",
+"zXzXzXzX. # @ i.y.K y g =.$.+.=.$.{ $.$.( ( v =XeX^ t =     zXzX",
+"zXzXzXzXzXzX% f.; h a E o.,.,.$.{ &.$.{ { Z  .eX^ t =     zXzXzX",
+"zXzXzXzXzXzX. e.s.4 F &X&XJ ! $.&.&.{ { ( M #X) t =     zXzXzXzX",
+"zXzXzXzXzXzXzX. # @ i.] K y f ,.&.( ( *.Y Q ) t =     zXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzX$ f.; t u E $.$.$.&.` v ~ h =     zXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzX. e.s.4 g 4X&XH ! -.Y z k =     zXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzX. # @ i.] K y g ` z t =     zXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzX$ f.; t a E b w =     zXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzX. e.s.5 c B e =     zXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzX. # o - w =     zXzXzXzXzXzXzXzXzXzXzX",
+"zXzXzXzXzXzXzXzXzXzXzXzXzXzXzXzX  X     zXzXzXzXzXzXzXzXzXzXzXzX"
+};
--- kdebase-3.5.7.orig/debian/icons/ktip.xpm
+++ kdebase-3.5.7/debian/icons/ktip.xpm
@@ -0,0 +1,250 @@
+/* XPM */
+static char *ktip[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 212 2",
+"   c black",
+".  c #010101",
+"X  c #020202",
+"o  c gray1",
+"O  c #0A0A0B",
+"+  c gray5",
+"@  c #121215",
+"#  c #191919",
+"$  c #111120",
+"%  c #111121",
+"&  c #161629",
+"*  c #17172A",
+"=  c #191930",
+"-  c #202020",
+";  c gray13",
+":  c #282828",
+">  c #28283B",
+",  c #343434",
+"<  c #252546",
+"1  c #2B2B51",
+"2  c #2E2E58",
+"3  c #3E3E52",
+"4  c #353565",
+"5  c #363668",
+"6  c #393961",
+"7  c #38386B",
+"8  c #3A3A6F",
+"9  c gray26",
+"0  c gray30",
+"q  c #4E4E4E",
+"w  c #585858",
+"e  c #5D5D5D",
+"r  c #5F5F5F",
+"t  c #42427E",
+"y  c #484878",
+"u  c #555568",
+"i  c gray39",
+"p  c #676767",
+"a  c #636373",
+"s  c #6C6C7F",
+"d  c #747474",
+"f  c #48488A",
+"g  c #4C4C91",
+"h  c #4D4D92",
+"j  c #4D4D93",
+"k  c #58588A",
+"l  c #515197",
+"z  c #545497",
+"x  c #505098",
+"c  c #505099",
+"v  c #51519A",
+"b  c #51519B",
+"n  c #52529D",
+"m  c #53539E",
+"M  c #53539F",
+"N  c #5555A2",
+"B  c #5959A4",
+"V  c #5C5CA5",
+"C  c #5C5DA8",
+"Z  c #5E5EA8",
+"A  c #747487",
+"S  c #77778E",
+"D  c #6161A1",
+"F  c #6464A1",
+"G  c #6262A9",
+"H  c #6667AE",
+"J  c #6868AD",
+"K  c #6869AE",
+"L  c #6A6AAF",
+"P  c #6D6DAF",
+"I  c #6F6FAD",
+"U  c #6B6DB3",
+"Y  c #7575AA",
+"T  c #7474B0",
+"R  c #7678B9",
+"E  c #7878B5",
+"W  c #7C7CB8",
+"Q  c #7D7DB9",
+"!  c #7D80BF",
+"~  c #7F80BC",
+"^  c #848484",
+"/  c gray56",
+"(  c #8383BB",
+")  c #8484BA",
+"_  c #8888BE",
+"`  c #9595A1",
+"'  c #9C9CB1",
+"]  c #AAAABC",
+"[  c #8488C8",
+"{  c #8B8BC0",
+"}  c #8D8DC1",
+"|  c #8C8EC5",
+" . c #8E90C6",
+".. c #9090C3",
+"X. c #9191C3",
+"o. c #9494C5",
+"O. c #9595C5",
+"+. c #9595C6",
+"@. c #9799CC",
+"#. c #9898C7",
+"$. c #9999C7",
+"%. c #9A9AC8",
+"&. c #9C9CC9",
+"*. c #9E9ECA",
+"=. c #9F9FCA",
+"-. c #9F9FCB",
+";. c #9B9ED1",
+":. c #989DD6",
+">. c #9C9ED0",
+",. c #9BA1D9",
+"<. c #A0A0CA",
+"1. c #A1A1CE",
+"2. c #A1A2CE",
+"3. c #A2A2CC",
+"4. c #A5A5CE",
+"5. c #A2A3D1",
+"6. c #A3A5D3",
+"7. c #A5A8D6",
+"8. c #A5AADC",
+"9. c #A8A8D1",
+"0. c #A9ADDD",
+"q. c #B3B3C3",
+"w. c #B9B9C7",
+"e. c #BBBCDC",
+"r. c #A3AAE2",
+"t. c #A7AFE8",
+"y. c #A8AEE1",
+"u. c #ABB3E8",
+"i. c #AEB7EE",
+"p. c #B3B7E3",
+"a. c #B1B7E8",
+"s. c #B5BAE6",
+"d. c #B1B8EB",
+"f. c #B3B9E8",
+"g. c #B1BAEE",
+"h. c #B3BBEE",
+"j. c #B6BDEE",
+"k. c #BABFE8",
+"l. c #B9C0EE",
+"z. c #B6C0F4",
+"x. c #BCC5F5",
+"c. c #BDC6F8",
+"v. c #C2C2C4",
+"b. c #CDCDCF",
+"n. c #C3C3D0",
+"m. c #C7C7D3",
+"M. c #CFCFD9",
+"N. c #D5D5DE",
+"B. c #DBDBDC",
+"V. c #C3C7ED",
+"C. c #C0C7F0",
+"Z. c #C1C7F0",
+"A. c #C9D3FF",
+"S. c #D7D7E0",
+"D. c #D7D8EE",
+"F. c #DADAE2",
+"G. c #DCDCE3",
+"H. c #DDDDE4",
+"J. c #D3D7F3",
+"K. c #D1DAFF",
+"L. c #D3DAFF",
+"P. c #D5DDFF",
+"I. c #D6DDFF",
+"U. c #D6DEFF",
+"Y. c #D7DEFF",
+"T. c #D7DFFF",
+"R. c #D9DCF3",
+"E. c #D8DFFF",
+"W. c #D9E0FF",
+"Q. c #DAE1FF",
+"!. c #DDE1FA",
+"~. c #DCE2FF",
+"^. c #DCE3FF",
+"/. c #DDE3FF",
+"(. c #DEE4FF",
+"). c #DFE5FF",
+"_. c #E3E3E9",
+"`. c #E4E4EA",
+"'. c #E8E8ED",
+"]. c #E9E9ED",
+"[. c #E2E5F9",
+"{. c #E0E6FF",
+"}. c #E1E6FF",
+"|. c #E1E7FF",
+" X c #E2E7FF",
+".X c #E2E8FF",
+"XX c #E3E8FF",
+"oX c #E4E9FF",
+"OX c #E5EAFF",
+"+X c #E6EBFF",
+"@X c #EFEFF0",
+"#X c #EEEEF2",
+"$X c #E8ECFF",
+"%X c #E9ECFF",
+"&X c #EBEFFF",
+"*X c #ECEFFF",
+"=X c #EFF2FF",
+"-X c #EFF3FF",
+";X c #F4F4F7",
+":X c #F0F3FF",
+">X c #F2F4FF",
+",X c #F4F6FF",
+"<X c #F4F7FF",
+"1X c #F5F7FF",
+"2X c #F7F9FF",
+"3X c #F8F9FF",
+"4X c #F9FBFF",
+"5X c #FAFBFF",
+"6X c #FBFCFF",
+"7X c #FEFEFF",
+"8X c gray100",
+"9X c None",
+/* pixels */
+"9X9X9X9X9X9X9X9X9X9X-.%.+.X.} _ ( Q E P D y   9X9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X-.=.+.-.y.d.h.h.u.,.Q U G z     9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X4.3.=.8.x.T.+X-X2X>X>X+XT.j.[ B n 1   9X9X9X9X9X9X",
+"9X9X9X9X9X9X4.3.3.j./.8X8X8X8X8X8X8X8X8X<XT.t.C b <   9X9X9X9X9X",
+"9X9X9X9X9X9X3.3.x.+X8X8X8X8X8X8X8X8X8X8X8X8X+Xi.V b     9X9X9X9X",
+"9X9X9X9X9X=.-.l. X8X8X8X8X8X8X8X8X8X8X8X8X8X8XQ.r.N 7     9X9X9X",
+"9X9X9X9X9X=.6.A.4X8X8X8X8X8X8X8X8X8X8X8X8X8X8X2XA.U h     9X9X9X",
+"9X9X9X9X9X%.s.T.4X4X2X4X4X<X4X4X2X4X2X4X2X4X2X4XK.:.N     9X9X9X",
+"9X9X9X9X9X+.C.Q.,X,X<X<X,X<X<X,X<X<X<X<X<X<X<X<XT.a.N     9X9X9X",
+"9X9X9X9X9XX.C.T.-X-X-X-X-X>X>X-X-X-X-X-X-X-X-X-XL.d.N     9X9X9X",
+"9X9X9X9X9X_ p.T.|.-X&X&X-X+X*X*X&X&X&X&X&X&X&X XT.8.N     9X9X9X",
+"9X9X9X9X9X( @.Q.Q.XX+X+X+X+XXX+X+X+X+X+X+X+X XQ.E.R l     9X9X9X",
+"9X9X9X9X9XY Q V.Q.Q.|.|.|.|.XXXX X X X). X/././.k.N 8     9X9X9X",
+"9X9X9X9X9X  T Q |.|.(.|.(.Q.Q.Q./.^.^.).|././. XH b       9X9X9X",
+"9X9X9X9X9X  k P 7.XXXXXXXXXX|.|.).). X X X X X-.N 2       9X9X9X",
+"9X9X9X9X9X9X  D K E.XX+XXX+XXX+X+XOXOX+X+XXXJ.V f       9X9X9X9X",
+"9X9X9X9X9X9X  6 V  .%X%X%X%X%X%X+X+X+X*X+X%X| M $       9X9X9X9X",
+"9X9X9X9X9X9X9X  l N R.*X*X*X*X*X-X&X*X-X*X[.N t       9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X5 N 5.-X-X-X-X-X-X-X-X-X-X5.N %     9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X  c J >X>X>X>X,X>X>X-X-X,XK f       9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9Xh N D.2X,X1X1X1X1X1X1XD.N 4     9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X  N e.2X2X2X2X5X1X2X1Xe.N       9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X  N 9.2X2X8X4X5X5X5X5X9.N       9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9XM O.8X8X8X8X8X8X8X8XO.j     9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9Xb N N N N N N N N N N t     9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X  S s u 3 > * * * * =       9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X^ / ].;X;X]._.F.S.` @       9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9Xp d v.].F.M.n.q.' a O       9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9Xi r B.;X;X]._.S.' a O       9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X0 w b._.N.n.w.] ' A @       9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X  : + , r 9 ; o             9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X      # r q ; o             9X9X9X9X9X9X9X9X"
+};
--- kdebase-3.5.7.orig/debian/icons/klipper.xpm
+++ kdebase-3.5.7/debian/icons/klipper.xpm
@@ -0,0 +1,202 @@
+/* XPM */
+static char *klipper[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 164 2",
+"   c black",
+".  c #180E08",
+"X  c #353541",
+"o  c #452817",
+"O  c #633A20",
+"+  c #6A3E23",
+"@  c #744E17",
+"#  c #734425",
+"$  c #7D4A25",
+"%  c #4B4B5A",
+"&  c #76767A",
+"*  c #7F7F77",
+"=  c #7B7B7D",
+"-  c #646484",
+";  c #70708B",
+":  c #7D7D81",
+">  c #737390",
+",  c #7A7A95",
+"<  c #7E7E98",
+"1  c #865227",
+"2  c #8F5927",
+"3  c #976028",
+"4  c #A06728",
+"5  c #A96E29",
+"6  c #B27429",
+"7  c #BB7B29",
+"8  c #826B56",
+"9  c #8B6F78",
+"0  c #8E786D",
+"q  c #8E727A",
+"w  c #977C64",
+"e  c #90767B",
+"r  c #947A7E",
+"t  c #B07650",
+"y  c #D4710D",
+"u  c #DC750B",
+"i  c #DC7B0E",
+"p  c #838379",
+"a  c #8B8B7D",
+"s  c #D48C1B",
+"d  c #DC8312",
+"f  c #DC8A16",
+"g  c #DC8E18",
+"h  c #DC941A",
+"j  c #DC981D",
+"k  c #C78727",
+"l  c #C28129",
+"z  c #CA872A",
+"x  c #CC8A28",
+"c  c #D28E2A",
+"v  c #D5902A",
+"b  c #DC9D20",
+"n  c #D69F38",
+"m  c #DCA423",
+"M  c #DFAD27",
+"N  c #E1971B",
+"B  c #E49C1C",
+"V  c #FF8602",
+"C  c #FF8B04",
+"Z  c #FF9007",
+"A  c #FF9409",
+"S  c #FF9B0D",
+"D  c #E7A21E",
+"F  c #FFA00F",
+"G  c #FFA311",
+"H  c #FFAA15",
+"J  c #FFAF18",
+"K  c #FFB31A",
+"L  c #FFBB1E",
+"P  c #EAA620",
+"I  c #ECAA21",
+"U  c #E1B32A",
+"Y  c #E3BA2C",
+"T  c #EEB928",
+"R  c #D69F4B",
+"E  c #C89F65",
+"W  c #E5C02F",
+"Q  c #E7C632",
+"!  c #EACD34",
+"~  c #ECD337",
+"^  c #EED939",
+"/  c #FFC423",
+"(  c #FFCE28",
+")  c #FFD42B",
+"_  c #FFDA2E",
+"`  c #F0DB3A",
+"'  c #FFE333",
+"]  c #FFEC38",
+"[  c #FFF33C",
+"{  c #FFF93F",
+"}  c #ECD843",
+"|  c #FFFE42",
+" . c #F4F351",
+".. c #FAF954",
+"X. c #E9E961",
+"o. c #F4F467",
+"O. c #F9F165",
+"+. c #FFFF68",
+"@. c #858589",
+"#. c #85859E",
+"$. c #8C8C91",
+"%. c #9B8382",
+"&. c #909093",
+"*. c #96969A",
+"=. c #9C9C9D",
+"-. c #8787A0",
+";. c #8E8EA5",
+":. c #9696AB",
+">. c #9898AD",
+",. c #A18B86",
+"<. c #A69189",
+"1. c #AB938C",
+"2. c #AE9B8E",
+"3. c #B19690",
+"4. c #B39C92",
+"5. c #B99F95",
+"6. c #B5A392",
+"7. c #B3AA96",
+"8. c #BAA495",
+"9. c #BEA699",
+"0. c #BCA996",
+"q. c #B6B19A",
+"w. c #B8B59C",
+"e. c #BBB99E",
+"r. c #A3A3A8",
+"t. c #A9A9AF",
+"y. c #A2A2B5",
+"u. c #B1B1B7",
+"i. c #B5B5BC",
+"p. c #BCBCC1",
+"a. c #BDBDD0",
+"s. c #C2AB9B",
+"d. c #C6B29D",
+"f. c #C7B89D",
+"g. c #CABC9F",
+"h. c #CEC2A3",
+"j. c #D2C9A6",
+"k. c #D5CDA8",
+"l. c #D7D1AA",
+"z. c #DAD5AC",
+"x. c #DCD9AF",
+"c. c #DFDDB1",
+"v. c #F9F181",
+"b. c #C5C5CA",
+"n. c #C8C8CC",
+"m. c #C3C3D3",
+"M. c #CBCBD5",
+"N. c #CDCDDA",
+"B. c #D2D2D7",
+"V. c #D3D3DC",
+"C. c #D9D9DE",
+"Z. c #CFCFE0",
+"A. c #D3D3E2",
+"S. c #DADAE1",
+"D. c #DFDFEC",
+"F. c #E0E0E5",
+"G. c #E2E2ED",
+"H. c #E8E8EE",
+"J. c #E6E6F0",
+"K. c #EBEBF2",
+"L. c #F1F1F5",
+"P. c #F4F4F9",
+"I. c #FEFEFE",
+"U. c None",
+/* pixels */
+"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.",
+"U.U.U.U.U.U.U.U.U.U.#.#.-.-.-.#.#.#.#.#.%   U.U.U.U.U.U.U.U.U.U.",
+"U.U.U.U.U.U.U.U.U.< < >.P.I.I.I.I.I.P.>., X   U.U.U.U.U.U.U.U.U.",
+"U.U.U.U.U.c c x w > ;.L.I.P.I.P.P.I.P.L.;.; 8 k x z     U.U.U.U.",
+"U.U.U.c c v v v 0 :.K.K.L.K.K.K.L.H.L.H.L.:.0 c v v x @   U.U.U.",
+"U.U.U.z R v.+.+.a y.F.F.F.F.F.F.F.F.F.F.F.y.a +.+.O.n l     U.U.",
+"U.U.U.l } | ..o.p >.V.V.B.B.V.V.B.V.V.V.B.>.p X. .| ` l     U.U.",
+"U.U.U.7 ^ { c.F.#.- > > > > > ; > > > > ; - , a.e.| T 7     U.U.",
+"U.U.U.6 ~ [ x.L.L.B.C.B.V.V.V.N.N.N.m.m.m.a.A.Z.w.] I 6     U.U.",
+"U.U.U.5 ~ ] z.L.I.I.I.I.I.I.I.P.L.L.K.K.J.G.G.Z.q.) P 5     U.U.",
+"U.U.U.4 Q ' k.L.I.I.I.I.= =.I.P.L.L.K.K.J.G.D.N.7.L D 4     U.U.",
+"U.U.U.3 Y ' k.L.I.I.I.I.p =.I.P.L.L.K.J.G.G.D.A.2.K B 3     U.U.",
+"U.U.U.2 Y _ j.L.I.I.I.I.= r.P.P.L.L.K.K.G.D.D.D.2.J N 2     U.U.",
+"U.U.U.1 U ) h.L.I.I.I.I.= =.I.P.L.S.u.p.D.D.D.D.1.J N 1     U.U.",
+"U.U.U.$ M ( h.K.I.I.I.I.= =.I.P.b.& ; N.G.D.D.D.<.J N $     U.U.",
+"U.U.U.# m ( g.K.I.I.I.I.= r.I.b.= : B.G.G.G.G.D.<.H h #     U.U.",
+"U.U.U.# m / g.H.I.I.I.I.: =.p.& $.S.J.J.J.D.G.D.,.H g #     U.U.",
+"U.U.U.# j L f.H.I.I.I.P.& & & & t.J.J.J.J.J.G.G.%.G f #     U.U.",
+"U.U.U.# j K d.H.I.P.P.P.= & $.$.& N.K.J.J.J.J.J.%.G f #     U.U.",
+"U.U.U.# h J 0.G.P.I.P.P.= &.L.S.: @.J.K.J.J.J.J.%.G d #     U.U.",
+"U.U.U.# g H 0.I.I.I.P.P.= *.P.L.i.= r.K.J.J.J.J.%.S d #     U.U.",
+"U.U.U.# f H 8.I.I.P.P.I.= *.P.L.L.*.= n.K.K.K.K.r A d #     U.U.",
+"U.U.U.# d K 6.I.I.I.I.I.= =.P.P.P.F.: : J.K.J.K.r A d #     U.U.",
+"U.U.U.# g K 6.I.I.I.I.P.C.S.I.P.P.P.S.B.F.L.K.K.q Z i #     U.U.",
+"U.U.U.# j J 6.I.I.I.I.I.P.I.P.P.P.P.P.P.L.L.K.K.q Z i #     U.U.",
+"U.U.U.# j J 2.I.I.I.I.I.I.I.I.P.P.P.P.P.L.L.L.L.9 Z i #     U.U.",
+"U.U.U.# h J E d.d.d.s.s.9.9.9.8.5.4.4.3.3.3.1.1.t C u #     U.U.",
+"U.U.U.# s H H H G G F F S S A S A A A Z Z C C C C V y #     U.U.",
+"U.U.U.# $ g G G G G F S S S S A A A Z Z C C C V V u $ +     U.U.",
+"U.U.U.o + # # # # # # # # # # # # # # # # # # # # # O .     U.U.",
+"U.U.U.                                                      U.U.",
+"U.U.U.U.                                                  U.U.U."
+};
--- kdebase-3.5.7.orig/debian/icons/kcontrol-16.xpm
+++ kdebase-3.5.7/debian/icons/kcontrol-16.xpm
@@ -0,0 +1,247 @@
+/* XPM */
+static char *kcontrol-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 225 2",
+"   c black",
+".  c gray2",
+"X  c #000900",
+"o  c #001800",
+"O  c #001900",
+"+  c #031800",
+"@  c #031900",
+"#  c #031C00",
+"$  c #071C03",
+"%  c #171417",
+"&  c #181818",
+"*  c #1E1E1E",
+"=  c #002000",
+"-  c #002F00",
+";  c #212A21",
+":  c #282828",
+">  c gray18",
+",  c gray21",
+"<  c #3C3C3C",
+"1  c #065906",
+"2  c #0D5C0C",
+"3  c #105D06",
+"4  c #0D600D",
+"5  c #14610E",
+"6  c #2D6B2D",
+"7  c gray28",
+"8  c #555555",
+"9  c #7A7877",
+"0  c #7F7C79",
+"q  c #7C7C7C",
+"w  c #0038A8",
+"e  c #084AB2",
+"r  c #0F4FB5",
+"t  c #1357BB",
+"y  c #1856B8",
+"u  c #1D5CBC",
+"i  c #2667C2",
+"p  c #2766C2",
+"a  c #2466CD",
+"s  c #2469C5",
+"d  c #2867C4",
+"f  c #2968C3",
+"g  c #286BC7",
+"h  c #2C6DC7",
+"j  c #2D6CC6",
+"k  c #2F6EC7",
+"l  c #3170C7",
+"z  c #3070C8",
+"x  c #3270CB",
+"c  c #3272CA",
+"v  c #3373CB",
+"b  c #3173CC",
+"n  c #3479CF",
+"m  c #3678CE",
+"M  c #357ADA",
+"N  c #3D7FD2",
+"B  c #3E7FD1",
+"V  c #1B881B",
+"C  c #31A023",
+"Z  c #3FA56F",
+"A  c #4B8247",
+"S  c #5E854A",
+"D  c #519443",
+"F  c #5F967A",
+"G  c #5F967D",
+"H  c #4BBF43",
+"J  c #6C886A",
+"K  c #7BA86A",
+"L  c #7FAE75",
+"P  c #77B377",
+"I  c #77B47F",
+"U  c #47C71F",
+"Y  c #49C617",
+"T  c #48C538",
+"R  c #4DC64D",
+"E  c #5BCA45",
+"W  c #5CCB41",
+"Q  c #6ED94A",
+"!  c #6FCA6F",
+"~  c #7CD761",
+"^  c #7AD16E",
+"/  c #3F81D4",
+"(  c #548A8C",
+")  c #669691",
+"_  c #6692B0",
+"`  c #63B39A",
+"'  c #76A396",
+"]  c #7DA791",
+"[  c #4083D4",
+"{  c #4183D5",
+"}  c #4286D6",
+"|  c #4485D5",
+" . c #4586D7",
+".. c #468BD9",
+"X. c #4885D4",
+"o. c #4988D5",
+"O. c #4C8FDB",
+"+. c #4C8EDC",
+"@. c #5491DB",
+"#. c #5196E0",
+"$. c #5696E8",
+"%. c #5598E0",
+"&. c #559AE3",
+"*. c #5699E2",
+"=. c #599BE3",
+"-. c #5C9AE0",
+";. c #5F9DE2",
+":. c #5DA3E8",
+">. c #60A6E9",
+",. c #64AAEC",
+"<. c #80807F",
+"1. c #86AD73",
+"2. c #85BE73",
+"3. c #92BD64",
+"4. c #80C667",
+"5. c #88CC6E",
+"6. c #84DF63",
+"7. c #9BE87D",
+"8. c #BBDC77",
+"9. c #A0EA70",
+"0. c #C1C86C",
+"q. c #CFE76B",
+"w. c gray52",
+"e. c #8A8988",
+"r. c #8C8B8D",
+"t. c #92908C",
+"y. c #919190",
+"u. c #9D9D9D",
+"i. c #8CAF86",
+"p. c #91BC88",
+"a. c #AEBB97",
+"s. c #B2ACB3",
+"d. c #B2ACB6",
+"f. c #BCBCBC",
+"g. c #899BC7",
+"h. c #8AA4D1",
+"j. c #8CA5D2",
+"k. c #8DA7D1",
+"l. c #91A4CE",
+"z. c #92ACD7",
+"x. c #94AFD7",
+"c. c #97B2DB",
+"v. c #99B2D5",
+"b. c #9DB1D6",
+"n. c #A4BBDB",
+"m. c #A5BEDF",
+"M. c #A2BBE0",
+"N. c #87C385",
+"B. c #9EC891",
+"V. c #90DD82",
+"C. c #A6D183",
+"Z. c #ABD39B",
+"A. c #ADD8A1",
+"S. c #ADE48B",
+"D. c #A8F08B",
+"F. c #B7EF9D",
+"G. c #BAF09B",
+"H. c #BCF5A0",
+"J. c #ACC6E5",
+"K. c #B3CDE9",
+"L. c #B3CDEA",
+"P. c #B9D3EE",
+"I. c #BAD3EE",
+"U. c #BFD9F2",
+"Y. c #C0CF9D",
+"T. c #CEDF91",
+"R. c #D0DFA5",
+"E. c #DDEF9A",
+"W. c #C3E2A4",
+"Q. c #C8F4AE",
+"!. c #C8F8AA",
+"~. c #D2EFA2",
+"^. c #E2E981",
+"/. c #E9EE93",
+"(. c gray78",
+"). c #CBCAC9",
+"_. c #CECDCC",
+"`. c #CAC9D9",
+"'. c #D0CFCE",
+"]. c #D0CCD0",
+"[. c #D1CDD1",
+"{. c #D2D2D2",
+"}. c #D6D5D3",
+"|. c #D7D6D5",
+" X c #D7D7D7",
+".X c #D7D5D8",
+"XX c #D8D3D1",
+"oX c #D9D5D1",
+"OX c #DAD6D2",
+"+X c #DAD7D2",
+"@X c #DDD9D3",
+"#X c gray85",
+"$X c #C6D2E6",
+"%X c #C0DBF2",
+"&X c #C2DDF4",
+"*X c #D2DAE9",
+"=X c #DDDFEA",
+"-X c #DEE2E6",
+";X c #D5E1F6",
+":X c #E3DFD9",
+">X c #E2DFDB",
+",X c #E3DFDB",
+"<X c #E1DFDE",
+"1X c #E6E2DD",
+"2X c gray89",
+"3X c #E4E0E5",
+"4X c #E4E4E4",
+"5X c gray90",
+"6X c #E1E5E9",
+"7X c #E5E9EE",
+"8X c #EAE4E0",
+"9X c #EBE7E1",
+"0X c #EEEBE5",
+"qX c gray91",
+"wX c #EAE9E9",
+"eX c #EAEAEA",
+"rX c #F1EDE7",
+"tX c #F1EEE8",
+"yX c #F3F0EA",
+"uX c #F6F3ED",
+"iX c #F0F4F9",
+"pX c #F6FAFF",
+"aX c #F9F9F9",
+"sX c gray100",
+"dX c None",
+/* pixels */
+"w.}.@X+X+X+XXX+X<X:X>X1X_.< dXdX",
+"<X*Xm.L.I.%X%X%XI.K.J.n.pXy.  dX",
+"8Xk.s } #.:.,.>.*...n p ;Xt.dXdX",
+"8Xx.g { +.*.=.*.+.{ v p $X0 > 8 ",
+"0Xh.r v B |  .o.b.c.l.g.`.s.d.r.",
+"tXk.w y g z z x _ i.G G p.1.S ; ",
+"tXz.e u p j k a ( E.W.W.Q.!.7.@ ",
+"yXc.t h m B B M ) /.G.G.G.~.8.# ",
+"uXm.l | @.-.;.$.' ^.Z.Z.D.T.0.# ",
+" XsXpXiX7X6X-X=XY.q.! B.7.S.C.# ",
+", <.9 e.).|._.[.a.3.` 7.6.5.K $ ",
+"dXdX7 (.5X5XeXeX.X] Z ^ ~ Q Y @ ",
+"dXdXu.sXaXeXeX2X3XN.C i.1.2.U @ ",
+"dXdX& q f.{. X X].P V J A D W @ ",
+"dXdXdX  . * : : % 6 R ! H T E @ ",
+"dXdXdXdXdXdXdXdXdX- 4 1 2 5 3 X "
+};
--- kdebase-3.5.7.orig/debian/icons/kmenuedit-16.xpm
+++ kdebase-3.5.7/debian/icons/kmenuedit-16.xpm
@@ -0,0 +1,108 @@
+/* XPM */
+static char *kmenuedit-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 86 1",
+"  c #000010",
+". c #000011",
+"X c #030111",
+"o c gray35",
+"O c #1B1BFF",
+"+ c #4D73EC",
+"@ c #9F2000",
+"# c #9E2102",
+"$ c #A12401",
+"% c #BB3300",
+"& c #BE3A05",
+"* c #B1431A",
+"= c #B84B1E",
+"- c #AF4323",
+"; c #8A5744",
+": c #866359",
+"> c #997D74",
+", c #AC6C45",
+"< c #BB774D",
+"1 c #C65615",
+"2 c #D24F0E",
+"3 c #D4662D",
+"4 c #E25A0A",
+"5 c #E76E1A",
+"6 c #FA7504",
+"7 c #AD987F",
+"8 c #FA8712",
+"9 c #FF9907",
+"0 c #E68836",
+"q c #FC9F2B",
+"w c #FFA101",
+"e c #FFAD1C",
+"r c #FFB600",
+"t c #FFB40E",
+"y c #FFBB04",
+"u c #EBBE24",
+"i c #FFAD24",
+"p c #D19F4B",
+"a c #C49E7C",
+"s c #CEAF7B",
+"d c #E0B744",
+"f c #F9A84F",
+"g c #FFBB4A",
+"h c #ECB67D",
+"j c #FECD01",
+"k c #F1C013",
+"l c #FFC919",
+"z c #FAD10D",
+"x c #FFC427",
+"c c #FFC135",
+"v c #F9CA3B",
+"b c #FCD72B",
+"n c #FEDA39",
+"m c #FACE5C",
+"M c #FDD647",
+"N c #FFD54A",
+"B c #FDD659",
+"V c #FFD75B",
+"C c #F9CC6A",
+"Z c #FFE05F",
+"A c #998682",
+"S c #959597",
+"D c #979798",
+"F c #99999A",
+"G c #9B9B9B",
+"H c #B0A090",
+"J c #A7A7A7",
+"K c #8CB7FF",
+"L c #95B3E9",
+"P c #A9CFFF",
+"I c #C99682",
+"U c #DAB79C",
+"Y c #C1BCBC",
+"T c #E7C793",
+"R c #F3C589",
+"E c #FFD485",
+"W c #FFDF9D",
+"Q c #CDCDCE",
+"! c #D1C8C8",
+"~ c #DFD6CC",
+"^ c #DEDCDA",
+"/ c gray87",
+"( c #F7ECE3",
+") c gray97",
+"_ c gray100",
+"` c None",
+/* pixels */
+"*-1HJJJJJJJJo```",
+"=hZp))))))))o```",
+"3irk~////JJJJJJo",
+"%6wjsPPPPJ)))))o",
+"$49yuLKKKJ/////o",
+"`&8tzA+++JPPPPPo",
+"`@5elv())JKKKKKo",
+"``2qxbT^/J+++++o",
+"``@0cnd7GJ)))))o",
+"..`<gNMC)J/////o",
+"...>fBBm/ooooooo",
+"...D,EWRGGGGo```",
+"...G!IUa))))o```",
+"...DQY:;////o```",
+"```J////////o```",
+"```oooooooooo```"
+};
--- kdebase-3.5.7.orig/debian/icons/kinfocenter.xpm
+++ kdebase-3.5.7/debian/icons/kinfocenter.xpm
@@ -0,0 +1,349 @@
+/* XPM */
+static char * kinfocenter_xpm[] = {
+"32 32 314 2",
+"  	c None",
+". 	c #98DBF8",
+"+ 	c #ABE2F9",
+"@ 	c #BBE7FA",
+"# 	c #9CDCF8",
+"$ 	c #85D4F6",
+"% 	c #3DBBF1",
+"& 	c #B8E0F6",
+"* 	c #E8F1F9",
+"= 	c #97D3F2",
+"- 	c #1BA6E6",
+"; 	c #C6DFF3",
+"> 	c #D4E4F4",
+", 	c #ABD6F2",
+"' 	c #1399DB",
+") 	c #9BCAED",
+"! 	c #C0D7F0",
+"~ 	c #D5E4F5",
+"{ 	c #FFFFFF",
+"] 	c #77BFEB",
+"^ 	c #0089CF",
+"/ 	c #229DE3",
+"( 	c #ADCBEB",
+"_ 	c #D6E5F5",
+": 	c #0093E1",
+"< 	c #008DDE",
+"[ 	c #269AE0",
+"} 	c #98BEE6",
+"| 	c #AAC9EA",
+"1 	c #F8FBFD",
+"2 	c #007DC6",
+"3 	c #0088DB",
+"4 	c #1990DC",
+"5 	c #84B1E1",
+"6 	c #A4C6E9",
+"7 	c #0083D8",
+"8 	c #559CDB",
+"9 	c #70A4DC",
+"0 	c #AFCCEB",
+"a 	c #4698DA",
+"b 	c #8A8ABF",
+"c 	c #8181BB",
+"d 	c #007ED5",
+"e 	c #0C81D5",
+"f 	c #5796D7",
+"g 	c #5C98D7",
+"h 	c #AECBEB",
+"i 	c #4C93D6",
+"j 	c #0680D5",
+"k 	c #005A9E",
+"l 	c #8888BE",
+"m 	c #E4E4E4",
+"n 	c #7F7FBA",
+"o 	c #0079D2",
+"p 	c #057AD2",
+"q 	c #3085D2",
+"r 	c #498CD2",
+"s 	c #A4C5E9",
+"t 	c #2B84D2",
+"u 	c #006183",
+"v 	c #8383BC",
+"w 	c #7D7DB9",
+"x 	c #0074CF",
+"y 	c #0876CE",
+"z 	c #1A7ACE",
+"A 	c #8EBDE7",
+"B 	c #1679CE",
+"C 	c #0475CE",
+"D 	c #107A39",
+"E 	c #178A02",
+"F 	c #178E00",
+"G 	c #158D00",
+"H 	c #138B00",
+"I 	c #118900",
+"J 	c #0F8800",
+"K 	c #0E8600",
+"L 	c #005D00",
+"M 	c #7B7BB7",
+"N 	c #006EBF",
+"O 	c #006FCB",
+"P 	c #80B7E5",
+"Q 	c #46A948",
+"R 	c #78D05E",
+"S 	c #7AD660",
+"T 	c #78D460",
+"U 	c #76D260",
+"V 	c #73D060",
+"W 	c #31B718",
+"X 	c #7979B6",
+"Y 	c #0E797D",
+"Z 	c #006AC8",
+"` 	c #80B4E4",
+" .	c #0875A4",
+"..	c #6AB859",
+"+.	c #9EDD8D",
+"@.	c #77D360",
+"#.	c #75D160",
+"$.	c #73CF60",
+"%.	c #B1E4A7",
+"&.	c #43BC30",
+"*.	c #7777B5",
+"=.	c #318030",
+"-.	c #0065C5",
+";.	c #80B2E2",
+">.	c #1A9042",
+",.	c #6EBD5C",
+"'.	c #23B600",
+").	c #1FB300",
+"!.	c #1CB000",
+"~.	c #9ADB8F",
+"{.	c #40B930",
+"].	c #7575B4",
+"^.	c #6CAEC0",
+"/.	c #005FC2",
+"(.	c #5091D5",
+"_.	c #297AAC",
+":.	c #8DAD8B",
+"<.	c #A2B69F",
+"[.	c #9DB497",
+"}.	c #7BA073",
+"|.	c #31AA1B",
+"1.	c #18AD00",
+"2.	c #98DA8F",
+"3.	c #3DB630",
+"4.	c #7373B3",
+"5.	c #B9F78F",
+"6.	c #369099",
+"7.	c #005DC0",
+"8.	c #307BCC",
+"9.	c #2072BC",
+"0.	c #94BB9D",
+"a.	c #95959B",
+"b.	c #848484",
+"c.	c #6A6A6A",
+"d.	c #505050",
+"e.	c #219110",
+"f.	c #14A900",
+"g.	c #97D88F",
+"h.	c #3AB430",
+"i.	c #7070B2",
+"j.	c #B7F58F",
+"k.	c #B4F28E",
+"l.	c #4695A4",
+"m.	c #0C7386",
+"n.	c #3BA431",
+"o.	c #61AE54",
+"p.	c #979798",
+"q.	c #727272",
+"r.	c #585858",
+"s.	c #3E3E3E",
+"t.	c #1A8A0B",
+"u.	c #11A600",
+"v.	c #95D78F",
+"w.	c #37B130",
+"x.	c #6E6EB0",
+"y.	c #B6F48F",
+"z.	c #B5F38F",
+"A.	c #B1EF8E",
+"B.	c #74BC7F",
+"C.	c #17807B",
+"D.	c #0D7386",
+"E.	c #1C9135",
+"F.	c #24A007",
+"G.	c #22A306",
+"H.	c #2DB30E",
+"I.	c #3BAA24",
+"J.	c #2E9D1A",
+"K.	c #259413",
+"L.	c #1B8B0D",
+"M.	c #129E02",
+"N.	c #0DA300",
+"O.	c #94D58F",
+"P.	c #34AE30",
+"Q.	c #6C6CAF",
+"R.	c #B4F28F",
+"S.	c #B3F28F",
+"T.	c #B2F08F",
+"U.	c #9FEB77",
+"V.	c #64CE33",
+"W.	c #3AB607",
+"X.	c #84B2B0",
+"Y.	c #269A35",
+"Z.	c #6BAB91",
+"`.	c #83B1B0",
+" +	c #A3C5AB",
+".+	c #ACCBAA",
+"++	c #AECDAB",
+"@+	c #BADCB5",
+"#+	c #C6EABE",
+"$+	c #CBEBC4",
+"%+	c #D2E4CE",
+"&+	c #CBDEC8",
+"*+	c #C5D8C2",
+"=+	c #BFD1BC",
+"-+	c #C0E1BE",
+";+	c #93D58F",
+">+	c #92D48F",
+",+	c #31AC30",
+"'+	c #6A6AAE",
+")+	c #DCB46B",
+"!+	c #DBB46B",
+"~+	c #B0EF8F",
+"{+	c #D1F5BF",
+"]+	c #D0F4BF",
+"^+	c #69D539",
+"/+	c #BFBFC1",
+"(+	c #99999C",
+"_+	c #7F7F83",
+":+	c #2DB404",
+"<+	c #2AB104",
+"[+	c #28B502",
+"}+	c #26B900",
+"|+	c #4DBC38",
+"1+	c #B0B0B0",
+"2+	c #8A8A8A",
+"3+	c #707070",
+"4+	c #565656",
+"5+	c #479B41",
+"6+	c #92D38F",
+"7+	c #91D38F",
+"8+	c #30AB30",
+"9+	c #6868AD",
+"0+	c #E9A060",
+"a+	c #E89F60",
+"b+	c #69DE30",
+"c+	c #43D300",
+"d+	c #CFF3BF",
+"e+	c #63D036",
+"f+	c #A3A3A3",
+"g+	c #747474",
+"h+	c #4F4F4F",
+"i+	c #A3E38F",
+"j+	c #A2E28F",
+"k+	c #A0E18F",
+"l+	c #9FDF8F",
+"m+	c #9DDE8F",
+"n+	c #9CDC8F",
+"o+	c #A9DAA1",
+"p+	c #A0A0A0",
+"q+	c #797979",
+"r+	c #5F5F5F",
+"s+	c #444444",
+"t+	c #86B084",
+"u+	c #90D28F",
+"v+	c #8FD28F",
+"w+	c #6666AC",
+"x+	c #66DB30",
+"y+	c #3FD000",
+"z+	c #CEF2BF",
+"A+	c #5DCA33",
+"B+	c #8E8E8E",
+"C+	c #5B5B5B",
+"D+	c #353535",
+"E+	c #52C930",
+"F+	c #4EC630",
+"G+	c #4287CB",
+"H+	c #3F72FF",
+"I+	c #4185CB",
+"J+	c #58BC4B",
+"K+	c #72976E",
+"L+	c #52774F",
+"M+	c #3D633B",
+"N+	c #294E27",
+"O+	c #2C912B",
+"P+	c #24A624",
+"Q+	c #6464AB",
+"R+	c #AEED8F",
+"S+	c #ADEC8F",
+"T+	c #60D630",
+"U+	c #CDF1BF",
+"V+	c #35C600",
+"W+	c #CBF0BF",
+"X+	c #CAEFBF",
+"Y+	c #22B600",
+"Z+	c #3782BF",
+"`+	c #3580BF",
+" @	c #0AA000",
+".@	c #069C00",
+"+@	c #029900",
+"@@	c #009700",
+"#@	c #6262A9",
+"$@	c #C7F2B3",
+"%@	c #90E46B",
+"&@	c #5DD330",
+"*@	c #CCF1BF",
+"=@	c #31C300",
+"-@	c #CAEEBF",
+";@	c #89BACB",
+">@	c #82AEDF",
+",@	c #87B8CB",
+"'@	c #B3E0B3",
+")@	c #5F5FA8",
+"!@	c #F3F497",
+"~@	c #EAE071",
+"{@	c #F3DA70",
+"]@	c #D6F47F",
+"^@	c #F2DA70",
+"/@	c #CBEF74",
+"(@	c #F2D970",
+"_@	c #D2E873",
+":@	c #C7EC74",
+"<@	c #F1D870",
+"[@	c #307F30",
+"}@	c #0C700C",
+"|@	c #006C00",
+"1@	c #5D5DA7",
+"2@	c #FFF489",
+"3@	c #FFDD67",
+"4@	c #FFD256",
+"5@	c #FFFF9A",
+"6@	c #5B5BA6",
+"7@	c #5959A5",
+"8@	c #5A5AA5",
+"9@	c #5757A4",
+"                                                                ",
+"                      . + @ @ # $ %                             ",
+"                  & * * * * * * * * = -                         ",
+"                ; > > > > > > > > > > , '                       ",
+"              ) ! ! ! ! ~ { { ~ ! ! ! ! ] ^                     ",
+"            / ( ( ( ( ( _ { { _ ( ( ( ( ( :                     ",
+"          < [ } } } } } | 1 1 | } } } } } [ 2                   ",
+"          3 4 5 5 5 5 5 5 6 6 5 5 5 5 5 5 3 3                   ",
+"          7 7 8 9 9 9 9 0 { { 0 9 9 9 9 a 7 7                   ",
+"b b b c   d d e f g g g h { { h g g g i j d d k                 ",
+"l m m n   o o o p q r r s { { s r r t p o o o u                 ",
+"b v m w   x x x x x y z A { { A B C x x x x x D E F G H I J K L ",
+"  b m M   N O O O O O O P { { P O O O O O O O Q R S T U U V W L ",
+"  b m X   Y Z Z Z Z Z Z ` { { ` Z Z Z Z Z Z  ...+.@.#.$.$.%.&.L ",
+"  b m *.  =.-.-.-.-.-.-.;.{ { ;.-.-.-.-.-.-.>.,.@.'.).!.!.~.{.L ",
+"  b m ].  =.^./././././.(.{ { (./././././._.:.<.[.}.|.1.1.2.3.L ",
+"  b m 4.  =.5.6.7.7.7.7.7.8.8.7.7.7.7.7.9.0.a.b.c.d.e.f.f.g.h.L ",
+"  b m i.  =.j.k.l.7.7.7.7.7.7.7.7.7.7.m.n.o.p.q.r.s.t.u.u.v.w.L ",
+"  b m x.  =.y.z.A.B.C.7.7.7.7.7.7.D.E.F.G.H.I.J.K.L.M.N.N.O.P.L ",
+"  b m Q.  =.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+;+>+,+L ",
+"  b m '+  =.)+!+~+{+]+^+/+(+_+:+<+[+}+'.).|+1+2+3+4+5+6+6+7+8+L ",
+"  b m 9+  =.0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+u+v+8+L ",
+"  b m w+  =.a+a+x+y+z+A+B+C+D+E+F+G+H+I+&.J+K+L+M+N+O+P+P+v+8+L ",
+"  b m Q+  =.R+S+d+T+U+V+W+X+E+}+Y+Z+H+`+f.u.N. @.@+@@@@@@@v+8+L ",
+"  b m #@  =.$@%@z+&@*@=@X+-@F+Y+m+;@>@,@g.v.O.>+7+v+v+v+v+'@8+L ",
+"  b m )@  =.!@~@{@]@^@/@(@(@_@:@<@=.=.=.=.=.[@[@[@[@[@[@[@}@|@L ",
+"  b m 1@  =.2@3@4@5@4@5@4@4@2@5@4@=.                            ",
+"  b m 6@  =.2@3@4@5@4@5@4@4@2@5@4@=.                            ",
+"  b m 7@  =.=.=.=.=.=.=.=.=.=.=.=.=.                            ",
+"  b 8@9@                                                        ",
+"                                                                ",
+"                                                                "};
--- kdebase-3.5.7.orig/debian/icons/keditbookmarks.xpm
+++ kdebase-3.5.7/debian/icons/keditbookmarks.xpm
@@ -0,0 +1,286 @@
+/* XPM */
+static char *keditbookmarks[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 248 2",
+"   c black",
+".  c #351600",
+"X  c #381600",
+"o  c #381B00",
+"O  c #522A00",
+"+  c #5E2200",
+"@  c #5B2900",
+"#  c #6B2500",
+"$  c #722D00",
+"%  c #722E00",
+"&  c #7C3400",
+"*  c #7B4000",
+"=  c #8E3600",
+"-  c #8C3F00",
+";  c #973C00",
+":  c #9C3500",
+">  c #9C3E00",
+",  c #A33600",
+"<  c #A23D00",
+"1  c #A93B00",
+"2  c #AA3F00",
+"3  c #9B5200",
+"4  c #A64100",
+"5  c #A94D00",
+"6  c #A65A00",
+"7  c #B54F00",
+"8  c #BD4500",
+"9  c #B84800",
+"0  c #B84900",
+"q  c #BE4E00",
+"w  c #B25700",
+"e  c #B65100",
+"r  c #BD5A00",
+"t  c #C24100",
+"y  c #C64400",
+"u  c #C74700",
+"i  c #C14B00",
+"p  c #C24E00",
+"a  c #C44800",
+"s  c #C84800",
+"d  c #CB4A00",
+"f  c #CC4E00",
+"g  c #CE4F00",
+"h  c #CA5300",
+"j  c #CC5200",
+"k  c #CC5B00",
+"l  c #D05200",
+"z  c #D05300",
+"x  c #D15500",
+"c  c #D25400",
+"v  c #D25500",
+"b  c #D45700",
+"n  c #D35A00",
+"m  c #D55900",
+"M  c #D65A00",
+"N  c #D65B00",
+"B  c #D85B00",
+"V  c #D85C00",
+"C  c #D95E00",
+"Z  c #DA5F00",
+"A  c #DE5F00",
+"S  c #C66300",
+"D  c #C36C00",
+"F  c #D56100",
+"G  c #D76F00",
+"H  c #DA6000",
+"J  c #DB6200",
+"K  c #DE6200",
+"L  c #DC6700",
+"P  c #DF6400",
+"I  c #DF6500",
+"U  c #DF6900",
+"Y  c #DE6D00",
+"T  c #D37100",
+"R  c #D67C00",
+"E  c #D87A00",
+"W  c #DF7800",
+"Q  c #E05F00",
+"!  c #E06700",
+"~  c #E46700",
+"^  c #E16800",
+"/  c #E16C00",
+"(  c #E46A00",
+")  c #E46E00",
+"_  c #E56E00",
+"`  c #E56F00",
+"'  c #E66F00",
+"]  c #EE6E00",
+"[  c #E17100",
+"{  c #E37000",
+"}  c #E47300",
+"|  c #E67100",
+" . c #E77100",
+".. c #E77200",
+"X. c #E27D09",
+"o. c #E97000",
+"O. c #E97500",
+"+. c #EB7600",
+"@. c #E87900",
+"#. c #EA7900",
+"$. c #E97C00",
+"%. c #EC7800",
+"&. c #EC7A00",
+"*. c #ED7A00",
+"=. c #EE7A00",
+"-. c #ED7C00",
+";. c #F27500",
+":. c #F27B00",
+">. c #F17D00",
+",. c #F97300",
+"<. c #F87D00",
+"1. c #FC7B00",
+"2. c #E58405",
+"3. c #E68404",
+"4. c #EC8100",
+"5. c #ED8100",
+"6. c #E88A00",
+"7. c #E78915",
+"8. c #E5881E",
+"9. c #EE9F14",
+"0. c #F18300",
+"q. c #F28100",
+"w. c #F18500",
+"e. c #F28500",
+"r. c #F48500",
+"t. c #F68400",
+"y. c #F78500",
+"u. c #F78700",
+"i. c #F28E00",
+"p. c #F38E00",
+"a. c #F98300",
+"s. c #FF8300",
+"d. c #F88800",
+"f. c #F88900",
+"g. c #F88A00",
+"h. c #F98A00",
+"j. c #F98C00",
+"k. c #F88E00",
+"l. c #FB8D00",
+"z. c #FD8F00",
+"x. c #FF8E00",
+"c. c #FF8F00",
+"v. c #F89003",
+"b. c #F99600",
+"n. c #FD9000",
+"m. c #FE9200",
+"M. c #FF9400",
+"N. c #FF9500",
+"B. c #FF9600",
+"V. c #F89903",
+"C. c #F99E00",
+"Z. c #FF9800",
+"A. c #FF9900",
+"S. c #FF9A00",
+"D. c #FF9C00",
+"F. c #FF9D00",
+"G. c #FF9E00",
+"H. c #FF9F00",
+"J. c #FF9E05",
+"K. c #EB9522",
+"L. c #FDA700",
+"P. c #FFA603",
+"I. c #FFA504",
+"U. c #FDA209",
+"Y. c #FCA60E",
+"T. c #FFA800",
+"R. c #FFAA00",
+"E. c #FFAD00",
+"W. c #F8A115",
+"Q. c #F9A215",
+"!. c #FDA815",
+"~. c #FFB000",
+"^. c #FFB200",
+"/. c #FFB301",
+"(. c #FFB307",
+"). c #FFB501",
+"_. c #FFB600",
+"`. c #FFB707",
+"'. c #FFBE05",
+"]. c #FFB90F",
+"[. c #FCB31C",
+"{. c #FFBE16",
+"}. c #F1A62E",
+"|. c #FCAF22",
+" X c #FBB22E",
+".X c #FFB82E",
+"XX c #FFBF2E",
+"oX c #F3B54B",
+"OX c #F3B64B",
+"+X c #F8BC4B",
+"@X c #FFC60A",
+"#X c #FFCA13",
+"$X c #FFCD11",
+"%X c #FFD417",
+"&X c #FFD91F",
+"*X c #FFDB1D",
+"=X c #FFC020",
+"-X c #FFC829",
+";X c #FFC82B",
+":X c #FFCD2E",
+">X c #FFC33D",
+",X c #FFDA2A",
+"<X c #FFD030",
+"1X c #FFD933",
+"2X c #FFD939",
+"3X c #FFE424",
+"4X c #FFE72D",
+"5X c #FFEC2B",
+"6X c #FFE132",
+"7X c #FFE635",
+"8X c #FFE738",
+"9X c #FFE43D",
+"0X c #FFF232",
+"qX c #FFF63B",
+"wX c #FFFB39",
+"eX c #FDC34B",
+"rX c #FDC44B",
+"tX c #FCC759",
+"yX c #FED367",
+"uX c #FFD467",
+"iX c #FCD371",
+"pX c #FFFF41",
+"aX c #FFFF43",
+"sX c #FFFF4B",
+"dX c #FFF855",
+"fX c #FFFF53",
+"gX c #FFFF58",
+"hX c #FFFF60",
+"jX c #FFFF72",
+"kX c #FFFF75",
+"lX c #FFFF78",
+"zX c #FFFF81",
+"xX c #FFFF83",
+"cX c #FFFF89",
+"vX c #FFF098",
+"bX c #FFF39F",
+"nX c #FFFF92",
+"mX c #FFFF94",
+"MX c #FFF2A8",
+"NX c #FFF3A8",
+"BX c #FFFFA5",
+"VX c #FFFCB0",
+"CX c #FFFDB0",
+"ZX c #FFFFB7",
+"AX c #FFFCB8",
+"SX c #FFFFCA",
+"DX c gray100",
+"FX c None",
+/* pixels */
+"FXFXFXFXFXFXFXFXFXFXFXFXFXFXk.f.FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXFXFXk.f.y.6 FXFXFXFXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXFXFXf.b.W.}   FXFXFXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXFXf.f.uXuXw.* FXFXFXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXFXf.k.ZXZXi.T   FXFXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXf.r.eXjXkXtX&.O FXFXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXf.y.CXaXsXCX5.S   FXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXy. XzXaXaXxX+X)   FXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXy.r.NXaXpXaXfXMX .w FXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXB.B.n.z.z.f.f.t.W.mXaXaXaXpXmX}.Y I ! I H H V m FXFXFXFXFX",
+"F.F.A.B.B.z.U.!.|.eXeXMXfXaXaXpXaXfXAXOXOXK.7.X.V B m b v l FXFX",
+"F.A.XXvXSXSXBXBXnXzXzXgXpXpXpXpXpXpXhXlXzXzXcXBXBXBXiX8.l 9   FX",
+"FX6.B.>XkXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXqX9X9.v 9     FX",
+"FXFXR n..XdX0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X7X2X3.l 4     FXFX",
+"FXFXFXE f.Y.8X5X5X5X5X5X5X5X5X5X5X5X5X5X5X4X1X:X3.v >     FXFXFX",
+"FXFXFXFXD r.V.6X3X3X3X3X3X3X3X3X3X3X3X3X,X<X;XY v %     FXFXFXFX",
+"FXFXFXFXFXT $.w.$X*X*X*X*X*X&X&X&X*X*X&X;X[.Y n %     FXFXFXFXFX",
+"FXFXFXFXFXFX3 @.w.%X%X%X%X%X%X%X%X%X%X%X=XY h .     FXFXFXFXFXFX",
+"FXFXFXFXFXFXFX&.i.$X$X$X$X$X$X$X$X$X$X$X{. .p     FXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFX&.C.@X@X@X@X@X@X@X@X@X@X@X].5.j   FXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFX%.I.'.'.'.'.`.`.'.'.'.'.'.`.v.l X FXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFX&.+.~._._._.P.J.J.I._._._._._.J.g =   FXFXFXFXFXFXFX",
+"FXFXFXFXFXFX+.&.~.~.R.A.B.>.I K &.I.R.~.~.A.m 2   FXFXFXFXFXFXFX",
+"FXFXFXFXFXFX+.q.R.F.z.y.( H e 7 m V :.F.R.B.( 8   FXFXFXFXFXFXFX",
+"FXFXFXFXFXFX .f.z.s.o.! k @     & q v A <.n.] d   FXFXFXFXFXFXFX",
+"FXFXFXFXFXo. .1.;.^ F -       FXFX  ; p g A ,.y # FXFXFXFXFXFXFX",
+"FXFXFXFXFX . .) U 5       FXFXFXFXFXFX  < y d y :   FXFXFXFXFXFX",
+"FXFXFXFXFXo.Y r o     FXFXFXFXFXFXFXFXFXFX+ 1 t ,   FXFXFXFXFXFX",
+"FXFXFXFXFXFX        FXFXFXFXFXFXFXFXFXFXFXFX        FXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX",
+"FXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFXFX"
+};
--- kdebase-3.5.7.orig/debian/icons/kjobviewer-16.xpm
+++ kdebase-3.5.7/debian/icons/kjobviewer-16.xpm
@@ -0,0 +1,159 @@
+/* XPM */
+static char *kjobviewer-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 137 2",
+"   c black",
+".  c gray5",
+"X  c #252525",
+"o  c #313131",
+"O  c #323232",
+"+  c #333335",
+"@  c #464646",
+"#  c #4D4D4F",
+"$  c #545455",
+"%  c #555556",
+"&  c #56565B",
+"*  c #59595B",
+"=  c #58585D",
+"-  c #5A5A62",
+";  c #5C5C68",
+":  c #606065",
+">  c #6C6C6E",
+",  c #6F6F74",
+"<  c #707073",
+"1  c #76767E",
+"2  c #7C7C80",
+"3  c #7F7F84",
+"4  c #008CFD",
+"5  c #008EFF",
+"6  c #239EFF",
+"7  c #498ADF",
+"8  c #538FDE",
+"9  c #40A1ED",
+"0  c #4BB5FD",
+"q  c #51B8FD",
+"w  c #6699DE",
+"e  c #6A9CDE",
+"r  c #7EA7DF",
+"t  c #76C7FD",
+"y  c #84848C",
+"u  c #878792",
+"i  c #898990",
+"p  c #898993",
+"a  c #93939E",
+"s  c #8B9AB2",
+"d  c #9999A7",
+"f  c #9A9AA6",
+"g  c #90A3BF",
+"h  c #A3A3AB",
+"j  c #A0A0AC",
+"k  c #A6A6AD",
+"l  c #A3A3B2",
+"z  c #A9A9B2",
+"x  c #AFAFB6",
+"c  c #AFAFB7",
+"v  c #A5BABC",
+"b  c #B0B0B7",
+"n  c #B1B1B6",
+"m  c #B1B1B9",
+"M  c #B4B4BD",
+"N  c #83A9DE",
+"B  c #8FB1D3",
+"V  c #8BB2DA",
+"C  c #9BB6DE",
+"Z  c #9EB7DF",
+"A  c #B3B3C1",
+"S  c #B3B3C2",
+"D  c #B1B1C5",
+"F  c #B9B9C0",
+"G  c #B9B9C4",
+"H  c #BEBECA",
+"J  c #BDBDCE",
+"K  c #8BCDFC",
+"L  c #A8C2E4",
+"P  c #A9C3E6",
+"I  c #AAC3E5",
+"U  c #ACC7E7",
+"Y  c #ADC7E7",
+"T  c #AFC9E8",
+"R  c #B9D5F0",
+"E  c #C0C0C9",
+"W  c #C7C7CE",
+"Q  c #C0C5D7",
+"!  c #C4C6D7",
+"~  c #C8C8D2",
+"^  c #CACAD6",
+"/  c #CBCBD6",
+"(  c #CACDD4",
+")  c #CDCDDA",
+"_  c #CFD4DC",
+"`  c #D0D0D1",
+"'  c #D2D2D2",
+"]  c #D0D0DC",
+"[  c #D5D5DB",
+"{  c #D5D5DE",
+"}  c #D6D6E1",
+"|  c #D7D7E0",
+" . c #D8D8E2",
+".. c #DADAE3",
+"X. c #DBDBE3",
+"o. c #DDDDE2",
+"O. c #DFDFE6",
+"+. c #C9E5F9",
+"@. c #CBE6FA",
+"#. c #CEE8FA",
+"$. c #D5EBFB",
+"%. c #DBEEFB",
+"&. c #DCEEFB",
+"*. c #E0E1E7",
+"=. c #E1E1E9",
+"-. c #E2E2E8",
+";. c #E3E3E9",
+":. c #E2E2EA",
+">. c #E3E3EB",
+",. c #E4E4E8",
+"<. c #E4E4E9",
+"1. c #E5E5EB",
+"2. c #E6E6EB",
+"3. c #E6E6EC",
+"4. c #E8E8EC",
+"5. c #E9E9EE",
+"6. c #E2E8F1",
+"7. c #EBEBF0",
+"8. c #E9ECF3",
+"9. c #EBEFF6",
+"0. c #ECECF0",
+"q. c #ECF2F8",
+"w. c #F4F4F7",
+"e. c #F0F5FA",
+"r. c #F1F5FA",
+"t. c #F2F6FA",
+"y. c #F6F6F8",
+"u. c #F5F9FB",
+"i. c #F6F8FC",
+"p. c #F8FBFD",
+"a. c #FBFBFC",
+"s. c #F9FCFD",
+"d. c #FAFCFD",
+"f. c #FCFCFD",
+"g. c #FEFFFF",
+"h. c gray100",
+"j. c None",
+/* pixels */
+"j.j.j.j.A =.;.;.;.;.*.f j.j.j.j.",
+"j.j.j.j.H h.h.h.h.d.d.j j.j.j.j.",
+"j.j.j.j.G h.h.h.d.u.i.f j.j.j.j.",
+"j.j.j.j.M h.h.h.u.q.u.a j.j.j.j.",
+"j.j.j.j.z h.d.u.t.9.9.p j.j.j.j.",
+"j.@ # m x d.u.q.q.6.8.k c @ O j.",
+"% | =.=.g T Y Y P P P s | | ~ O ",
+"F 3.3.,.R &.&.$.#.@.@.V ) v ) 3 ",
+"{ 5.3.( K t q 0 0 0 0 9 |  . .b ",
+"k ,.3.B 6 5 5 5 5 5 5 5 { 2...i ",
+"u D D Q C r w 7 8 e N Z ! D D 1 ",
+"y J A = & & & & & & & & : J J , ",
+"2 ) H < ' ' ' ' ' ' ' ( > ^ ) * ",
+"% W =.{ h.h.h.h.h.h.h.h.( *.x X ",
+"j.. - w.h.h.h.h.h.h.d.y.o.+   j.",
+"j.j.l 4.0.5.5.0.5.4.4.,.o.; j.j."
+};
--- kdebase-3.5.7.orig/debian/icons/kcontrol.xpm
+++ kdebase-3.5.7/debian/icons/kcontrol.xpm
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kcontrol[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #0C0C0C",
+"X  c #001200",
+"o  c #001A00",
+"O  c gray8",
+"+  c #1B1B1B",
+"@  c #002500",
+"#  c #002900",
+"$  c #232323",
+"%  c #2C2C2C",
+"&  c #343434",
+"*  c #3A3A3A",
+"=  c #1C5019",
+"-  c #0E740E",
+";  c #196E17",
+":  c #257601",
+">  c #337D6D",
+",  c #444544",
+"<  c #4C4C4C",
+"1  c #57565B",
+"2  c #505050",
+"3  c #4B7744",
+"4  c #646464",
+"5  c #7B797B",
+"6  c #747376",
+"7  c #697068",
+"8  c #003BAA",
+"9  c #0441AC",
+"0  c #0B4AB3",
+"q  c #104EB3",
+"w  c #1452B6",
+"e  c #1255BC",
+"r  c #1C5BBC",
+"t  c #1459B6",
+"y  c #1C63BC",
+"u  c #2A59AC",
+"i  c #275AAD",
+"p  c #2160BF",
+"a  c #266FBF",
+"s  c #3666B5",
+"d  c #1D60C2",
+"f  c #2464C2",
+"g  c #2866C4",
+"h  c #2B6AC5",
+"j  c #2C6DC8",
+"k  c #2D70CB",
+"l  c #2E77C5",
+"z  c #3373CB",
+"x  c #3878CE",
+"c  c #3679CB",
+"v  c #3B7CD0",
+"b  c #3176D0",
+"n  c #446AAA",
+"m  c #406FBD",
+"M  c #4172BB",
+"N  c #526FA2",
+"B  c #5C76AB",
+"V  c #507AB7",
+"C  c #617AAF",
+"Z  c #427ED0",
+"A  c #4576C1",
+"S  c #129911",
+"D  c #109710",
+"F  c #089308",
+"G  c #1C833C",
+"H  c #08A100",
+"J  c #12AA00",
+"K  c #18A402",
+"L  c #1DA212",
+"P  c #3D8A18",
+"I  c #20853C",
+"U  c #2F852A",
+"Y  c #21AB0B",
+"T  c #2BB415",
+"R  c #39B72D",
+"E  c #36B334",
+"W  c #388B52",
+"Q  c #3DC80C",
+"!  c #47883F",
+"~  c #40A836",
+"^  c #5D986F",
+"/  c #57B64B",
+"(  c #5DB35C",
+")  c #54B254",
+"_  c #58AC4B",
+"`  c #6C9A58",
+"'  c #6EBD4C",
+"]  c #64BB5A",
+"[  c #70BE4D",
+"{  c #77B456",
+"}  c #6B8D6B",
+"|  c #45CA17",
+" . c #4CD413",
+".. c #56D326",
+"X. c #4DC531",
+"o. c #64E02F",
+"O. c #58C54C",
+"+. c #62CE46",
+"@. c #62CB49",
+"#. c #69CA55",
+"$. c #73D25A",
+"%. c #6BD646",
+"&. c #6AC569",
+"*. c #6FC86F",
+"=. c #71CD68",
+"-. c #78CA77",
+";. c #79D461",
+":. c #79D663",
+">. c #3E80D3",
+",. c #4492AF",
+"<. c #5C82BA",
+"1. c #58A0B4",
+"2. c #718EBB",
+"3. c #6E8BB9",
+"4. c #4381CF",
+"5. c #4384D5",
+"6. c #4789D7",
+"7. c #4688D9",
+"8. c #4A8CDA",
+"9. c #4587D7",
+"0. c #4E90DC",
+"q. c #4991D3",
+"w. c #5987C5",
+"e. c #508DD8",
+"r. c #5293DD",
+"t. c #4D92E0",
+"y. c #5396E0",
+"u. c #5A9BE2",
+"i. c #579BE4",
+"p. c #5DA0E6",
+"a. c #5CA2EA",
+"s. c #6794CA",
+"d. c #6D9CD1",
+"f. c #7095C7",
+"g. c #6299EA",
+"h. c #6691FB",
+"j. c #73A3D5",
+"k. c #7CACDA",
+"l. c #63A2E5",
+"z. c #62A6EA",
+"x. c #65A9EC",
+"c. c #68AEF1",
+"v. c #6CB3F4",
+"b. c #857587",
+"n. c #849E7D",
+"m. c #81A954",
+"M. c #80AA57",
+"N. c #85AB47",
+"B. c #9ABD60",
+"V. c #8AAB7A",
+"C. c #8ED84E",
+"Z. c #82DA64",
+"A. c #85DA6A",
+"S. c #8ADA76",
+"D. c #96D071",
+"F. c #90ED5E",
+"G. c #8EEA5D",
+"H. c #92E96A",
+"J. c #97E775",
+"K. c #98F162",
+"L. c #A2FF5B",
+"P. c #BFE37C",
+"I. c #A3F668",
+"U. c #E7DA5D",
+"Y. c #FFE161",
+"T. c #FFEF7F",
+"R. c #8B8B8B",
+"E. c gray52",
+"W. c gray62",
+"Q. c #938D95",
+"!. c #9780A1",
+"~. c #9F9BA0",
+"^. c #88A986",
+"/. c #8EB08E",
+"(. c #96BA8C",
+"). c #9BBD9B",
+"_. c #A2A2A2",
+"`. c #A7AAA6",
+"'. c #B2BFAD",
+"]. c #B2B2B2",
+"[. c #BCBCBD",
+"{. c #B7B4B9",
+"}. c #A7BFA3",
+"|. c #829FC8",
+" X c #81B2DE",
+".X c #9FACC2",
+"XX c #84B5E0",
+"oX c #A3ABC0",
+"OX c #A4BADE",
+"+X c #A4B9E0",
+"@X c #9EC09E",
+"#X c #94DD88",
+"$X c #83D283",
+"%X c #9DE688",
+"&X c #A1DB8A",
+"*X c #A3D097",
+"=X c #A7C9A3",
+"-X c #BCC0BC",
+";X c #A5EB88",
+":X c #ABE895",
+">X c #AAF68A",
+",X c #B1EB98",
+"<X c #BBF797",
+"1X c #BCF1A4",
+"2X c #B8EDA6",
+"3X c #BCC9DF",
+"4X c #B9C3C1",
+"5X c #ACC1E3",
+"6X c #FEB18C",
+"7X c #FEB596",
+"8X c #C0BCC0",
+"9X c #C2D7BC",
+"0X c #C6E388",
+"qX c #C9EB9D",
+"wX c #C7F9A7",
+"eX c #C8F7B3",
+"rX c #D6ECA5",
+"tX c #D4F6A9",
+"yX c #D2F8BA",
+"uX c #D0E5B6",
+"iX c #E3CD96",
+"pX c #E5D29D",
+"aX c #E5DFA0",
+"sX c #F3CFB0",
+"dX c #E8DEB8",
+"fX c #FFF391",
+"gX c #FFF39E",
+"hX c #FFFFA7",
+"jX c #E4EFB3",
+"kX c #C3C3C3",
+"lX c #CBCBCB",
+"zX c #C7CBC7",
+"xX c #CBCED0",
+"cX c #D3D2D3",
+"vX c #DBDBDB",
+"bX c #D8D4D7",
+"nX c #D2D6D2",
+"mX c #DFDFE1",
+"MX c #D3F8C0",
+"NX c #C8F2C3",
+"BX c #E2DBD3",
+"VX c #E5E1DC",
+"CX c #E7FEC2",
+"ZX c #F2E9DF",
+"AX c #E2E2E3",
+"SX c #E2E5EA",
+"DX c #E5E9EC",
+"FX c #EAEAEB",
+"GX c #EBE9E6",
+"HX c #EBEEF1",
+"JX c #EDF1F6",
+"KX c #F0E6F1",
+"LX c #F4F3F3",
+"PX c #FEFEFE",
+"IX c #F8F7F5",
+"UX c #F3EFEA",
+"YX c None",
+/* pixels */
+"$ 5 _._._._._._._._._._._._._._._._._._._._._._._.E.$ YXYXYXYXYX",
+"4 FXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPXPX`.. YXYXYXYX",
+"].PXPXLXLXJXLXLXLXLXLXLXLXLXLXLXLXLXLXLXLXLXLXUXPXPXFX& YXYXYXYX",
+"[.PXAXN V s.s.d.j.j.k. XXXXXXXk.k.j.d.s.s.w.<.s 3XPXFX* YXYXYXYX",
+"[.PXAXu j >.7.t.i.a.x.c.v.v.v.c.z.a.y.t.>.>.b e OXPXFX& YXYXYXYX",
+"[.PXAXs b >.7.0.y.u.a.x.x.x.x.z.p.y.t.8.>.v b f 5XPXFX& YXYXYXYX",
+"-XPXAXM j v 5.7.0.r.u.p.p.p.l.u.y.t.8.7.>.x k f OXUXvX* YXYXYXYX",
+"kXPXSXs j c v >.6.8.0.r.y.r.r.r.8.7.>.v b k f e OXGXAX& YX6 R.$ ",
+"kXPXDXu r z z x Z 5.6.e.e.6.6.6.d.f.f.f.<.<.<.n .XzX8X4 , ].LX* ",
+"kXPXDXu 8 r j z x v v 5.5.5.5.Z cXZXVXVXVXBXBXBXbXcXbXGXKXIXLX& ",
+"zXPXFXu 8 8 w p j z z x x x x x f.|.d.2.3.B B B ].oX8X5 1 1 1 + ",
+"zXPXFXu 8 0 q w p p h h j j j h y > ^ W ; G G G _ ' #.P : : X   ",
+"lXPXHXs 9 w r r p p g h a h h g t { hXCXeXrXaXtXwXwXwXtXCXL.# YX",
+"lXPXLXs q r p g h j z z z z z j p m.hXjX1XdXsXjXyXyXyXwXwXI.# YX",
+"lXPXHXm e p g j z x x x Z Z x v h M.gXrX2X;X%XyXyXMX<XtXrXK.# YX",
+"cXPXLXM d j k c x 5.5.6.9.9.6.5.l M.fXrX:X,X1X1XH.wX>XaX7XK.# YX",
+"cXPXFXA d j z x 5.6.8.8.0.0.0.8.c M.fXqX%X*X2X;XH.wX>XpX7XK.# YX",
+"cXPXJXw.j Z 6.8.r.r.p.l.l.l.l.g.q.{ Y.aXeX'.{.9X,X,XH.iX6XG.# YX",
+"cXPXIXJXJXFXHXHXFXHXDXDXDXDXSXSXxXB.fXP.#Xn.Q.*XJ.J.;XqX0XG.# YX",
+"W.PXPXPXPXIXLXLXFXFXGXSXBXVXvXvXzXD.gXC.X.$.&XS.,XH.H.&X9X&X# YX",
+"+ `.AXvXvXvXbXcXvXvXbXnXcXcXcXcX-XN.U.0XO.=.&XS.A.%.J.V.!.(.# YX",
+"YX  + $ + + + * _.xXzXzXkXkXkX[.-X^.! ] h.h.#XA.Z.Z.:X[ ` ' # YX",
+"YXYXYXYXYX& R.bXvXbXUXGXFXDXDXDXFXFX/.] 1.,.S.$.$.Z.Z...o. .# YX",
+"YXYXYXYX% vXPXPXPXAXAXLXIXIXIXLXAXbX).] R T =.@.$.$.$.....| # YX",
+"YXYXYXYX5 PXPXIXLXLXAXvXvXAXvXnXlXbX/.( E E }.*X#.(.=X..| Q @ YX",
+"YXYXYXYX* AXIXLXUXFXFXDXSXBXmXBXAXLX@X( E U b.-X' 7 ~.$.%.Q @ YX",
+"YXYXYXYX  < {.AXFXFXFXDXDXFXDXGXFXLX).( E ; 2 _./ , 5 #.S.+.@ YX",
+"YXYXYXYXYX  O 2 R.].kXlXbXbXbXnXlX8X} ( E - < ^./ = 3 Y +.#.@ YX",
+"YXYXYXYXYXYXYX    . % * , , , , & + o ( E D -.$XE H J J #.O.# YX",
+"YXYXYXYXYXYXYXYXYXYXYX            YXX ) $X&.*.*.=.=.=.=.#XX.# YX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXo F S S S S S S L L Y K # YX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  X o o o o o o o o o o   YX"
+};
--- kdebase-3.5.7.orig/debian/icons/kmenuedit.xpm
+++ kdebase-3.5.7/debian/icons/kmenuedit.xpm
@@ -0,0 +1,293 @@
+/* XPM */
+static char *kmenuedit[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 255 2",
+"   c #000030",
+".  c #4D4D4D",
+"X  c #545453",
+"o  c #595651",
+"O  c #595855",
+"+  c #5A5A59",
+"@  c #686866",
+"#  c #6C6C6A",
+"$  c #70706E",
+"%  c #737372",
+"&  c #787876",
+"*  c #7B7B79",
+"=  c #737FA4",
+"-  c #476EE5",
+";  c #4C72EC",
+":  c #5478E7",
+">  c #5178EA",
+",  c #627CC6",
+"<  c #7BA4FF",
+"1  c #B83C00",
+"2  c #B74000",
+"3  c #B84000",
+"4  c #A0684C",
+"5  c #A67057",
+"6  c #AF7558",
+"7  c #BD7C58",
+"8  c #A47C6B",
+"9  c #C14B03",
+"0  c #C04F10",
+"q  c #C45109",
+"w  c #DB6D15",
+"e  c #DE7117",
+"r  c #C06F3A",
+"t  c #CB763A",
+"y  c #D87226",
+"u  c #E27A23",
+"i  c #C77548",
+"p  c #D07941",
+"a  c #A18275",
+"s  c #B18F61",
+"d  c #B08B76",
+"f  c #B79D7C",
+"g  c #BE9177",
+"h  c #B8A179",
+"j  c #DDA739",
+"k  c #EC8E00",
+"l  c #E9961B",
+"z  c #F5891F",
+"x  c #E68732",
+"c  c #FB942B",
+"v  c #FF9C2F",
+"b  c #F89632",
+"n  c #FFA11F",
+"m  c #FFBC02",
+"M  c #FFB112",
+"N  c #FFB71F",
+"B  c #E8B236",
+"V  c #EEBC3B",
+"C  c #FFA126",
+"Z  c #FFA032",
+"A  c #FFAD34",
+"S  c #FFBF2F",
+"D  c #F1B631",
+"F  c #FFB934",
+"G  c #D3814A",
+"H  c #D68A59",
+"J  c #D88959",
+"K  c #C09F6A",
+"L  c #CDAB5E",
+"P  c #DBB268",
+"I  c #E18D50",
+"U  c #E99241",
+"Y  c #EDA052",
+"T  c #FDA646",
+"R  c #FFAA42",
+"E  c #FFB543",
+"W  c #FFB455",
+"Q  c #FEB25B",
+"!  c #FFBF56",
+"~  c #E5A461",
+"^  c #EEAB62",
+"/  c #EBBD66",
+"(  c #FDBC6A",
+")  c #F6C700",
+"_  c #FFC500",
+"`  c #FFC10F",
+"'  c #FFC908",
+"]  c #F4C61C",
+"[  c #F4C916",
+"{  c #FFC112",
+"}  c #FFC419",
+"|  c #FFCE17",
+" . c #F8D001",
+".. c #FFDD01",
+"X. c #FFC621",
+"o. c #FFC824",
+"O. c #FFC92B",
+"+. c #F4C431",
+"@. c #F3C33E",
+"#. c #FFCB35",
+"$. c #FFCF3D",
+"%. c #F7D029",
+"&. c #FFD62A",
+"*. c #FFDD20",
+"=. c #FFDB3F",
+"-. c #FFE106",
+";. c #FEEC01",
+":. c #FFE41C",
+">. c #FDE919",
+",. c #FFF001",
+"<. c #FFF00D",
+"1. c #FEEA31",
+"2. c #FFF428",
+"3. c #FFC741",
+"4. c #F1C456",
+"5. c #FFCE53",
+"6. c #FFD144",
+"7. c #FFD349",
+"8. c #FFD553",
+"9. c #FFD85B",
+"0. c #FFC166",
+"q. c #FFC964",
+"w. c #FEC379",
+"e. c #FFC877",
+"r. c #FFD563",
+"t. c #FAD56B",
+"y. c #FFD962",
+"u. c #FFDD6C",
+"i. c #FFD174",
+"p. c #FFDC75",
+"a. c #FDE845",
+"s. c #FFEC4B",
+"d. c #FDE255",
+"f. c #FFF642",
+"g. c #FFF65C",
+"h. c #FDE569",
+"j. c #FFE17B",
+"k. c #FFF365",
+"l. c #FFF57D",
+"z. c #FFF976",
+"x. c #8E8C84",
+"c. c #8A8B8C",
+"v. c #938E8F",
+"b. c #9E8C84",
+"n. c #988E91",
+"m. c #92908E",
+"M. c #9B968E",
+"N. c #949494",
+"B. c #9A9792",
+"V. c #9A9994",
+"C. c #9B9A9C",
+"Z. c #8493A7",
+"A. c #8492A8",
+"S. c #8D99A9",
+"D. c #9D9EA2",
+"F. c #A19E99",
+"G. c #A0A09E",
+"H. c #BCA298",
+"J. c #A4A3A1",
+"K. c #A8A8A6",
+"L. c #ACABAA",
+"P. c #ABABB0",
+"I. c #B1B1AF",
+"U. c #B2B1B3",
+"Y. c #BAB5B7",
+"T. c #BCBBBC",
+"R. c #849ED9",
+"E. c #8AAAD7",
+"W. c #93B0DA",
+"Q. c #9DB1D4",
+"!. c #84ABFF",
+"~. c #86B8FF",
+"^. c #8CB7FF",
+"/. c #8CBBFF",
+"(. c #AAB5C4",
+"). c #AFB9C6",
+"_. c #B3BEC6",
+"`. c #BCBCC0",
+"'. c #8DC0FF",
+"]. c #93C1FF",
+"[. c #9AC5FF",
+"{. c #9CC9FF",
+"}. c #B9C1C5",
+"|. c #A9CFFF",
+" X c #ACD6FF",
+".X c #B6C8E1",
+"XX c #BBCBE3",
+"oX c #BFD0E3",
+"OX c #C3A680",
+"+X c #CEB29D",
+"@X c #D1A48A",
+"#X c #D9BB8C",
+"$X c #D9B190",
+"%X c #D8BD96",
+"&X c #C5B7B9",
+"*X c #C0C0BE",
+"=X c #D5C8B3",
+"-X c #F3CA81",
+";X c #F7CC8B",
+":X c #FFCC81",
+">X c #F6CF9D",
+",X c #FFD58C",
+"<X c #FFDB87",
+"1X c #FFDF96",
+"2X c #F4D0A3",
+"3X c #FEDFAD",
+"4X c #F3D7BD",
+"5X c #FFE283",
+"6X c #FFE488",
+"7X c #FFEB80",
+"8X c #FFE09A",
+"9X c #FFF98D",
+"0X c #FFFA9B",
+"qX c #FFEEBE",
+"wX c #C3C3C2",
+"eX c #C6C6CA",
+"rX c #C8C6C6",
+"tX c #CECECD",
+"yX c #CECED0",
+"uX c #CFD0D2",
+"iX c #D2CFCB",
+"pX c #D0D0CE",
+"aX c #D2D2D1",
+"sX c #D3D3D8",
+"dX c #D8D8D6",
+"fX c #DAD9D9",
+"gX c #C4D0F2",
+"hX c #DFDFE0",
+"jX c #D2DCF3",
+"kX c #D1DEF8",
+"lX c #D4E3F7",
+"zX c #D7E4F8",
+"xX c #E0DDD6",
+"cX c #E0DEDB",
+"vX c #FBDDC1",
+"bX c #E2E0DC",
+"nX c #FEE6D0",
+"mX c #FFEED0",
+"MX c #FFF6C0",
+"NX c #FFF4D6",
+"BX c #FFFFD7",
+"VX c #E2E1E2",
+"CX c #E4E6EC",
+"ZX c #ECECEC",
+"AX c #EFEFF0",
+"SX c #EFF2F6",
+"DX c #F0EEEB",
+"FX c #FFF7E6",
+"GX c #FFF6EA",
+"HX c #FFF9EA",
+"JX c #F3F3F4",
+"KX c #F5F6F8",
+"LX c #FFFAF5",
+"PX c #FEFEFE",
+"IX c None",
+/* pixels */
+"IXIXIXIXIX1 0 p ~ l k IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX",
+"IXIXIXIX3 H 4XLXBX%.h G.K.K.K.K.K.K.K.K.K.K.K.K.C.+ . IXIXIXIXIX",
+"IXIXIX1 G HXNX1X*.,.D KXJXKXKXKXKXJXKXKXJXKXKXKXfXX . IXIXIXIXIX",
+"IXIXIX1 y Q F m _ ,. .#XpXpXpXpXaXpXpXpXiXaXuXdX*XO . IXIXIXIXIX",
+"IXIXIXIX9 z n m m ..;.B pXaXaXtXaXaXaXaXaXaXdXdXwXX IXIXIXIXIXIX",
+"IXIXIXIX3 w v M _ ' ,.) h G.J.J.G.G.F.J.J.K.F.C.N.O # $ # # & + ",
+"IXIXIXIXIX9 c v m M -.;.j _.).)._._.).)._.c.Y.*X*XwXwXwXwXwXL.O ",
+"IXIXIXIXIX3 e Z S } | <.[ `.|.|. X|.|.|. XS.LXSXDXSXSXAXAXJXyXX ",
+"IXIXIXIXIXIXq b A X.o.:.>.L /./././././.'.Z.DXaXpXaXaXaXaXsX*XX ",
+"IXIXIXIXIXIX3 u R S O.&.2.] Q.^.^.^.^.^./.Z.DXaXpXpXtXpXpXdXT.X ",
+"IXIXIXIXIXIXIXq T E #.#.1.1.s ; ; ; ; ; ; = fXm.V.V.V.V.V.V.m.+ ",
+"IXIXIXIXIXIXIX3 x W 3.$.=.f.+.dXjXjXjXjXkXC.CX.XXXXXXXXXXXoX).X ",
+"IXIXIXIXIXIXIXIXr Q 4.7.7.s.a./ cXcXfXfXcXF.zX].[.[.[.[.[.{.W.o ",
+"IXIXIXIXIXIXIXIXd x 0.5.8.9.g.@.=XiXuXaXdXV.lX~./.'./.'./.'.E.o ",
+"  IXIXIXIXIXIXIXL.G 0.q.8.9.k.d.P wXwXwXrXV.kX< !.!.!.!.!.!.R.o ",
+"      IXIXIXIXIXU.g Y e.y.y.h.z.V M.N.N.V.x.gX- : : : : : : , O ",
+"          IXIXIXL.KXp :Xi.u.h.l.h.-XSXDXSXD.JXSXSXSXJXSXSXSXaXX ",
+"              IXL.SX@X^ ,Xp.p.j.9X4.iXaXfXV.AXfXdXfXfXfXdXhXwXX ",
+"                J.ZXeXI ,X<Xj.7X0Xt.%XuXdXV.ZXdXaXaXpXaXaXfX*XX ",
+"                C.eXT.8 w.1X<X6XMX>XK U.Y.c.ZXT.T.}.*X*X*XeXU.X ",
+"                J.P.N.v.t 3XMXnXHX>Xf J.J.V.$ @ @ % % % % $ % O ",
+"                C.CXCXCX&XJ nXGXFX2X4XKXKXKXN.V.c.. . . . . . . ",
+"IX              C.sXT.`.eXU.i vXHX$X+XaXaXaXfXVXeXX IXIXIXIXIXIX",
+"IXIXIX          C.sX`.`.`.wXY.7 H.a +XaXaXaXaXdXwXO . IXIXIXIXIX",
+"IXIXIXIXIXIX    D.T.N.C.C.N.C.C.4 6 b.K.K.K.K.L.J.+ . IXIXIXIXIX",
+"IXIXIXIXIXIXIXIXL.tXL.L.P.P.L.P.I.5 m.*X*X&XT.T.K.+ . IXIXIXIXIX",
+"IXIXIXIXIXIXIXIXK.PXJXKXSXJXJXJXJXJXJXJXJXJXSXKXaXX . IXIXIXIXIX",
+"IXIXIXIXIXIXIXIXL.JXpXpXyXyXpXaXpXpXpXpXpXpXtXdXwXX . IXIXIXIXIX",
+"IXIXIXIXIXIXIXIXP.JXuXpXaXyXyXyXpXpXaXpXaXtXaXdX*X+ . IXIXIXIXIX",
+"IXIXIXIXIXIXIXIXG.Y.G.J.J.J.J.J.J.J.J.J.J.J.J.J.C.+ . IXIXIXIXIX",
+"IXIXIXIXIXIXIXIX$ X + + + + + + + + + O + + + + + X . IXIXIXIXIX",
+"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX"
+};
--- kdebase-3.5.7.orig/debian/icons/konqueror-16.xpm
+++ kdebase-3.5.7/debian/icons/konqueror-16.xpm
@@ -0,0 +1,175 @@
+/* XPM */
+static char *konqueror-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 153 2",
+"   c black",
+".  c #000001",
+"X  c #000002",
+"o  c #020101",
+"O  c #030207",
+"+  c #04040C",
+"@  c #07070C",
+"#  c #080607",
+"$  c #090A10",
+"%  c #0C0C12",
+"&  c #0F0F14",
+"*  c #18181C",
+"=  c #000321",
+"-  c #1B1B22",
+";  c #1C1C26",
+":  c #313139",
+">  c #33333E",
+",  c #00215E",
+"<  c #102446",
+"1  c #153154",
+"2  c #153F71",
+"3  c #373743",
+"4  c #3D3D4B",
+"5  c #434349",
+"6  c #4E494E",
+"7  c #494954",
+"8  c #4E4C5B",
+"9  c #52525A",
+"0  c #53515D",
+"q  c #555564",
+"w  c #505B77",
+"e  c #5E5E71",
+"r  c #6C6C75",
+"t  c #6C687C",
+"y  c #0027C7",
+"u  c #0034C8",
+"i  c #003ACA",
+"p  c #003ECC",
+"a  c #225495",
+"s  c #0042CF",
+"d  c #0656D7",
+"f  c #0D50D0",
+"g  c #115AD5",
+"h  c #0059E7",
+"j  c #1F66D9",
+"k  c #1E67DB",
+"l  c #1E6EDD",
+"z  c #1D73E5",
+"x  c #256EDD",
+"c  c #266FDD",
+"v  c #2770DD",
+"b  c #3A74DE",
+"n  c #2873EB",
+"m  c #496697",
+"M  c #536E98",
+"N  c #597DAD",
+"B  c #717182",
+"V  c #747181",
+"C  c #77778E",
+"Z  c #4A7FD8",
+"A  c #2D80E3",
+"S  c #3088F6",
+"D  c #7F8397",
+"F  c #6789BA",
+"G  c #6C85B1",
+"H  c #488EE7",
+"J  c #5D93E2",
+"K  c #5F9DE9",
+"L  c #5F9EEE",
+"P  c #7586C7",
+"I  c #63A0EA",
+"U  c #65A1EB",
+"Y  c #66A3EC",
+"T  c #65A7EF",
+"R  c #64A0F4",
+"E  c #64A8F0",
+"W  c #67B0F4",
+"Q  c #6CB1F4",
+"!  c #71AAEF",
+"~  c #7AA1E5",
+"^  c #8E8A91",
+"/  c #9090A4",
+"(  c #9795A6",
+")  c #9398B0",
+"_  c #A0A0AA",
+"`  c #A2A2B1",
+"'  c #A2A4B1",
+"]  c #B0ADB9",
+"[  c #8698CE",
+"{  c #8999CA",
+"}  c #8FBAF5",
+"|  c #97B8E7",
+" . c #9DBAE9",
+".. c #A7B4D1",
+"X. c #B4B3C3",
+"o. c #B7B7C1",
+"O. c #B7B5C8",
+"+. c #B9B7C2",
+"@. c #B7BAD1",
+"#. c #A4BFF2",
+"$. c #8CC1F6",
+"%. c #8FC9FA",
+"&. c #97C6F6",
+"*. c #97C7F7",
+"=. c #97D0FF",
+"-. c #99D7FF",
+";. c #99D8FF",
+":. c #A1CCF6",
+">. c #A4CEF7",
+",. c #A4D0F9",
+"<. c #A6DDFF",
+"1. c #A7DCFF",
+"2. c #AADCFF",
+"3. c #B9CFF7",
+"4. c #BAD1EB",
+"5. c #BCD5EC",
+"6. c #B5D7FA",
+"7. c #B7D7FC",
+"8. c #B7D8FD",
+"9. c #ACE2FF",
+"0. c #C6C6D5",
+"q. c #D3D0D8",
+"w. c #DBDBE5",
+"e. c #DCDBE3",
+"r. c #DEDEEA",
+"t. c #D3DEF4",
+"y. c #C1EEFF",
+"u. c #CCE2F6",
+"i. c #CAE3FF",
+"p. c #C8E7FF",
+"a. c #C0F4FF",
+"s. c #C8FAFF",
+"d. c #CCF9FF",
+"f. c #CCFAFF",
+"g. c #D8F6FF",
+"h. c #DDFDFF",
+"j. c #E4E2E7",
+"k. c #E2E2EA",
+"l. c #E4E4EC",
+"z. c #E5E5EF",
+"x. c #E3FFFF",
+"c. c #E5FFFF",
+"v. c #E7FFFF",
+"b. c #EBFFFF",
+"n. c #ECFFFF",
+"m. c #EEFFFF",
+"M. c #F6EEF0",
+"N. c #F7F5F9",
+"B. c #F6F6FF",
+"V. c #F4FFFF",
+"C. c #F9F7FD",
+"Z. c gray100",
+"A. c None",
+/* pixels */
+"A.5 9 & A.A.A.A.A.A.A.A.A.A.A.A.",
+"A.* l.l.7   # A.  A.A.A.A.A.A.A.",
+"A.  _ Z.N.@.G m F M <   A.A.A.A.",
+"A.A.% q.t.} p.m.V.m.g.N   A.A.A.",
+"A.A.A.' L &.6.7.>.:.,.2.a   A.A.",
+"  @ 6 | A &.*.! K U I Y z = A.A.",
+"o.k.M.J d T %.H c c v k h , A.A.",
+"r.Z.Z.Z y p Q ;.E s i l S 2 A.A.",
+"& > ^ ~ u g ;.a.9.f k E n 1   A.",
+"A.A.  ..b 1.s.d.d.$.1.=.R w   A.",
+"A.A.  ]  .y.c.c.c.b.x.d.5.t   A.",
+"A.  r C.e.u.7.#.3.i.h.4.O.0.; A.",
+"A.  w.Z.( 0 ) [ P { D 8 X.B.C   ",
+"A.  : q   A.O +.j.V   A.$ e / - ",
+"A.A.A.A.A.A.  ` Z.4 A.A.A.      ",
+"A.A.A.A.A.A.A.3 B @ A.A.A.A.A.A."
+};
--- kdebase-3.5.7.orig/debian/icons/kdeprint.xpm
+++ kdebase-3.5.7/debian/icons/kdeprint.xpm
@@ -0,0 +1,168 @@
+/* XPM */
+static char *kdeprint[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 130 2",
+"   c black",
+".  c gray5",
+"X  c #131313",
+"o  c #2F2F2F",
+"O  c #343434",
+"+  c #3B3B3B",
+"@  c #3F3F49",
+"#  c #434343",
+"$  c #4A4A4A",
+"%  c #525252",
+"&  c #5B5B5C",
+"*  c #5D5D60",
+"=  c #5D5D6B",
+"-  c #616162",
+";  c #6D6D72",
+":  c #767676",
+">  c #7C7C7E",
+",  c #036DFA",
+"<  c #0A6EF3",
+"1  c #007CFF",
+"2  c #1370ED",
+"3  c #1C73E8",
+"4  c #2075E6",
+"5  c #2B79E1",
+"6  c #757587",
+"7  c #7D7D86",
+"8  c #7B7B8E",
+"9  c #0186F5",
+"0  c #008EFF",
+"q  c #198AE3",
+"w  c #1687FF",
+"e  c #1698FF",
+"r  c #14A0FE",
+"t  c #3B81DF",
+"y  c #3FB2FE",
+"u  c #678EB5",
+"i  c #7587A0",
+"p  c #428BCB",
+"a  c #4285DF",
+"s  c #4E8DD6",
+"d  c #538FE0",
+"f  c #5B94E1",
+"g  c #4BB5FD",
+"h  c #6C9AC7",
+"j  c #6EA0E3",
+"k  c #60B9FF",
+"l  c #76A4E3",
+"z  c #6BC3FD",
+"x  c #7CC0F4",
+"c  c #838388",
+"v  c #8A8A8F",
+"b  c #838392",
+"n  c #86869B",
+"m  c #8F8F91",
+"M  c #949497",
+"N  c #93939A",
+"B  c #99999C",
+"V  c #8C8CA1",
+"C  c #8A98A7",
+"Z  c #9494A3",
+"A  c #9595AB",
+"S  c #9A9AA6",
+"D  c #9D9DAA",
+"F  c #9B9BB0",
+"G  c #80A4A0",
+"H  c #91B8AD",
+"J  c #A5A5AC",
+"K  c #A9A9AB",
+"L  c #A6A6B0",
+"P  c #A8A8B2",
+"I  c #ADADB8",
+"U  c #A7B2BF",
+"Y  c #B3B3BC",
+"T  c #BEBEBF",
+"R  c #87A5C7",
+"E  c #85B6E2",
+"W  c #A2B3C9",
+"Q  c #B2B2C4",
+"!  c #B5B5C8",
+"~  c #B4BDC7",
+"^  c #BCBCC5",
+"/  c #BCBCCC",
+"(  c #86CCFB",
+")  c #8ACEFC",
+"_  c #94D3FD",
+"`  c #B7C5C9",
+"'  c #AAC2E3",
+"]  c #A4D9FC",
+"[  c #B7CDE9",
+"{  c #BACFE9",
+"}  c #BDD1EB",
+"|  c #B2DEFC",
+" . c #B6E0FD",
+".. c #C3C3C3",
+"X. c #C4C4CE",
+"o. c #CACACC",
+"O. c #C4C4D2",
+"+. c #CACAD5",
+"@. c #CDCDD9",
+"#. c #D0D0D6",
+"$. c #D3D3DC",
+"%. c #DBDBDC",
+"&. c #C5D2E7",
+"*. c #C3D4EB",
+"=. c #C7D9EE",
+"-. c #CCD4E4",
+";. c #CBDAEE",
+":. c #D6D6E1",
+">. c #DBDBE3",
+",. c #DDDFE8",
+"<. c #D1DEF0",
+"1. c #CBE6FA",
+"2. c #CFE8FA",
+"3. c #DEE4ED",
+"4. c #D3E0F0",
+"5. c #D3EAFA",
+"6. c #DAE5F3",
+"7. c #DBEEFB",
+"8. c #E0E0E4",
+"9. c #E3E3EA",
+"0. c #E9E9EE",
+"q. c #E3EAF3",
+"w. c #ECECF1",
+"e. c #EAF1F7",
+"r. c #EDF3F8",
+"t. c #F1F2F5",
+"y. c #F3F5F9",
+"u. c #F5F8FB",
+"i. c #FDFDFE",
+"p. c None",
+/* pixels */
+"p.p.p.p.p.p.p.p.F Q / / / / / / / / / / / / D   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.A 9.i.i.i.i.i.i.i.i.i.i.i.i./   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.A 9.i.i.i.i.i.i.i.i.i.u.y.i./   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.Z ,.i.i.i.i.i.i.i.i.u.u.y.i.^   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.n 8.i.i.i.i.i.i.u.u.y.y.r.i.!   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.n ,.i.i.i.i.i.u.u.u.y.r.e.u.Y   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.8 ,.i.i.i.i.i.u.u.y.r.r.e.u.Y   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.8 %.i.i.i.i.u.u.y.r.r.e.q.u.I   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.p.6 %.i.i.i.u.u.u.r.r.e.q.q.y.P   p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.p.p.$ * $.i.u.u.u.r.r.r.e.q.q.3.y.L + p.p.p.p.p.p.p.p.",
+"p.p.p.p.p.$ $ $ v $.i.u.u.r.r.e.e.q.q.3.3.w.P : # $ $ p.p.p.p.p.",
+"p.p.$ $ > Y +.:.M $.u.y.y.r.r.e.q.q.3.3.,.y.D o.$.O.J ; # $ p.p.",
+"p.$ J ,.,.9.,.9.v #.y.q.6.4.=.} { } &.-.-.w.D ..9.,.3.3.%.> o p.",
+"$ ; 9.,.9.9.9.0.i [ } *.;.4.6.6.6.3.<.=.*.} ' K $.#.$.%.:.:.#   ",
+"$ #.0.0.9.9.0.0.R 7.7.7.7.7.7.7.7.5.5.5.1.1.1.C @.@.` H @.@.c X ",
+"$ 0.0.0.0.0.0.%.E  . . . . .] _ ( ( ( ( ( ( ( u >.:.` i :.$.^ O ",
+"$ w.w.w.w.0.8.o.x _ _ ) z g g g g g g g g g g p 9.>.%.%.:.:.#.O ",
+"* w.w.w.0.8.>.U z z y e r r r e e r r r e e r q %.3.3.>.>.,.>.+ ",
+"* 0.t.0.9.9.,.h z e 0 0 0 0 0 0 0 0 0 0 0 0 0 9 #.8.9.9.0.9.o.# ",
+"& Q / >.w.w.w.s w 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 W 0.0.0.@.! Z # ",
+"* Q Q Q Q / :.' j d t 5 3 2 < , , < 2 4 5 a f l -.+.! Q Q Q D @ ",
+"% ! ! ! ! Q Q ! ! ! ` +.@.@.:.,.>.%.@.+.@.` ! ! ! ! ! ! ! ! Z O ",
+"% Q / / / Q 7 7 7 7 7 7 7 7 c 7 7 7 7 7 7 7 7 7 8 b / / / / N O ",
+"% I O.O.O.L + + + + + @ + + + + + + + + + + + + + % O.O.O.O.m o ",
+"% L @.@.@.P $ % ..............................K $ * o.@.@.@.7 X ",
+"& b :.:.:.^ M K %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.c B #.:.:.$.&   ",
+"p.* >.9.9.9.@.9.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.O.,.9.9.9.Y #   ",
+"p.% M #.9.9./ i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.u.0./ 9.$.T ; . p.",
+"p.p.. # $ * +.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.t.t.i.Z $ # X     p.",
+"p.p.p.p.p.A t.i.i.i.i.i.i.i.i.i.i.i.i.i.u.t.t.w.t.X.@ p.p.p.p.p.",
+"p.p.p.p.p.Y i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.u.u.y.u.y.= p.p.p.p.p.",
+"p.p.p.p.F Q @.@.@.@.@.@.@.@.@.@.@.@.@.X.X./ ..^ Y Y ;   p.p.p.p."
+};
--- kdebase-3.5.7.orig/debian/icons/konsole.xpm
+++ kdebase-3.5.7/debian/icons/konsole.xpm
@@ -0,0 +1,92 @@
+/* XPM */
+static char *konsole[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 54 1",
+"  c #000000",
+". c #0B0B0B",
+"X c #141414",
+"o c #1C1C1C",
+"O c #232323",
+"+ c #2B2B2B",
+"@ c #343434",
+"# c #3A3B3B",
+"$ c #434343",
+"% c #494949",
+"& c #4E5151",
+"* c #535353",
+"= c #565A5A",
+"- c #595A5A",
+"; c #5E6262",
+": c #636363",
+"> c #6A6A6A",
+", c #6F7272",
+"< c #727272",
+"1 c #757E7E",
+"2 c #7C7C7C",
+"3 c #7F8686",
+"4 c #838383",
+"5 c #898989",
+"6 c #899595",
+"7 c #939494",
+"8 c #989898",
+"9 c #9BA6A6",
+"0 c #A3A3A3",
+"q c #A3AFAF",
+"w c #ACACAC",
+"e c #A6B0B0",
+"r c #A9B6B6",
+"t c #B2B2B2",
+"y c #B3BABA",
+"u c #BCBCBC",
+"i c #B7C2C2",
+"p c #BBC6C6",
+"a c #BECACA",
+"s c #C4C4C4",
+"d c #C0CECE",
+"f c #CBCBCB",
+"g c #C5D4D4",
+"h c #C9D8D8",
+"j c #D4D4D4",
+"k c #DADADA",
+"l c #E3E3E3",
+"z c #EBEBEB",
+"x c #E9F5F5",
+"c c #ECFAFA",
+"v c #F3F3F3",
+"b c #F2FFFF",
+"n c #FDFEFE",
+"m c None",
+/* pixels */
+"m$<42222242222242222222222222# m",
+"Ounnnnnnnnnnnnnnnnnnnnnnnnnnnj%m",
+"5nnnnnnnnnnnnnnnnnnnnnnnnnnnnny.",
+"0nnu8tsssssssssssssssssssu8tnnfX",
+"0nn:1y74455455555555555555$@vnsX",
+"0nn<pnxa712222222222222222<:vnsX",
+"0nn4>7pcbu>>>>>>>>>>>>>>>>><zvso",
+"0nn3%<exna*-====----=-----=>llsX",
+"wnn<qnba3*%%%%%%%%%%%%%$%%#%llsX",
+"wnn<69-@+@@++@@@#@#@@@@@#@.#llsX",
+"tnn<  oO++&====$+++++OO++. #lkso",
+"wnn<  .Xo+rhggh;o++OOooX.  #lkso",
+"tnn< ...XoO++++OOOoooX..   #lkso",
+"tnn< .XooooOOOO+OOOOoXXX.. #kjso",
+"ynn2 XXooO+++++++++OOOooX. #kkuo",
+"unn4.oOO+++@@@@##@@++OOoXX $kjso",
+"unn4XoO+@@###$$$####@++OoX.$kjso",
+"unn4X++@@#$$$%$%%$$##@@+Oo.%jjso",
+"unn5XO+@##$$%%%%%%%$#@@+Oo.$kfso",
+"unn8#$%=-::>><<>,>::--*&%$@:jssO",
+"snnvvzvzzzzzzlzllllkkkkjkjjjfssO",
+"wnnnvvvvvzzllllkkkkkkjjjfffssfuX",
+"Ojnnnnnnnzlllllkkkkjjjkjkjjjjj: ",
+"mo:<<<>>:0jssssusuuuu8>>>,,<,# m",
+"mm     o>0kkkjjjjjjju04@      mm",
+"mmmmm 4znvjlvvvvvvvlknnnwOmmmmmm",
+"mmmm 4nnnnvllznvvvkfjznnnu.mmmmm",
+"mmmmXunvnvzzlkjjjfsjklvnnlommmmm",
+"mmmm -lvvzzzzzzlllzzzzvvv5 mmmmm",
+"mmmmm $tkzzzzllzlzlzzzls<. mmmmm",
+"mmmmmm .%4wusjkkkjjuw7-o  mmmmmm",
+"mmmmmmmm  .o#%%%%%#+X   mmmmmmmm"
+};
--- kdebase-3.5.7.orig/debian/icons/kfind-16.xpm
+++ kdebase-3.5.7/debian/icons/kfind-16.xpm
@@ -0,0 +1,214 @@
+/* XPM */
+static char *kfind-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 192 2",
+"   c black",
+".  c #000104",
+"X  c #000204",
+"o  c #000205",
+"O  c #010204",
+"+  c #010205",
+"@  c #010305",
+"#  c #020305",
+"$  c #030405",
+"%  c #000308",
+"&  c #00040B",
+"*  c #050608",
+"=  c #07080A",
+"-  c #0B0C0E",
+";  c #0D0E0F",
+":  c #180E08",
+">  c #231606",
+",  c #2F2D42",
+"<  c #3A3C4D",
+"1  c #664920",
+"2  c #585577",
+"3  c #646B78",
+"4  c #656D79",
+"5  c #6D747E",
+"6  c #636181",
+"7  c #676484",
+"8  c #656F81",
+"9  c #6D6C8D",
+"0  c #626A96",
+"q  c #747B87",
+"w  c #7C7F98",
+"e  c #7880A3",
+"r  c #6F8AC3",
+"t  c #698CCE",
+"y  c #7C95C2",
+"u  c #9B5602",
+"i  c #AC7022",
+"p  c #9F8472",
+"a  c #A2836E",
+"s  c #C2873B",
+"d  c #D1903E",
+"f  c #CCA65A",
+"g  c #EABF5F",
+"h  c #F7C450",
+"j  c #FBC552",
+"k  c #FAC654",
+"l  c #FFD471",
+"z  c #8487A6",
+"x  c #8888A2",
+"c  c #9396AE",
+"v  c #9B9EB5",
+"b  c #9A9EB9",
+"n  c #93A1B9",
+"m  c #93A2BD",
+"M  c #9DA3B4",
+"N  c #9EA6B7",
+"B  c #98A6BD",
+"V  c #9CA9BF",
+"C  c #A5A7BC",
+"Z  c #9FABC0",
+"A  c #A0ADC2",
+"S  c #A1ADC2",
+"D  c #ABADC2",
+"F  c #A9ACC7",
+"G  c #A2B0C8",
+"H  c #AAB3CD",
+"J  c #ABB9D8",
+"K  c #B2B3C9",
+"L  c #B3B6CC",
+"P  c #B2BCCD",
+"I  c #B3BDCD",
+"U  c #B4BECD",
+"Y  c #ACBFE2",
+"T  c #9FCCFF",
+"R  c #B6C0CD",
+"E  c #B7C0CD",
+"W  c #B9C1CC",
+"Q  c #B6C2D2",
+"!  c #B5C4D7",
+"~  c #B3C1D8",
+"^  c #B8C3D8",
+"/  c #BAC3D9",
+"(  c #BCC8DF",
+")  c #BFCFDE",
+"_  c #A6C6E4",
+"`  c #A5CDFF",
+"'  c #A4D1FE",
+"]  c #AFD4FF",
+"[  c #B8C7E2",
+"{  c #B7D0EE",
+"}  c #B1D0F2",
+"|  c #B4DBFF",
+" . c #B5DAFF",
+".. c #BADAFF",
+"X. c #B2E0FF",
+"o. c #BFE1FF",
+"O. c #BFE3FF",
+"+. c #BDE4FC",
+"@. c #DFCEBB",
+"#. c #ECC882",
+"$. c #F3CD86",
+"%. c #FEE786",
+"&. c #FFEF90",
+"*. c #C7C6D4",
+"=. c #C1C6D8",
+"-. c #C8C6D1",
+";. c #CDCBD8",
+":. c #CECEDA",
+">. c #CECFDC",
+",. c #C3D0DF",
+"<. c #CED0DD",
+"1. c #C0CDE3",
+"2. c #C2CEE4",
+"3. c #C0CFE8",
+"4. c #C3D1E7",
+"5. c #C4D2E7",
+"6. c #C7D2E4",
+"7. c #C8D2E3",
+"8. c #CDD3E1",
+"9. c #CFD5E5",
+"0. c #C8D3E8",
+"q. c #C9DAE8",
+"w. c #CCD8EF",
+"e. c #C2DFFF",
+"r. c #CDDBF2",
+"t. c #D4D8E5",
+"y. c #D6D9E6",
+"u. c #D1DBEB",
+"i. c #D2DDEF",
+"p. c #D7DEE8",
+"a. c #D1DCF1",
+"s. c #CAE6FF",
+"d. c #C9EDFF",
+"f. c #CEE9FF",
+"g. c #D4E0EB",
+"h. c #DCE3EC",
+"j. c #D7E0F0",
+"k. c #D7E1F2",
+"l. c #D7E1F3",
+"z. c #D6E2F5",
+"x. c #D9E3F2",
+"c. c #DAE3F4",
+"v. c #DBE4F4",
+"b. c #DDE5F1",
+"n. c #DFE5F1",
+"m. c #DFE8F7",
+"M. c #DFE9FB",
+"N. c #D2F5FF",
+"B. c #D4F4FF",
+"V. c #D9F6FF",
+"C. c #DAF5FF",
+"Z. c #D8FBFF",
+"A. c #E6E4E5",
+"S. c #E2E2E8",
+"D. c #E5E8EF",
+"F. c #E0E7F2",
+"G. c #E0E7F3",
+"H. c #E1E8F2",
+"J. c #E2E8F2",
+"K. c #E4EAF3",
+"L. c #E1EAF9",
+"P. c #E2EBF8",
+"I. c #E1ECF9",
+"U. c #E4EDFC",
+"Y. c #E6EFFF",
+"T. c #EAEEF3",
+"R. c #E9EDF5",
+"E. c #ECEFF2",
+"W. c #E8EEF9",
+"Q. c #E2FCFF",
+"!. c #E3FCFF",
+"~. c #ECF0F7",
+"^. c #EDF4F7",
+"/. c #EEF5F7",
+"(. c #E9F1FF",
+"). c #EAF0FC",
+"_. c #EBF5FF",
+"`. c #E8FFFF",
+"'. c #ECFEFF",
+"]. c #EDFFFF",
+"[. c #F0F6FF",
+"{. c #F4FAFF",
+"}. c #F5FAFF",
+"|. c #F6FAFE",
+" X c #F8F6F7",
+".X c #F8FAFC",
+"XX c #F9FFFF",
+"oX c #FCFFFF",
+"OX c #FDFFFF",
+"+X c #FEFEFE",
+"@X c gray100",
+"#X c None",
+/* pixels */
+"#X#X2.u.n.J.J.n.n.n.a.4   #X#X#X",
+"#X#X1.n.@X@X@X@X@X_.l.P.5   #X#X",
+"#X#X1.n.@X@X@X@X@X|.l.~.XXq   #X",
+"#X#X5.n. X;.*.:.S.|.P.7.6.3.8   ",
+"#X#XH =.C ! g.h.8.<.W.n.( [ m * ",
+"#X#X9 z _ Z.`.'.!.q.<.i.0.w.n $ ",
+"#X#X7 y X.d.B.C.B.O./ 9.a.l.B # ",
+"#X#X6 t T  .O.O.| ` _ t.v.M.V # ",
+"#X#X2 r ] e.f.s...` J y.P.Y.C $ ",
+"#X#X, 0 } !.'.'.C.{ L K.U.(.Z $ ",
+"#X#X- w e ) /./.,.v F -.D._.Z $ ",
+"#X#X3 p.-.x c v D K p h #.(.G $ ",
+"#X#Xw.n.@X.XT.R.|.T.s h %.$.N & ",
+"#X#X5.H.@X@X@X@X@X@XA.d h &.f > ",
+"#X#X^ ! U U U I I I ~ M i h l 1 ",
+"#X#X#X= # # # # # # # & : u a < "
+};
--- kdebase-3.5.7.orig/debian/icons/kfm-16.xpm
+++ kdebase-3.5.7/debian/icons/kfm-16.xpm
@@ -0,0 +1,221 @@
+/* XPM */
+static char *kfm-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 199 2",
+"   c black",
+".  c #000072",
+"X  c #020475",
+"o  c #091683",
+"O  c #0A1985",
+"+  c #0B1A8E",
+"@  c #051690",
+"#  c #041994",
+"$  c #0A1B91",
+"%  c #161C83",
+"&  c #0C208A",
+"*  c #0D238D",
+"=  c #0F2E99",
+"-  c #0C2E9D",
+";  c #182389",
+":  c #102395",
+">  c #122F96",
+",  c #142B94",
+"<  c #152E97",
+"1  c #172C9A",
+"2  c #1C2E95",
+"3  c #133299",
+"4  c #16389E",
+"5  c #0B2AA2",
+"6  c #0E30AF",
+"7  c #1028A0",
+"8  c #173DA1",
+"9  c #1B39A8",
+"0  c #23399A",
+"q  c #1E4EAF",
+"w  c #1B4EB3",
+"e  c #194DB5",
+"r  c #1850BD",
+"t  c #1F58BC",
+"y  c #33469F",
+"u  c #3C459B",
+"i  c #2141A2",
+"p  c #2643AB",
+"a  c #2348B8",
+"s  c #2155B3",
+"d  c #235BB9",
+"f  c #375AB5",
+"g  c #325CB8",
+"h  c #2561BD",
+"j  c #3860BD",
+"k  c #1A5DCB",
+"l  c #2553C7",
+"z  c #2453C8",
+"x  c #2F5DD3",
+"c  c #2364C8",
+"v  c #2062D0",
+"b  c #2261D7",
+"n  c #2667D2",
+"m  c #2864D5",
+"M  c #2D67D4",
+"N  c #2670DA",
+"B  c #2870D2",
+"V  c #3262C0",
+"C  c #3267C2",
+"Z  c #326AD1",
+"A  c #376DD0",
+"S  c #3B70CE",
+"D  c #2D77E3",
+"F  c #347FE2",
+"G  c #3C7AE6",
+"H  c #3D7EFE",
+"J  c #575EA8",
+"K  c #5D75BB",
+"L  c #4071C5",
+"P  c #4371C5",
+"I  c #4179DD",
+"U  c #597DC4",
+"Y  c #437FE4",
+"T  c #3E8CED",
+"R  c #3788F3",
+"E  c #358CF9",
+"W  c #358DFB",
+"Q  c #3D80F1",
+"!  c #4A81D4",
+"~  c #5E8DCF",
+"^  c #4784E8",
+"/  c #4F87E9",
+"(  c #4886FE",
+")  c #4C8AFE",
+"_  c #4196FE",
+"`  c #4296FD",
+"'  c #499BFB",
+"]  c #4A9CFE",
+"[  c #4A9DFE",
+"{  c #4B9DFE",
+"}  c #5A91E7",
+"|  c #5592FE",
+" . c #5996FE",
+".. c #5D9AFE",
+"X. c #4EA0FE",
+"o. c #50A1FE",
+"O. c #51A2FE",
+"+. c #52A2FE",
+"@. c #56A3FE",
+"#. c #54A4FC",
+"$. c #55A4FE",
+"%. c #57A6FE",
+"&. c #5DAAFE",
+"*. c #5EABFE",
+"=. c #698FCD",
+"-. c #688DDF",
+";. c #7987C4",
+":. c #7A8BCC",
+">. c #728BD5",
+",. c #629EFE",
+"<. c #71A0DA",
+"1. c #65A1E2",
+"2. c #6CA7E3",
+"3. c #68A2ED",
+"4. c #67A3FE",
+"5. c #60ACFE",
+"6. c #61ADFE",
+"7. c #62ADFE",
+"8. c #6BA6FE",
+"9. c #68ADFD",
+"0. c #6DA9FE",
+"q. c #6EA9FE",
+"w. c #66B0FE",
+"e. c #69B2FE",
+"r. c #6AB3FE",
+"t. c #6CB5FE",
+"y. c #6EB6FE",
+"u. c #71A7EA",
+"i. c #7EA4E5",
+"p. c #76AAF3",
+"a. c #71AAFE",
+"s. c #72AEFE",
+"d. c #74AFFF",
+"f. c #77AEFE",
+"g. c #7BB1EB",
+"h. c #7CB3EC",
+"j. c #7FBBED",
+"k. c #71B4FF",
+"l. c #71B8FF",
+"z. c #72B9FF",
+"x. c #73BAFF",
+"c. c #74BAFF",
+"v. c #78B0FF",
+"b. c #78B3FF",
+"n. c #7AB4FF",
+"m. c #7BB6FF",
+"M. c #7CB7FB",
+"N. c #7DB7FF",
+"B. c #78BDFF",
+"V. c #7CC0FF",
+"C. c #7FC2FF",
+"Z. c #82A3DF",
+"A. c #86AFDF",
+"S. c #88A3D6",
+"D. c #8EA1D2",
+"F. c #90A7D8",
+"G. c #85BDEC",
+"H. c #89BFED",
+"J. c #80B8F2",
+"K. c #80BAFF",
+"L. c #86BFFF",
+"P. c #9AAEE0",
+"I. c #82C4FF",
+"U. c #84C6FF",
+"Y. c #85C6FF",
+"T. c #89C2FF",
+"R. c #88C4FF",
+"E. c #8BC4FF",
+"W. c #8CC5FF",
+"Q. c #8BCBFF",
+"!. c #9CC3EB",
+"~. c #93CBFF",
+"^. c #97CFFF",
+"/. c #9EC6F2",
+"(. c #94D1FF",
+"). c #96D1FF",
+"_. c #96D2FF",
+"`. c #98D3FF",
+"'. c #9AD1FF",
+"]. c #9FD6FF",
+"[. c #AAC5E9",
+"{. c #AAC4ED",
+"}. c #ABC7ED",
+"|. c #ABC8F5",
+" X c #A5DBFF",
+".X c #A6DAFF",
+"XX c #A7DDFF",
+"oX c #A8DEFF",
+"OX c #BDD3EE",
+"+X c #B3D3F3",
+"@X c #B6E3FE",
+"#X c #C1DDF6",
+"$X c #C3E9FF",
+"%X c #CEE1F5",
+"&X c #CAE3F8",
+"*X c #D2E2F4",
+"=X c #D6EBFA",
+"-X c gray100",
+";X c None",
+/* pixels */
+";X;X;X;X;X;X;Xq w k w 8 ;X;X;X;X",
+";X;X;X;X;Xq t N W _ W r 3 ;X;X;X",
+";X;X;Xd c Q ' +.X.X.[ _ v = * ;X",
+";Xh B T #.*.6.6.w.&.%.X.[ D - O ",
+";Xn 9.6.e.y.z.z.k.y.w.*.#.{ R 5 ",
+";Xb H s.B.C.Y.Y.I.C.c.e.#.Q x 6 ",
+";Xm ( ) f.).).`.(.Q.k.^ -.P.>.# ",
+";XM |  ...a..XXXY.} Z.}.i.G l @ ",
+";XZ ,.4.8.a.v.p.}.+Xg.C , I 9 7 ",
+";XA 0.f.b.M.M.3.#XG.2.P f ;.:.$ ",
+";XS n.K.L.T.E.2.*X=.U F.|./ z + ",
+";Xj M.W.~.^.'.g.S.[./.! < Y a : ",
+";X4 g j.]..XXXT.&Xj.1.P j p 1 . ",
+";X;X> 9 <.@X$X!.%XA.~ 0 2 . ;X;X",
+";X;X;X;X& K =XOXD.y ; . ;X;X;X;X",
+";X;X;X;X;Xo u J % X ;X;X;X;X;X;X"
+};
--- kdebase-3.5.7.orig/debian/icons/konsole-16.xpm
+++ kdebase-3.5.7/debian/icons/konsole-16.xpm
@@ -0,0 +1,170 @@
+/* XPM */
+static char *konsole-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 148 2",
+"   c black",
+".  c #010101",
+"X  c #050606",
+"o  c #090909",
+"O  c #0B0B0B",
+"+  c #0C0C0C",
+"@  c #0E0D0D",
+"#  c gray6",
+"$  c #111111",
+"%  c gray7",
+"&  c #131313",
+"*  c #161616",
+"=  c #181818",
+"-  c #191919",
+";  c gray10",
+":  c #1B1B1B",
+">  c #1D1D1D",
+",  c gray12",
+"<  c #202020",
+"1  c #222222",
+"2  c #232323",
+"3  c #242323",
+"4  c gray14",
+"5  c #252525",
+"6  c gray15",
+"7  c #272727",
+"8  c #282828",
+"9  c #2A2A2A",
+"0  c #2C2C2C",
+"q  c gray18",
+"w  c #2F2F2F",
+"e  c gray19",
+"r  c #313131",
+"t  c #323333",
+"y  c gray20",
+"u  c #333535",
+"i  c #343434",
+"p  c #383737",
+"a  c gray22",
+"s  c #393838",
+"d  c #393939",
+"f  c #3A3A3A",
+"g  c gray23",
+"h  c #3B3D3D",
+"j  c #3C3C3C",
+"k  c #3D3C3C",
+"l  c #3F3F3F",
+"z  c gray25",
+"x  c #414141",
+"c  c #464646",
+"v  c gray29",
+"b  c #4C4C4C",
+"n  c #515151",
+"m  c gray33",
+"M  c #555555",
+"N  c #555757",
+"B  c gray34",
+"V  c #5B5B5B",
+"C  c gray36",
+"Z  c #605F5F",
+"A  c #606060",
+"S  c gray38",
+"D  c #626262",
+"F  c #606565",
+"G  c #646464",
+"H  c gray40",
+"J  c #676767",
+"K  c #6A6A6A",
+"L  c gray42",
+"P  c #6F6F6F",
+"I  c gray44",
+"U  c gray45",
+"Y  c #717777",
+"T  c #747474",
+"R  c #7C7C7C",
+"E  c #7E7E7E",
+"W  c #818181",
+"Q  c #838383",
+"!  c #848484",
+"~  c #868686",
+"^  c gray53",
+"/  c #828888",
+"(  c #848C8C",
+")  c gray56",
+"_  c #8F9090",
+"`  c #8F9797",
+"'  c #909090",
+"]  c gray58",
+"[  c gray60",
+"{  c gray62",
+"}  c #97A1A1",
+"|  c gray64",
+" . c gray67",
+".. c gray68",
+"X. c #AFAFAF",
+"o. c #A7B1B1",
+"O. c #B6B6B6",
+"+. c #B7B7B7",
+"@. c #B5BDBD",
+"#. c gray73",
+"$. c #BBBBBB",
+"%. c gray74",
+"&. c gray76",
+"*. c gray77",
+"=. c #C5C5C5",
+"-. c #C6C6C6",
+";. c #C8C8C8",
+":. c #CBCBCB",
+">. c #CDCDCD",
+",. c #CECECE",
+"<. c #CBD8D8",
+"1. c #D0D0D0",
+"2. c gray82",
+"3. c #D2D2D2",
+"4. c gray83",
+"5. c gray84",
+"6. c #D7D7D7",
+"7. c #D8D8D8",
+"8. c gray85",
+"9. c #DADADA",
+"0. c gray86",
+"q. c #DDDDDD",
+"w. c gray87",
+"e. c #DFDFDF",
+"r. c #E1E1E1",
+"t. c #E2E2E2",
+"y. c #E3E2E2",
+"u. c gray89",
+"i. c #E4E3E3",
+"p. c #E4E4E4",
+"a. c gray90",
+"s. c #E6E6E6",
+"d. c #E7E7E7",
+"f. c gray91",
+"g. c #E9E9E9",
+"h. c #EAEAEA",
+"j. c gray92",
+"k. c #ECECEC",
+"l. c gray93",
+"z. c #EEEEEE",
+"x. c #E0F0F0",
+"c. c gray94",
+"v. c #F1F1F1",
+"b. c #F3F3F3",
+"n. c #F4F4F4",
+"m. c gray97",
+"M. c gray100",
+"N. c None",
+/* pixels */
+"M -.;.-.-.-.-.-.-.-.-.-.-.;.| * ",
+"1.n.9.y.p.g.g.g.g.g.g.g.y.5.M.L ",
+"i.#.o.@._ Q ! ! ! ! ! ! Q J m.T ",
+"p.%./ x.<.D Z D D D D D D I j.I ",
+"p.%.} ` M a a l x x l x a z y.P ",
+"j.+.X @ 3 Y ( F 7 8 1 < O 1 y.I ",
+"j.+.. O ; u h e 1 > * @ . 5 e.P ",
+"c.%.% > 7 9 q e e 0 7 > O 9 0.I ",
+"c.%.; 7 y g z z x a r 7 % q 9.P ",
+"c.-.a c M C D F D C n c u v 9.I ",
+"e.M.m.b.j.d.u.y.q.7.5.7.5.1.q.J ",
+"b ....{ +.0.7.1.,.,.#.] _ [ ^ > ",
+". . . J &.q.y.p.y.9.1.X.l . . N.",
+"N.N.V M.M.j.p.g.p.5.g.M.9.% N.N.",
+"N.N.> ..g.n.j.g.g.j.c.y.R . N.N.",
+"N.N.N.. a J ^ ' _ E M 1 . N.N.N."
+};
--- kdebase-3.5.7.orig/debian/icons/khelpcenter-16.xpm
+++ kdebase-3.5.7/debian/icons/khelpcenter-16.xpm
@@ -0,0 +1,209 @@
+/* XPM */
+static char *khelpcenter-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 187 2",
+"   c black",
+".  c #020000",
+"X  c #030000",
+"o  c #040300",
+"O  c #080000",
+"+  c #080100",
+"@  c #090000",
+"#  c #0B0000",
+"$  c #130000",
+"%  c #150600",
+"&  c #150800",
+"*  c #1A0200",
+"=  c #1F0000",
+"-  c #1F0200",
+";  c #200200",
+":  c #210400",
+">  c #210503",
+",  c #240200",
+"<  c #240300",
+"1  c #240400",
+"2  c #240900",
+"3  c #290600",
+"4  c #290700",
+"5  c #2F0600",
+"6  c #2C0A01",
+"7  c #340D00",
+"8  c #3A0B00",
+"9  c #3F0B00",
+"0  c #3A1100",
+"q  c #4F0300",
+"w  c #4E0700",
+"e  c #401300",
+"r  c #4F1E0B",
+"t  c #52230D",
+"y  c #532915",
+"u  c #680E00",
+"i  c #6E1100",
+"p  c #6A1A00",
+"a  c #7C0D04",
+"s  c #701500",
+"d  c #731A00",
+"f  c #6D2712",
+"g  c #773822",
+"h  c #7C413A",
+"j  c #8D1F00",
+"k  c #842F0E",
+"l  c #892305",
+"z  c #8E2B06",
+"x  c #8B3D24",
+"c  c #A01B00",
+"v  c #AF1C02",
+"b  c #A22200",
+"n  c #A92600",
+"m  c #A63C1F",
+"M  c #B82900",
+"N  c #964D33",
+"B  c #99593F",
+"V  c #B05235",
+"C  c #BF5331",
+"Z  c #BC5540",
+"A  c #B56548",
+"S  c #BC7762",
+"D  c #CF1914",
+"F  c #D11E17",
+"G  c #CD2403",
+"H  c #C52914",
+"J  c #C43207",
+"K  c #C6360D",
+"L  c #D62C28",
+"P  c #DA3533",
+"I  c #E61814",
+"U  c #FF0701",
+"Y  c #F21316",
+"T  c #FB1314",
+"R  c #FF1E1C",
+"E  c #E42F15",
+"W  c #E22F1C",
+"Q  c #E63009",
+"!  c #E72C2D",
+"~  c #E62F30",
+"^  c #F32D2F",
+"/  c #FF2B25",
+"(  c #FE3132",
+")  c #FF3736",
+"_  c #C2481F",
+"`  c #CD4C2C",
+"'  c #C64F33",
+"]  c #ED5A3F",
+"[  c #E9603A",
+"{  c #C05A51",
+"}  c #C66347",
+"|  c #C56F5C",
+" . c #E84244",
+".. c #EE4344",
+"X. c #ED4749",
+"o. c #EA5C5E",
+"O. c #EC7374",
+"+. c #FF6E6F",
+"@. c #E49B7C",
+"#. c #E59C7C",
+"$. c #FD927B",
+"%. c #BE8B81",
+"&. c #C19582",
+"*. c #C19782",
+"=. c #C29682",
+"-. c #C49783",
+";. c #D09F87",
+":. c #DA9D82",
+">. c #DF9F87",
+",. c #DFA08B",
+"<. c #DCA890",
+"1. c #D8A89A",
+"2. c #DAA99C",
+"3. c #D8AFA7",
+"4. c #D9B5AC",
+"5. c #DDB6AC",
+"6. c #DEB7AE",
+"7. c #E59E81",
+"8. c #FF8586",
+"9. c #FF8E86",
+"0. c #FE8E8C",
+"q. c #F29982",
+"w. c #F89787",
+"e. c #FF9488",
+"r. c #FA9699",
+"t. c #E5A487",
+"y. c #E1A48B",
+"u. c #E2A48B",
+"i. c #E4A28A",
+"p. c #E4A88E",
+"a. c #EEAA8D",
+"s. c #EBAE93",
+"d. c #F1A996",
+"f. c #E4B8A3",
+"g. c #E8B9A4",
+"h. c #ECBCA5",
+"j. c #FFADA5",
+"k. c #FFAEAF",
+"l. c #FAAEB0",
+"z. c #FEAEB0",
+"x. c #F9B2A1",
+"c. c #FEB1A9",
+"v. c #FEB0AA",
+"b. c #FFBBA4",
+"n. c #F8BCAF",
+"m. c #FDB7B9",
+"M. c #FFBCB9",
+"N. c #FFBEB8",
+"B. c #F8CEBD",
+"V. c #FDC3C5",
+"C. c #FFC7C0",
+"Z. c #FFC8CA",
+"A. c #FDCBCD",
+"S. c #FECECD",
+"D. c #FDCFD2",
+"F. c #FAD6C6",
+"G. c #FFD9CF",
+"H. c #F0D8D6",
+"J. c #FFD7DA",
+"K. c #FFD7DB",
+"L. c #E7E9E9",
+"P. c #EDF6F7",
+"I. c #F0E4E3",
+"U. c #F0ECEA",
+"Y. c #FEE1E3",
+"T. c #FFE9EB",
+"R. c #FFEDEB",
+"E. c #FDF0EB",
+"W. c #F6FFFF",
+"Q. c #F7FFFF",
+"!. c #F9F3F4",
+"~. c #FBF5F2",
+"^. c #FAF8F7",
+"/. c #F9FFFF",
+"(. c #FAFFFF",
+"). c #FBFFFF",
+"_. c #FFFBFA",
+"`. c #FDFAFE",
+"'. c #FFFCFB",
+"]. c #FFFDFB",
+"[. c #FFFEF8",
+"{. c #FDFFFF",
+"}. c #FFFDFC",
+"|. c #FFFEFD",
+" X c #FEFFFF",
+".X c gray100",
+"XX c None",
+/* pixels */
+"XXXXXXXXu.a.s.u.#.N k XXXXXXXXXX",
+"XXXXXXi.B.E.].|.|.C.$._ 8 XXXXXX",
+"XX*.,.c.T.|.|.|.`.J.J.N.] e XXXX",
+"XX>.j.Z.A.R.F.g.q.e.V.D.M.` $ XX",
+":.w.k.m.9.} y : 5 l X.l.Y.G.f   ",
+"7.c.z.0.' %   XXXX  p d./.|.S   ",
+"p.|.!.x.r   XXXXXXXX+ A ^.|.2.- ",
+"u.|./.f.* XXXXXXXXXXXXg ~.|.6.3 ",
+"@.]./.h.6 XXXXXXXXXXXXm H.|.4.1 ",
+"B ].W.n.z XXXXXXXXXXb H o.8.{ + ",
+"t b.r.X.E p + XXXXc v P ..) a   ",
+"  K / ^ ! W V x ' | L ~ ( F ;   ",
+"XX0 Q R Y X.I.U.L.P.O.T I w   XX",
+"XXXXe G U +./././.|.D.D q     XX",
+"XXXXXX& i C 1.6.3.%.h :     XXXX",
+"XXXXXXXX    ; 3 < +     XXXXXXXX"
+};
--- kdebase-3.5.7.orig/debian/icons/klipper-16.xpm
+++ kdebase-3.5.7/debian/icons/klipper-16.xpm
@@ -0,0 +1,213 @@
+/* XPM */
+static char *klipper-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 191 2",
+"   c black",
+".  c #000001",
+"X  c #000002",
+"o  c #000003",
+"O  c #010002",
+"+  c #020000",
+"@  c #030001",
+"#  c #000004",
+"$  c #050301",
+"%  c #121520",
+"&  c #251703",
+"*  c #37240B",
+"=  c #402514",
+"-  c #56331B",
+";  c #78787B",
+":  c #7B7B7F",
+">  c #717189",
+",  c #9A560F",
+"<  c #9C550E",
+"1  c #935117",
+"2  c #9F5615",
+"3  c #995912",
+"4  c #9A5810",
+"5  c #995C12",
+"6  c #9A5E13",
+"7  c #9C681E",
+"8  c #9F7331",
+"9  c #AD5C09",
+"0  c #AD5E0A",
+"q  c #B15D08",
+"w  c #AC600B",
+"e  c #AC610B",
+"r  c #AC630C",
+"t  c #AC650D",
+"y  c #AC660E",
+"u  c #AE6A0F",
+"i  c #A26715",
+"p  c #A06419",
+"a  c #AC6613",
+"s  c #AC6915",
+"d  c #AC6B16",
+"f  c #AE6F17",
+"g  c #AC7016",
+"h  c #AC7019",
+"j  c #AD761C",
+"k  c #B57A18",
+"l  c #A86A20",
+"z  c #A7793C",
+"x  c #B6821E",
+"c  c #B8892A",
+"v  c #AD8040",
+"b  c #C28F1F",
+"n  c #C18326",
+"m  c #CC872B",
+"M  c #CE8822",
+"N  c #CC8928",
+"B  c #C09022",
+"V  c #CA9D25",
+"C  c #D98633",
+"Z  c #DA8C37",
+"A  c #D5912A",
+"S  c #D39E38",
+"D  c #DD9139",
+"F  c #DF983C",
+"G  c #D6AC29",
+"H  c #FB8B10",
+"J  c #EB943B",
+"K  c #FDB125",
+"L  c #C2BE68",
+"P  c #E19E40",
+"I  c #ED9A41",
+"U  c #EE9E43",
+"Y  c #E3A442",
+"T  c #E5AA46",
+"R  c #E7AF49",
+"E  c #EFA145",
+"W  c #E7AE51",
+"Q  c #E2B052",
+"!  c #E4B354",
+"~  c #E8B153",
+"^  c #E9BC58",
+"/  c #F1A647",
+"(  c #F2AA49",
+")  c #F4AE4B",
+"_  c #F4B14E",
+"`  c #F6B44E",
+"'  c #CDC766",
+"]  c #E7C154",
+"[  c #EBC75E",
+"{  c #EDD163",
+"}  c #EFDB69",
+"|  c #F2E75F",
+" . c #FFF752",
+".. c #FFF45A",
+"X. c #F0E470",
+"o. c #FAF971",
+"O. c #858597",
+"+. c #949499",
+"@. c #98989C",
+"#. c #9191A5",
+"$. c #9394AD",
+"%. c #9595AA",
+"&. c #9C9CA0",
+"*. c #9D9DA2",
+"=. c #9B9BB1",
+"-. c #9C9DB3",
+";. c #9E9EB3",
+":. c #A7A7AA",
+">. c #AAAAAA",
+",. c #ACACAE",
+"<. c #A0A0B4",
+"1. c #A2A2B5",
+"2. c #A4A4B7",
+"3. c #A6A7BC",
+"4. c #AFAFB0",
+"5. c #A8A8BA",
+"6. c #A9A9BC",
+"7. c #B2B2B8",
+"8. c #B6B9BE",
+"9. c #B8B8BD",
+"0. c #BDBDC1",
+"q. c #BFBFC3",
+"w. c #C1C2C7",
+"e. c #C5C5C7",
+"r. c #C1C1CA",
+"t. c #C2C2CE",
+"y. c #C6C6C9",
+"u. c #CBCBCB",
+"i. c #CCCCCF",
+"p. c #CECECD",
+"a. c gray81",
+"s. c #C5C5D2",
+"d. c #C6C6D3",
+"f. c #CED0CF",
+"g. c #D3D3DB",
+"h. c #D3D3DC",
+"j. c #D5D5D8",
+"k. c #D5D5DD",
+"l. c #DDDDDF",
+"z. c #CBCDE4",
+"x. c #CECEE0",
+"c. c #CDCFE4",
+"v. c #D1D1E3",
+"b. c #D2D2E4",
+"n. c #D2D3E4",
+"m. c #D3D4E4",
+"M. c #D5D5E6",
+"N. c #D8D8E2",
+"B. c #DBDBE3",
+"V. c #DCDCE4",
+"C. c #D8DAEA",
+"Z. c #E5E6EB",
+"A. c #E6E7E8",
+"S. c #E5E5EF",
+"D. c #EAEAEB",
+"F. c #E4E4F1",
+"G. c #E4E5F2",
+"H. c #E4E5F3",
+"J. c #E6E7F3",
+"K. c #E7E8F3",
+"L. c #E5E9F6",
+"P. c #EAEAF1",
+"I. c #E9EBF7",
+"U. c #EBEBF4",
+"Y. c #EAECF5",
+"T. c #EBECF7",
+"R. c #EBEDF6",
+"E. c #ECECF2",
+"W. c #ECECF3",
+"Q. c #ECECF4",
+"!. c #ECEDF6",
+"~. c #EEEFF7",
+"^. c #E8EBF9",
+"/. c #EAEDF8",
+"(. c #EFEFF9",
+"). c #F0F1F8",
+"_. c #F1F2F8",
+"`. c #F1F3FB",
+"'. c #F1F3FC",
+"]. c #F2F3FC",
+"[. c #F3F3FC",
+"{. c #F1F4FB",
+"}. c #F3F5FC",
+"|. c #F3F5FD",
+" X c #F5F5F9",
+".X c #F5F7FF",
+"XX c #F6F6FC",
+"oX c #FCFCFF",
+"OX c #FEFFFF",
+"+X c gray100",
+"@X c None",
+/* pixels */
+"@X@X@X@X> -.s.t.s.#.% @X@X@X@X@X",
+"@Xm A v %.E.+X+X+XP.O.8 n * @X@X",
+"@XS ..L 3.B.g.h.h.V.2.'  .c   @X",
+"@XG o.f.=.5.6.1.1.-.$.8.| b $ @X",
+"@XV X.[.+XD.l. X~.F.F.c.^ k     ",
+"@XB } ).+Xu.>.+X XU.F.x.R g     ",
+"@Xx { ).+Xa.,.+X0.r.H.b.T i     ",
+"@Xj [ ~.+Xa.,.0.+.N.L.b.Y 6     ",
+"@Xg ^ T.+Xi.; : h.).K.b.J 7     ",
+"@Xd ~ T.+Xy.@.8.*.~.T.M.F 5     ",
+"@Xa W {.+Xe.:.oX&.7.).M.D 4 #   ",
+"@Xs ! [.+XA.j.+XZ.r.[.C.Z 4     ",
+"@Xh Q ^.[..X[.~./.I.L.z.C < #   ",
+"@Xh K _ _ ) ( E E U I J H 1 #   ",
+"@X- 7 t a t r r w 9 9 q 2 =     ",
+"@X  #     # # # # # # # #       "
+};
--- kdebase-3.5.7.orig/debian/icons/ktip-16.xpm
+++ kdebase-3.5.7/debian/icons/ktip-16.xpm
@@ -0,0 +1,97 @@
+/* XPM */
+static char *ktip-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 75 1",
+"  c black",
+". c #010101",
+"X c gray1",
+"o c gray12",
+"O c #26262B",
+"+ c #2E2E32",
+"@ c #2B2B52",
+"# c #30305C",
+"$ c #34345B",
+"% c #444444",
+"& c gray35",
+"* c #525279",
+"= c #656565",
+"- c #5555A2",
+"; c #5D5DA7",
+": c #5E5FA8",
+"> c #5F5FA8",
+", c #6B6B96",
+"< c #6363AA",
+"1 c #6465AE",
+"2 c #6566AE",
+"3 c #6F6FB1",
+"4 c #7171B3",
+"5 c #7373B3",
+"6 c #7476B9",
+"7 c #7C7CB8",
+"8 c gray51",
+"9 c #929292",
+"0 c #9F9F9F",
+"q c #8D8FC9",
+"w c #8F93CD",
+"e c #9192C6",
+"r c #9597CE",
+"t c #9898C7",
+"y c #9D9FD2",
+"u c #9BA0D6",
+"i c #9FA1D1",
+"p c #A1A1CC",
+"a c #A3A3CD",
+"s c #A0A2D1",
+"d c #A2A3D0",
+"f c #A2A4D3",
+"g c #A8A8D0",
+"h c #AAAEDC",
+"j c #B1B1C1",
+"k c #B6BAE3",
+"l c #B9BBE1",
+"z c #BFC3E8",
+"x c #C3C3CF",
+"c c #D4D4DD",
+"v c #C8C8E2",
+"b c #CECFE8",
+"n c #DDDDE4",
+"m c #DADFF9",
+"M c #DBE0FA",
+"N c #DCE2FF",
+"B c #DFE5FF",
+"V c #E8E8ED",
+"C c #E2E6FA",
+"Z c #E1E7FF",
+"A c #E2E8FF",
+"S c #E3E8FF",
+"D c #E5E9FC",
+"F c #E6EBFF",
+"G c #EDEDF1",
+"H c #E8EDFF",
+"J c #E9EDFF",
+"K c #EAEDFF",
+"L c #F0F3FF",
+"P c #F3F5FF",
+"I c #F6F8FF",
+"U c #FBFCFF",
+"Y c #FCFDFF",
+"T c gray100",
+"R c None",
+/* pixels */
+"RRRRptyrq3<RRRRR",
+"RRgakDTTUCw--RRR",
+"RRazUTTTTTUy-RRR",
+"RRdJUUTTUUTD1RRR",
+"RRdHPPPPPPPD6RRR",
+"RReNJJJJJJJN2RRR",
+"RR7kBBBBBBBh-RRR",
+"RR55mZZZZZm:-RRR",
+"RRR;yJKKKKy-RRRR",
+"RRR->PPKPP:-RRRR",
+"RRRR-bIIIb-RRRRR",
+"RRRR-vTTUv-RRRRR",
+"RRRR-,*$@#-RRRRR",
+"RRRR90Vnx+ RRRRR",
+"RRRR=8VcjO RRRRR",
+"RRRRRO&%X RRRRRR"
+};
--- kdebase-3.5.7.orig/debian/icons/kwrite-16.xpm
+++ kdebase-3.5.7/debian/icons/kwrite-16.xpm
@@ -0,0 +1,185 @@
+/* XPM */
+static char *kwrite-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 163 2",
+"   c black",
+".  c #000002",
+"X  c #050300",
+"o  c #070500",
+"O  c #080500",
+"+  c #00031A",
+"@  c #00071B",
+"#  c #00061C",
+"$  c #00081F",
+"%  c #191603",
+"&  c #1D160E",
+"*  c #1F190E",
+"=  c #000C3B",
+"-  c #372F05",
+";  c #06184E",
+":  c #01165C",
+">  c #01185E",
+",  c #061A5C",
+"<  c #000F60",
+"1  c #001B6C",
+"2  c #503C20",
+"3  c #52470F",
+"4  c #60540D",
+"5  c #67590B",
+"6  c #7A4A2E",
+"7  c #485872",
+"8  c #586265",
+"9  c #596265",
+"0  c #5C6564",
+"q  c #616961",
+"w  c #626961",
+"e  c #0028A6",
+"r  c #002BA7",
+"t  c #012CA8",
+"y  c #022CA9",
+"u  c #0530A9",
+"i  c #0330B2",
+"p  c #1336A4",
+"a  c #1639A4",
+"s  c #173EB2",
+"d  c #173EB3",
+"f  c #103ABD",
+"g  c #2445AF",
+"h  c #2848B1",
+"j  c #2948B2",
+"k  c #3A57A5",
+"l  c #3C58A5",
+"z  c #3054CB",
+"x  c #536EBF",
+"c  c #6078AF",
+"v  c #6178AF",
+"b  c #737CAF",
+"n  c #4665C6",
+"m  c #466BDE",
+"M  c #4A6CDF",
+"N  c #4D70DD",
+"B  c #506AC0",
+"V  c #566EC0",
+"C  c #5775CD",
+"Z  c #5C7BCD",
+"A  c #5673D2",
+"S  c #5476DB",
+"D  c #587BDA",
+"F  c #577AEA",
+"G  c #637DCF",
+"H  c #677ED1",
+"J  c #607FE3",
+"K  c #617EE2",
+"L  c #637FE1",
+"P  c #7D8D9D",
+"I  c #7F8F9D",
+"U  c #6880CF",
+"Y  c #6C81CE",
+"T  c #6781D2",
+"R  c #6681D5",
+"E  c #6584DA",
+"W  c #778ACF",
+"Q  c #7A8EC2",
+"!  c #7B8FC3",
+"~  c #7F97DF",
+"^  c #6282E6",
+"/  c #6383E6",
+"(  c #6583E4",
+")  c #6483E6",
+"_  c #6684E6",
+"`  c #6987E7",
+"'  c #6A87E6",
+"]  c #6C87E4",
+"[  c #6C87E5",
+"{  c #6A86EA",
+"}  c #6E88E5",
+"|  c #6D8CEA",
+" . c #738DE7",
+".. c #748DE6",
+"X. c #728BEB",
+"o. c #708CE8",
+"O. c #7597E1",
+"+. c #7795EC",
+"@. c #7896E8",
+"#. c #7F96E8",
+"$. c #7B98EF",
+"%. c #814712",
+"&. c #804815",
+"*. c #804816",
+"=. c #8F7748",
+"-. c #9E9310",
+";. c #898A5C",
+":. c #FC941C",
+">. c #FF981F",
+",. c #FF9A24",
+"<. c #FF9A25",
+"1. c #FFB407",
+"2. c #FFB507",
+"3. c #FFBF11",
+"4. c #E4BE34",
+"5. c #C79F69",
+"6. c #C29B72",
+"7. c #C7A150",
+"8. c #DEBD65",
+"9. c #FDAE46",
+"0. c #E6D91D",
+"q. c #FFD602",
+"w. c #FFD40A",
+"e. c #FFD40B",
+"r. c #FFD709",
+"t. c #FFEE1C",
+"y. c #FFEF1D",
+"u. c #FFF11B",
+"i. c #FFFB1D",
+"p. c #FFFC1F",
+"a. c #FFF024",
+"s. c #FFF346",
+"d. c #82929D",
+"f. c #9BADB4",
+"g. c #8393D2",
+"h. c #8B9FE2",
+"j. c #90A2DE",
+"k. c #8BA0EA",
+"l. c #9AADEF",
+"z. c #AEBBEF",
+"x. c #A3B4F1",
+"c. c #ACBBF0",
+"v. c #ADBBF0",
+"b. c #B3BFEE",
+"n. c #A2C4F2",
+"m. c #A1C5F4",
+"M. c #AAC6FF",
+"N. c #B3C0F1",
+"B. c #B8C4F1",
+"V. c #BBC7F3",
+"C. c #C4CEF4",
+"Z. c #CDD8EB",
+"A. c #CCD4F6",
+"S. c #CFDBF3",
+"D. c #D1DBF4",
+"F. c #D3DBF6",
+"G. c #D9DFF8",
+"H. c #CDE7FF",
+"J. c #CFEAFF",
+"K. c #E6EAFC",
+"L. c #F1FCFF",
+"P. c gray100",
+"I. c None",
+/* pixels */
+"I.I.I.I.I.I.I.I.I.I.I.I.a.7.& I.",
+"I.I.u r I.i 1 I.I.I.I.y.u.4.=.* ",
+"I.I.s n y E @.: I.I.p.y.e.1.9.2 ",
+"I.r T K.H S.P.@.< -.i.e.1.,.%.X ",
+"I.s b.G.F.j.S.L.f.0.r.1.,.%.  I.",
+"r A V.C.A.B.#.S.s.q.1.>.6   I.I.",
+"f h.v.v.v.b.x.W 8.3.:.6   I.I.I.",
+"7 d.V X.#.h.l.g.b 5.6.Z > I.I.I.",
+"5 9 v ! E ] ..Y H C m.J.| >   I.",
+"O - ;.l H ..] ]  ./ D m.H.F = I.",
+"I.I.3 w d.x E } ( ( N O.M.j # I.",
+"I.I.I.3 8 c g.F ) ( S $.j + I.I.",
+"I.I.I.o - ;.k G } F m g + I.I.I.",
+"I.I.I.I.I.3 q P x M p @ I.I.I.I.",
+"I.I.I.I.I.I.4 0 z a @ I.I.I.I.I.",
+"I.I.I.I.I.I.O % ; $ I.I.I.I.I.I."
+};
--- kdebase-3.5.7.orig/debian/icons/kicker.xpm
+++ kdebase-3.5.7/debian/icons/kicker.xpm
@@ -0,0 +1,206 @@
+/* XPM */
+static char *kicker[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 184 2",
+"   c #5C5C5D",
+".  c #5E5F5F",
+"X  c #606060",
+"o  c #606161",
+"O  c #616161",
+"+  c #616261",
+"@  c #616262",
+"#  c #666766",
+"$  c #6C6D6D",
+"%  c #777991",
+"&  c #D2AA38",
+"*  c #F7AF0E",
+"=  c #D8B959",
+"-  c #C1AC76",
+";  c #CCB57D",
+":  c #DBB96B",
+">  c #EBAD44",
+",  c #F6AD49",
+"<  c #E9B062",
+"1  c #F5C802",
+"2  c #E5C52C",
+"3  c #E6CA3E",
+"4  c #DAD47C",
+"5  c #E3CA59",
+"6  c #E3CF6F",
+"7  c #8A8A8A",
+"8  c #8B8B8B",
+"9  c #8C8D8C",
+"0  c #8C8F96",
+"q  c #8A889A",
+"w  c #9F9683",
+"e  c #929292",
+"r  c #929393",
+"t  c #939393",
+"y  c #979797",
+"u  c #91959F",
+"i  c #979898",
+"p  c #99949C",
+"a  c #9C9897",
+"s  c #9293A5",
+"d  c #979BA0",
+"f  c #9897A4",
+"g  c #9998AA",
+"h  c #9898AC",
+"j  c #989CA8",
+"k  c #9CA0A2",
+"l  c #9DA0A6",
+"z  c #9EA2A7",
+"x  c #BEB197",
+"c  c #A1A4AA",
+"v  c #A3A5AC",
+"b  c #A6A9AD",
+"n  c #A7AAAF",
+"m  c #ACAEB8",
+"M  c #AEAFBD",
+"N  c #ACB1B0",
+"B  c #AEB2B1",
+"V  c #AFB3B3",
+"C  c #B0B3B6",
+"Z  c #B0B5B3",
+"A  c #B1B5B4",
+"S  c #B1B4B6",
+"D  c #B1B7B4",
+"F  c #B2B6B6",
+"G  c #B2B7B6",
+"H  c #B0B1B8",
+"J  c #B1B6BC",
+"K  c #B4B8B6",
+"L  c #B5BABF",
+"P  c #B7B8BC",
+"I  c #B7BCBC",
+"U  c #B2B3C0",
+"Y  c #B6B7C6",
+"T  c #BABEC0",
+"R  c #BABEC1",
+"E  c #BBBFC2",
+"W  c #B8BCC7",
+"Q  c #BCBFC0",
+"!  c #BAB9C8",
+"~  c #BCC2C2",
+"^  c #BDC2C6",
+"/  c #BFC1C6",
+"(  c #C1B18F",
+")  c #C5C1BE",
+"_  c #CEC6B8",
+"`  c #D8C2AB",
+"'  c #D5C5B2",
+"]  c #D9CEBC",
+"[  c #E1D081",
+"{  c #E8DB94",
+"}  c #F5C181",
+"|  c #C0C4C4",
+" . c #C1C7C7",
+".. c #C0C5CA",
+"X. c #C0C5CB",
+"o. c #C2C4CB",
+"O. c #C3C6CD",
+"+. c #C4C7CE",
+"@. c #CACDC1",
+"#. c #C7CBD4",
+"$. c #CCCDD1",
+"%. c #CCCFD4",
+"&. c #CDD1D3",
+"*. c #CED4D3",
+"=. c #CED3DA",
+"-. c #D1D7D6",
+";. c #D1D7D7",
+":. c #D7D3D6",
+">. c #D5D4D2",
+",. c #D5D3D9",
+"<. c #D0D8D7",
+"1. c #D1D8D6",
+"2. c #D2D8D7",
+"3. c #D3D8D7",
+"4. c #D3D9D7",
+"5. c #D2D8D8",
+"6. c #D3D9D8",
+"7. c #D4DAD8",
+"8. c #D4DAD9",
+"9. c #D4DBD9",
+"0. c #D5DADA",
+"q. c #D5DBDA",
+"w. c #D6DCDB",
+"e. c #D7DDDB",
+"r. c #D7DDDC",
+"t. c #D8DEDC",
+"y. c #D9DEDD",
+"u. c #D9DFDE",
+"i. c #DFDFDF",
+"p. c #DCDCE4",
+"a. c #DBE1DF",
+"s. c #DAE2E0",
+"d. c #DEE4E3",
+"f. c #DFE4E3",
+"g. c #E8DBCB",
+"h. c #EEDECA",
+"j. c #E0DED6",
+"k. c #EEE4C9",
+"l. c #E0E0E2",
+"z. c #E3E3E3",
+"x. c #E0E1E5",
+"c. c #E2E3E7",
+"v. c #E2E5E5",
+"b. c #E3E5E6",
+"n. c #E4E7E7",
+"m. c #E5E6E7",
+"M. c #E6E6E7",
+"N. c #E7E8E9",
+"B. c #E6E9EB",
+"V. c #E6EAE9",
+"C. c #E7EAEA",
+"Z. c #E7EBEA",
+"A. c #E7EBEB",
+"S. c #E9E7E5",
+"D. c #E8E8EB",
+"F. c #EBEBEB",
+"G. c #E9EBEC",
+"H. c #EAEAED",
+"J. c #EAEBED",
+"K. c #E9ECEB",
+"L. c #E9EDEC",
+"P. c #E9EDED",
+"I. c #EAEDEC",
+"U. c #EAEEED",
+"Y. c #EAEFED",
+"T. c #EBEFED",
+"R. c #ECECEC",
+"E. c #EDEFEF",
+"W. c #EEEEEE",
+"Q. c #EEEEF0",
+"!. c #EFF0F4",
+"~. c #F0F0F0",
+"^. c #F1F1F1",
+"/. c #F1F3F2",
+"(. c #F3F3F3",
+"). c #F6F7F7",
+"_. c #F2F4F9",
+"`. c #F4F4F9",
+"'. c #FAFBFB",
+"]. c #FBFBFB",
+"[. c #FBFCFB",
+"{. c #FCFCFC",
+"}. c #FCFDFD",
+"|. c #FDFDFD",
+/* pixels */
+"|.^.^.^.^.^.^.^.^.~.^.^.^.^.^.|.",
+"z.i r r t t r r r r r r r r y /.",
+"9 /.I.I.Y.Y.E.I.v.K.K.z.v.K.I.|.",
+"7 I.6.6.%.5.B.l.Q &.E.$.V ;.s.'.",
+"7 I.6.%.+...N.M...x.I.V / r.a.'.",
+"7 I.5.O.,.' g.!.x.D.P I r.r.w.'.",
+"7 K.;...` } h._.`.p.v  .e.w.r.'.",
+"7 N.=.>.< , k.S.] :.Y m T 6.s.'.",
+"8 z.W ) > * { a.= ; ! g j 5.v.'.",
+"8 N.^ C : 1 4 _ 2 & p % i w.f.'.",
+"7 I.w.#._ 5 6 [ 3 - q s T w.a.'.",
+"7 I.-...M a x ( w f s b 5.r.r.'.",
+"7 I.6.T b J U g j I c Q r.e.a.'.",
+"8 a.F V B Z c 0 k G B V G G G ).",
+"i.$ X X X X     . X X X X X # Y.",
+"[.E.D.E.F.F.E.N.E.I.F.F.F.F.F.|."
+};
--- kdebase-3.5.7.orig/debian/icons/khelpcenter.xpm
+++ kdebase-3.5.7/debian/icons/khelpcenter.xpm
@@ -0,0 +1,234 @@
+/* XPM */
+static char *khelpcenter[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 196 2",
+"   c black",
+".  c #6A0B00",
+"X  c #730E00",
+"o  c #7C0E00",
+"O  c #7B1200",
+"+  c #800E00",
+"@  c #851300",
+"#  c #8A1900",
+"$  c #911D00",
+"%  c #9F2300",
+"&  c #A60D01",
+"*  c #A71003",
+"=  c #B91508",
+"-  c #B91D00",
+";  c #AD2700",
+":  c #AB2900",
+">  c #A1331F",
+",  c #B22B00",
+"<  c #BA2C00",
+"1  c #B63100",
+"2  c #BE3600",
+"3  c #BE360F",
+"4  c #B75F4E",
+"5  c #B76A5E",
+"6  c #C90C05",
+"7  c #C01D00",
+"8  c #CA1109",
+"9  c #CC1B16",
+"0  c #D1110B",
+"q  c #DD1E00",
+"w  c #D01E1C",
+"e  c #D91B17",
+"r  c #C1370E",
+"t  c #C63A00",
+"y  c #CA3400",
+"u  c #C93800",
+"i  c #CD3E0E",
+"p  c #DF2F00",
+"a  c #DD201C",
+"s  c #D23A00",
+"d  c #DD3E00",
+"f  c #D92121",
+"g  c #DB2D2D",
+"h  c #D63527",
+"j  c #D53939",
+"k  c #DB3737",
+"l  c #EB1A1A",
+"z  c #FB0606",
+"x  c #F90C05",
+"c  c #F31111",
+"v  c #F31A1A",
+"b  c #FA1010",
+"n  c #FA1A1A",
+"m  c #E22B01",
+"M  c #EB3600",
+"N  c #F32005",
+"B  c #F8240B",
+"V  c #FC2909",
+"C  c #F13600",
+"Z  c #F63C0B",
+"A  c #E42424",
+"S  c #E12D2D",
+"D  c #ED2423",
+"F  c #EB2D2C",
+"G  c #E33737",
+"H  c #EA3737",
+"J  c #F32424",
+"K  c #F42D2D",
+"L  c #FB2424",
+"P  c #FC2B2B",
+"I  c #F43636",
+"U  c #FB3737",
+"Y  c #FF3D34",
+"T  c #C1431F",
+"R  c #D74507",
+"E  c #D94A0E",
+"W  c #DD5D27",
+"Q  c #D76434",
+"!  c #DD6D3E",
+"~  c #EA4500",
+"^  c #E24B1C",
+"/  c #FF4009",
+"(  c #FF4A12",
+")  c #F75C1A",
+"_  c #FD5919",
+"`  c #E24A20",
+"'  c #EE4432",
+"]  c #EE4638",
+"[  c #F34C31",
+"{  c #FC5333",
+"}  c #FF5A31",
+"|  c #EC6A34",
+" . c #F06124",
+".. c #F0682D",
+"X. c #F96527",
+"o. c #F86139",
+"O. c #FC6A3C",
+"+. c #C56245",
+"@. c #CA684E",
+"#. c #D86B46",
+"$. c #D37046",
+"%. c #D7784F",
+"&. c #D77E58",
+"*. c #DB7C5E",
+"=. c #E34141",
+"-. c #E54A4A",
+";. c #EC4141",
+":. c #EA4C4A",
+">. c #E45454",
+",. c #E15E5E",
+"<. c #EB5251",
+"1. c #F54141",
+"2. c #F34A4A",
+"3. c #FB4141",
+"4. c #F94A4A",
+"5. c #F15454",
+"6. c #F05855",
+"7. c #F85454",
+"8. c #F8664D",
+"9. c #F86F47",
+"0. c #F07541",
+"q. c #FB7943",
+"w. c #F67E57",
+"e. c #E26E6E",
+"r. c #EC6361",
+"t. c #ED7373",
+"y. c #FD6D6D",
+"u. c #F1766D",
+"i. c #F27979",
+"p. c #FF7B75",
+"a. c #CD8B7D",
+"s. c #D78460",
+"d. c #D58A6B",
+"f. c #D28E7D",
+"g. c #F68251",
+"h. c #FF8B5A",
+"j. c #FF8673",
+"k. c #FF8578",
+"l. c #FF887C",
+"z. c #F69A74",
+"x. c #FE9E76",
+"c. c #CC9D88",
+"v. c #DD9F85",
+"b. c #D9A38B",
+"n. c #D6B2A8",
+"m. c #EA9A87",
+"M. c #ED9494",
+"N. c #F38F8F",
+"B. c #FA8484",
+"V. c #FF8983",
+"C. c #FF9489",
+"Z. c #FF9983",
+"A. c #F79797",
+"S. c #ECA586",
+"D. c #ECB299",
+"F. c #FEA884",
+"G. c #F7B497",
+"H. c #F3B89E",
+"J. c #FFB798",
+"K. c #E6ADAD",
+"L. c #EBACAC",
+"P. c #E3BBAD",
+"I. c #F6A3A3",
+"U. c #FDA2A2",
+"Y. c #FCAAAA",
+"T. c #F3BBBB",
+"R. c #FCB4B4",
+"E. c #FDBEBE",
+"W. c #FEC1A7",
+"Q. c #FDC3AB",
+"!. c #FDC7B0",
+"~. c #FDCAB5",
+"^. c #FECEBA",
+"/. c #FED0BC",
+"(. c #E6CECA",
+"). c #EFCFC2",
+"_. c #F4C5C5",
+"`. c #F4CBCB",
+"'. c #FCC3C3",
+"]. c #FECACA",
+"[. c #F1D5CD",
+"{. c #F4D4D4",
+"}. c #F4DADA",
+"|. c #FDD6D6",
+" X c #F7E3DD",
+".X c #FCE1D6",
+"XX c #E4E4E4",
+"oX c #ECECEC",
+"OX c #F1E4E4",
+"+X c #FCE3E3",
+"@X c #FAEEEC",
+"#X c #FDF1EE",
+"$X c #F4F4F4",
+"%X c #FDF4F4",
+"&X c #FDFDFD",
+"*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*Xd.d.s.&.%.$.*X*X*X*X*X*X*X*X*X*X*X*X*X",
+"*X*X*X*X*X*X*X*X*X*Xv.S.J.W.^.~.!.Q.F.O.| W *X*X*X*X*X*X*X*X*X*X",
+"*X*X*X*X*X*X*X*Xb.G./.@X&X&X&X&X&X&X#XY.l.} ) E *X*X*X*X*X*X*X*X",
+"*X*X*X*X*X*Xc.D.Z.#X&X&X&X&X&X&X&X&X+X].].].V.( ~ t *X*X*X*X*X*X",
+"*X*X*X*X*Xc.H.l.'.+X&X&X&X&X$X&X&X&X|.].].].].'.{ ~ 2 *X*X*X*X*X",
+"*X*X*X*Xc.H.C.].].].$X&X&X$X&X&X&X$X].].].].].].].8.M 1 *X*X*X*X",
+"*X*X*X*XD.k.].].'.].|.&X&X$X$XoXoXT.I.].].].].].].].[ u *X*X*X*X",
+"*X*X*Xb.Z.R.E.E.E.E.E.}.).z.q... ._ Z ' N.T.E.E.~.E.R.` , *X*X*X",
+"*X*X*XG.V.R.R.R.R.R.6.9.0.Q *X*X*X*XR ~ C <.T.R.R.].%X}.y *X*X*X",
+"*X*Xb.j.Y.Y.Y.Y.Y.<.9.! *X*X*X*X*X*X*X*Xs M :.T.+X$X&X&X*.: *X*X",
+"*X*XS.p.U.U.U.A.i.} ! *X*X*X*X*X*X*X*X*X*Xu ^ $X$X&X&X&X[., *X*X",
+"*X*XJ.&X+X'.Y.A.] 0.*X*X*X*X*X*X*X*X*X*X*X*Xs P.$X$X$X&X&XT *X*X",
+"*Xd.H.&X&X&X$XOXg.Q *X*X*X*X*X*X*X*X*X*X*X*X, #.oX$X&X$X&X@.$ *X",
+"*Xd.^.&X&X&X$XoXq.*X*X*X*X*X*X*X*X*X*X*X*X*X*XR oX$X$X&X&Xf.$ *X",
+"*Xs.~.&X$X$X$XoX| *X*X*X*X*X*X*X*X*X*X*X*X*X*X< XX$X$X&X&Xf.# *X",
+"*X&.Q.&X&X$X$XoX .*X*X*X*X*X*X*X*X*X*X*X*X*X*X< XX$X$X&X&Xa.# *X",
+"*X%.Q.$X$X&XoXoXX.*X*X*X*X*X*X*X*X*X*X*X*X*X*X3 oXoX$X$X$Xa.@ *X",
+"*X$.F.&X&X$X$XoXg.R *X*X*X*X*X*X*X*X*X*X*X*X% - ,.M._.@X&X4 O *X",
+"*X*Xh.&X&X$X$XoXm.~ *X*X*X*X*X*X*X*X*X*X*X*X; 9 >.<.5.7.y.> *X*X",
+"*X*X| .X&X$X{.t.H M s *X*X*X*X*X*X*X*X*X*X% - k -.:.2.4.F @ *X*X",
+"*X*XW x.#XB.1.;.;.a M u *X*X*X*X*X*X*X*X% - w =.;.;.1.3.= O *X*X",
+"*X*X*X) Y U U I H G e p s , *X*X*X*X: : - 9 k G H H U D @ *X*X*X",
+"*X*X*XE / P K K F F S f h #.i < < 3 +.n.j g S F K K P * X *X*X*X",
+"*X*X*X*X~ V L L J D A A e.XXXXXXXXXXXXoXK.A A D J L 8 o *X*X*X*X",
+"*X*X*X*Xt ~ B n n v l l L.oXoXoXXXoXoXoXoX<.l v v 0 + . *X*X*X*X",
+"*X*X*X*X*Xt d N b b c c OX$XoXoXoXoX$XoX$X`.c b 6 + . *X*X*X*X*X",
+"*X*X*X*X*X*X1 y m x z I $X$X$X$X$X$X$X$X$X%Xr.& o . *X*X*X*X*X*X",
+"*X*X*X*X*X*X*X*X, y q u.&X$X$X&X$X$X&X$X(.5 @ X *X*X*X*X*X*X*X*X",
+"*X*X*X*X*X*X*X*X*X*X: , T @.f.f.a.a.5 > @ O *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"
+};
--- kdebase-3.5.7.orig/debian/icons/kpersonalizer.xpm
+++ kdebase-3.5.7/debian/icons/kpersonalizer.xpm
@@ -0,0 +1,289 @@
+/* XPM */
+static char *kpersonalizer[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 251 2",
+"   c black",
+".  c #040F1F",
+"X  c #061802",
+"o  c #081C02",
+"O  c #051121",
+"+  c #08182C",
+"@  c #002C00",
+"#  c #0D2207",
+"$  c #082D6E",
+"%  c #002270",
+"&  c #00257B",
+"*  c #00306C",
+"=  c #0C3473",
+"-  c #113C78",
+";  c #004400",
+":  c #004C00",
+">  c #084502",
+",  c #005000",
+"<  c #005C00",
+"1  c #105204",
+"2  c #0A6B02",
+"3  c #0F7304",
+"4  c #1C6F08",
+"5  c #136311",
+"6  c #126910",
+"7  c #147C06",
+"8  c #1C7813",
+"9  c #267E0B",
+"0  c #267921",
+"q  c #2E782F",
+"w  c #002884",
+"e  c #032F8B",
+"r  c #0B3C94",
+"t  c #0133A4",
+"y  c #0438A6",
+"u  c #063CA9",
+"i  c #0131BD",
+"p  c #0233C1",
+"a  c #0237C8",
+"s  c #13458C",
+"d  c #194E92",
+"f  c #0F47A2",
+"g  c #0B43AE",
+"h  c #0E49B2",
+"j  c #0D4BBD",
+"k  c #104BAD",
+"l  c #1453B6",
+"z  c #1555B9",
+"x  c #1659BB",
+"c  c #185BBD",
+"v  c #256CBD",
+"b  c #0641C1",
+"n  c #0643CB",
+"m  c #0D4DD0",
+"M  c #1F49C2",
+"N  c #1658C4",
+"B  c #1B5FC0",
+"V  c #185ACD",
+"C  c #0344E7",
+"Z  c #0648E1",
+"A  c #0347F4",
+"S  c #0549F5",
+"D  c #0349FF",
+"F  c #0A4FFF",
+"G  c #0C52FF",
+"H  c #1458E4",
+"J  c #1559ED",
+"K  c #1254FF",
+"L  c #1459FF",
+"P  c #1E65C3",
+"I  c #1E65CB",
+"U  c #1E64FF",
+"Y  c #256FC2",
+"T  c #216BC8",
+"R  c #2A6CC4",
+"E  c #2268D2",
+"W  c #2572CD",
+"Q  c #2874CB",
+"!  c #2771D2",
+"~  c #2A7BD3",
+"^  c #3178CC",
+"/  c #3278D1",
+"(  c #307ED8",
+")  c #2469E7",
+"_  c #276CEF",
+"`  c #2166FF",
+"'  c #276CFF",
+"]  c #2A6FFF",
+"[  c #2F76E3",
+"{  c #367CEE",
+"}  c #3379FE",
+"|  c #496FD2",
+" . c #597DC3",
+".. c #4075FE",
+"X. c #4579FF",
+"o. c #178006",
+"O. c #1D8A08",
+"+. c #23940A",
+"@. c #309A19",
+"#. c #328D25",
+"$. c #359025",
+"%. c #2BA00C",
+"&. c #2FA212",
+"*. c #31AA0E",
+"=. c #3DAE1D",
+"-. c #3DB517",
+";. c #3FB120",
+":. c #2F8470",
+">. c #419327",
+",. c #41A32A",
+"<. c #44A82A",
+"1. c #4CAF2D",
+"2. c #4CA530",
+"3. c #47BC23",
+"4. c #59BB3A",
+"5. c #4F8854",
+"6. c #528B56",
+"7. c #55886C",
+"8. c #61BE44",
+"9. c #72A373",
+"0. c #7AA87C",
+"q. c #4FC02C",
+"w. c #59C637",
+"e. c #2E80D3",
+"r. c #3580D4",
+"t. c #3388DC",
+"y. c #3983D8",
+"u. c #3C8CDC",
+"i. c #358FE1",
+"p. c #3D86E7",
+"a. c #3C81FF",
+"s. c #3993E3",
+"d. c #5380C8",
+"f. c #5885CC",
+"g. c #5F9CDF",
+"h. c #438BED",
+"j. c #478CFE",
+"k. c #4A87FF",
+"l. c #4A8FFF",
+"z. c #449CE7",
+"x. c #449DE8",
+"c. c #4A95EB",
+"v. c #4F9EE5",
+"b. c #4E9BEB",
+"n. c #4E93FF",
+"m. c #5589FF",
+"M. c #5297FF",
+"N. c #5B97FF",
+"B. c #5A9FFF",
+"V. c #4DA3EC",
+"C. c #54A5ED",
+"Z. c #58ABEF",
+"A. c #5CA1FD",
+"S. c #5CAEF0",
+"D. c #6189CB",
+"F. c #6792D2",
+"G. c #6893D2",
+"H. c #748CC9",
+"J. c #709EDB",
+"K. c #638FFE",
+"L. c #609EE0",
+"P. c #6498FF",
+"I. c #719DFF",
+"U. c #7BA4DB",
+"Y. c #63A3E3",
+"T. c #66A8E6",
+"R. c #67AAE8",
+"E. c #69ACE9",
+"W. c #61A6FF",
+"Q. c #66AAFF",
+"!. c #6AABFC",
+"~. c #66B2F2",
+"^. c #6DB1FE",
+"/. c #73A7FF",
+"(. c #76AEFF",
+"). c #7EA1FD",
+"_. c #72B5FF",
+"`. c #7BB7FF",
+"'. c #78BDFF",
+"]. c #7CC2FD",
+"[. c #80B57B",
+"{. c #82CE6A",
+"}. c #93D97D",
+"|. c #90BC8E",
+" X c #9DBF9E",
+".X c #87ACDD",
+"XX c #91B7E6",
+"oX c #96BFEB",
+"OX c #8DC383",
+"+X c #94CE85",
+"@X c #97D385",
+"#X c #98D587",
+"$X c #9AD58B",
+"%X c #A1CB9A",
+"&X c #A5DD95",
+"*X c #A5CCA0",
+"=X c #ACDAA1",
+"-X c #B4CAB7",
+";X c #BBDFB2",
+":X c #81C4FF",
+">X c #89C5FF",
+",X c #89CDFF",
+"<X c #99C5EE",
+"1X c #90C3F0",
+"2X c #9CCAF2",
+"3X c #AFD1FF",
+"4X c #B5CFFF",
+"5X c #BCCEFD",
+"6X c #B5D7F5",
+"7X c #B7D9FF",
+"8X c #BBD3FF",
+"9X c #BEE0FF",
+"0X c #C2CECC",
+"qX c #D3D8DC",
+"wX c #CDD4E7",
+"eX c #C3D4FE",
+"rX c #C7DDF4",
+"tX c #C3DDFF",
+"yX c #C8D5FA",
+"uX c #CADCF4",
+"iX c #CEDFFF",
+"pX c #D1D9EA",
+"aX c #DBDAE6",
+"sX c #DEDDE8",
+"dX c #CCEAC4",
+"fX c #D0EEC7",
+"gX c #D2EFC9",
+"hX c #D4F0CB",
+"jX c #CBE1F6",
+"kX c #CDE4F9",
+"lX c #DBE1E1",
+"zX c #D8E0EF",
+"xX c #D4E3FD",
+"cX c #DDE6F9",
+"vX c #E1E7E6",
+"bX c #E4E3ED",
+"nX c #E3EAE7",
+"mX c #E5EBE9",
+"MX c #E6E6F0",
+"NX c #E4E8F1",
+"BX c #EBECF3",
+"VX c #E7F6E2",
+"CX c #E8F6E3",
+"ZX c #EBF0F7",
+"AX c #F0F7EF",
+"SX c #F1F1F6",
+"DX c #F5F5F9",
+"FX c #F1F9F0",
+"GX c #F5FAFE",
+"HX c #FDFDFE",
+"JX c None",
+/* pixels */
+"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXu u t w     JXJXJXJXJXJXJXJXJXJX",
+"JXJXJXJXJXJXJXJXJXJXJXJXJXJXh g n A p w     JXu y t %     JXJXJX",
+"JXJXJXJXJXJXJXJXJXJXJXJXz l m A D D a &   r g b C i &     JXJXJX",
+"JXJXJXJXJXJXJXJXJXJXP c V J G D D K | e f j Z D D i &     JXJXJX",
+"JXJXJXJXJXJXJXJXT P E _ ` L F K ).uXf.N H G D D D M &     JXJXJX",
+"JXJXJXJXJXJXQ W E { } ] U L K.cXJ.I ) ` L F D ..yXH.&     JXJXJX",
+"JXJXJXJXe.~ ( h.l.k.} ' I.xXXX/ [ } ] U L X.5XDXDXH.&     JXJXJX",
+"JXJXi.t.t.b.A.M.l.} P.xXoXy.p.j.a.} ' m.eXHXDXDXDXH.&   ; < ,   ",
+"JXs.s.C.^.Q.A.n./.kX<Xu.c.A.M.j.} j.8XHXHXGXDXDXSXH.* , < < :   ",
+"s.S.].'.^.W.(.xX6Xv.b.Q.Q.B.n.N.8XHXHXHXHXDXDXDXvX7.< < < < :   ",
+"x.,X]._.`.tXHX<XC.'.'.^.W.!.8XHXHXHXHXHXDXDXmX0.6 2 2 < q -X;   ",
+"V.:X>XkXHXGXGXV.,X]._._.3XHXHXHXHXHXHXHXDX|.8 7 7 3 0  XDXSX;   ",
+"C.7XGXHXHXHXkXS.:X:X7XGXHXHXHXHXHXHXHX*X$.+.+.O.#.%XHXHXDXBX;   ",
+"E.HXHXHXHXHXxX~.9XGXHXHXHXHXHXHXHX;X,.&.*.%.@.OXZXHXHXDXSXBX,   ",
+"E.HXHXHXHXHXkX1XHXHXHXHXHXHXHXHXdX=.q.-.=.+XFXHXHXHXDXDXSXbX,   ",
+"E.HXHXHXHXHXkXE.HXHXHXHXHXHXHXHX#Xw.3.{.FXHXHXHXHXDXDXSXSXbX,   ",
+"E.HXHXHXHXHXkXE.HXHXHXHXHXHXHXHX@X}.CXHXHXHXHXHXHXDXDXSXBXsX,   ",
+"R.HXHXHXHXHXkXE.HXHXHXHXHXHXHXHX@XHXHXHXHXHXHXHXHXDXSXBXBXsX,   ",
+"R.HXHXHXHXHXkXT.HXHXHXHXHXHXHXHX#XHXHXHXHXHXHXHXDXDXSXBXBXsX,   ",
+"T.HXHXHXHXHXjXT.HXHXHXHXHXHXHXDX#XHXHXHXHXHXHXHXDXSXBXBXbXsX,   ",
+"Y.HXHXHXHXHXjXT.HXHXHXHXHXHXDXHX#XHXHXHXHXHXHXDXSXSXBXBXbXaX:   ",
+"Y.HXHXHXHXGXjXY.HXHXHXHXHXHXDXDX$XCXHXHXHXHXDXDXSXBXMXbX0X5.:   ",
+"Y.HXHXHXHXHXrXY.HXHXHXHXHXHXDXDX$XdXHXHXHXHXDXSXBXBXqX6., @     ",
+"Y.HXHXHXHXHXDXY.HXHXHXHXHXDXDXSX$XhXHXHXHXDXDXSXlX9.5 @         ",
+"Y.HXHXHXHXDXDXY.HXHXHXHXDXDXDXSX#XgXHXHXHXDXmX[.8 >             ",
+"Y.HXHXGXDXpX .Y.HXHXHXHXHXDXwX .:.gXHXHXSX%X$.1             JXJX",
+"J.GXHXzXG.z = L.HXHXHXHXpXf.k $ >.gXHX=X<.4 X           JXJXJXJX",
+"~ NXU.P -     L.GXHXbXF.z =     2.&X8.9 o           JXJXJXJXJXJX",
+"~ ^ d O       g.ZX.XR s O       4.1.#           JXJXJXJXJXJXJXJX",
+"v +           r.^ d O                       JXJXJXJXJXJXJXJXJXJX",
+"          JXJXY +           JXJX        JXJXJXJXJXJXJXJXJXJXJXJX",
+"      JXJXJXJX          JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX"
+};
--- kdebase-3.5.7.orig/debian/icons/kdeprintfax-16.xpm
+++ kdebase-3.5.7/debian/icons/kdeprintfax-16.xpm
@@ -0,0 +1,190 @@
+/* XPM */
+static char *kdeprintfax-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.@.+.;.%._ _ 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."
+};
--- kdebase-3.5.7.orig/debian/icons/kate-16.xpm
+++ kdebase-3.5.7/debian/icons/kate-16.xpm
@@ -0,0 +1,185 @@
+/* XPM */
+static char *kate-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 163 2",
+"   c black",
+".  c #000002",
+"X  c #050300",
+"o  c #070500",
+"O  c #080500",
+"+  c #00031A",
+"@  c #00071B",
+"#  c #00061C",
+"$  c #00081F",
+"%  c #191603",
+"&  c #1D160E",
+"*  c #1F190E",
+"=  c #000C3B",
+"-  c #372F05",
+";  c #06184E",
+":  c #01165C",
+">  c #01185E",
+",  c #061A5C",
+"<  c #000F60",
+"1  c #001B6C",
+"2  c #503C20",
+"3  c #52470F",
+"4  c #60540D",
+"5  c #67590B",
+"6  c #7A4A2E",
+"7  c #485872",
+"8  c #586265",
+"9  c #596265",
+"0  c #5C6564",
+"q  c #616961",
+"w  c #626961",
+"e  c #0028A6",
+"r  c #002BA7",
+"t  c #012CA8",
+"y  c #022CA9",
+"u  c #0530A9",
+"i  c #0330B2",
+"p  c #1336A4",
+"a  c #1639A4",
+"s  c #173EB2",
+"d  c #173EB3",
+"f  c #103ABD",
+"g  c #2445AF",
+"h  c #2848B1",
+"j  c #2948B2",
+"k  c #3A57A5",
+"l  c #3C58A5",
+"z  c #3054CB",
+"x  c #536EBF",
+"c  c #6078AF",
+"v  c #6178AF",
+"b  c #737CAF",
+"n  c #4665C6",
+"m  c #466BDE",
+"M  c #4A6CDF",
+"N  c #4D70DD",
+"B  c #506AC0",
+"V  c #566EC0",
+"C  c #5775CD",
+"Z  c #5C7BCD",
+"A  c #5673D2",
+"S  c #5476DB",
+"D  c #587BDA",
+"F  c #577AEA",
+"G  c #637DCF",
+"H  c #677ED1",
+"J  c #607FE3",
+"K  c #617EE2",
+"L  c #637FE1",
+"P  c #7D8D9D",
+"I  c #7F8F9D",
+"U  c #6880CF",
+"Y  c #6C81CE",
+"T  c #6781D2",
+"R  c #6681D5",
+"E  c #6584DA",
+"W  c #778ACF",
+"Q  c #7A8EC2",
+"!  c #7B8FC3",
+"~  c #7F97DF",
+"^  c #6282E6",
+"/  c #6383E6",
+"(  c #6583E4",
+")  c #6483E6",
+"_  c #6684E6",
+"`  c #6987E7",
+"'  c #6A87E6",
+"]  c #6C87E4",
+"[  c #6C87E5",
+"{  c #6A86EA",
+"}  c #6E88E5",
+"|  c #6D8CEA",
+" . c #738DE7",
+".. c #748DE6",
+"X. c #728BEB",
+"o. c #708CE8",
+"O. c #7597E1",
+"+. c #7795EC",
+"@. c #7896E8",
+"#. c #7F96E8",
+"$. c #7B98EF",
+"%. c #814712",
+"&. c #804815",
+"*. c #804816",
+"=. c #8F7748",
+"-. c #9E9310",
+";. c #898A5C",
+":. c #FC941C",
+">. c #FF981F",
+",. c #FF9A24",
+"<. c #FF9A25",
+"1. c #FFB407",
+"2. c #FFB507",
+"3. c #FFBF11",
+"4. c #E4BE34",
+"5. c #C79F69",
+"6. c #C29B72",
+"7. c #C7A150",
+"8. c #DEBD65",
+"9. c #FDAE46",
+"0. c #E6D91D",
+"q. c #FFD602",
+"w. c #FFD40A",
+"e. c #FFD40B",
+"r. c #FFD709",
+"t. c #FFEE1C",
+"y. c #FFEF1D",
+"u. c #FFF11B",
+"i. c #FFFB1D",
+"p. c #FFFC1F",
+"a. c #FFF024",
+"s. c #FFF346",
+"d. c #82929D",
+"f. c #9BADB4",
+"g. c #8393D2",
+"h. c #8B9FE2",
+"j. c #90A2DE",
+"k. c #8BA0EA",
+"l. c #9AADEF",
+"z. c #AEBBEF",
+"x. c #A3B4F1",
+"c. c #ACBBF0",
+"v. c #ADBBF0",
+"b. c #B3BFEE",
+"n. c #A2C4F2",
+"m. c #A1C5F4",
+"M. c #AAC6FF",
+"N. c #B3C0F1",
+"B. c #B8C4F1",
+"V. c #BBC7F3",
+"C. c #C4CEF4",
+"Z. c #CDD8EB",
+"A. c #CCD4F6",
+"S. c #CFDBF3",
+"D. c #D1DBF4",
+"F. c #D3DBF6",
+"G. c #D9DFF8",
+"H. c #CDE7FF",
+"J. c #CFEAFF",
+"K. c #E6EAFC",
+"L. c #F1FCFF",
+"P. c gray100",
+"I. c None",
+/* pixels */
+"I.I.I.I.I.I.I.I.I.I.I.I.a.7.& I.",
+"I.I.u r I.i 1 I.I.I.I.y.u.4.=.* ",
+"I.I.s n y E @.: I.I.p.y.e.1.9.2 ",
+"I.r T K.H S.P.@.< -.i.e.1.,.%.X ",
+"I.s b.G.F.j.S.L.f.0.r.1.,.%.  I.",
+"r A V.C.A.B.#.S.s.q.1.>.6   I.I.",
+"f h.v.v.v.b.x.W 8.3.:.6   I.I.I.",
+"7 d.V X.#.h.l.g.b 5.6.Z > I.I.I.",
+"5 9 v ! E ] ..Y H C m.J.| >   I.",
+"O - ;.l H ..] ]  ./ D m.H.F = I.",
+"I.I.3 w d.x E } ( ( N O.M.j # I.",
+"I.I.I.3 8 c g.F ) ( S $.j + I.I.",
+"I.I.I.o - ;.k G } F m g + I.I.I.",
+"I.I.I.I.I.3 q P x M p @ I.I.I.I.",
+"I.I.I.I.I.I.4 0 z a @ I.I.I.I.I.",
+"I.I.I.I.I.I.O % ; $ I.I.I.I.I.I."
+};
--- kdebase-3.5.7.orig/debian/kdebase.README.Debian
+++ kdebase-3.5.7/debian/kdebase.README.Debian
@@ -0,0 +1,60 @@
+Kdm
+===
+
+For notes on kdm, read: /usr/share/doc/kdm/README.Debian
+
+
+KDE and media kioslave support
+==============================
+
+The media kioslave, new in KDE 3.4, supports the automatic mounting of
+removable devices, such as CD-ROM and DVD drives, USB pen drives, digital
+cameras, and many other types of equipment.
+
+While some functionality is available without the use of HAL, media works
+best with HAL (and therefore udev), in combination with pmount. Media
+also extends the functionality of many other kioslaves. Check which
+packages are recommended by the kdebase-kio-plugins package, and install
+accordingly.
+
+Note that for regular users to use media in conjunction with HAL, they must
+be members of the plugdev group (permanently, not through
+/etc/security/group.conf).
+
+
+KControl and Logitech mice
+==========================
+
+In combination with the udev or hotplug packages, KControl supports the
+advanced configuration of many models of Logitech mice, though regular users
+must be members of the plugdev group for this to work.
+
+Additionally, the system's kernel must be 2.6.14 or later if you are using
+udev, though earlier kernels are also supported if the hotplug package is being
+used instead. Kernel hotplugging support is essential, as is usbfs/usbdevfs if
+hotplug is being used.
+
+After installing KControl for the first time, or updating to KControl 3.4.x
+or later from an earlier package, you will need to unplug and then replug
+your mouse, in order to force udev or hotplug to grant special permissions
+to your mouse, so that KControl can perform advanced configuration.
+Rebooting or restarting udev/hotplug will of course accomplish the same
+thing.
+
+
+Installing konsole's bitmap fonts
+=================================
+
+Formerly, the few bitmap fonts KDE included, designed for use with Konsole,
+were shipped as part of the xfonts-konsole package. However, as Konsole no
+longer uses these fonts by default, and most users no longer use bitmap
+fonts at all, KDE now includes these fonts with Konsole itself, and Debian
+has followed this practice, including the fonts in the konsole package, and
+eliminating the xfonts-konsole package entirely.
+
+To make use of these legacy fonts, start Konsole, and under Settings --> Font
+select "Install Bitmap...". This will allow you to copy the legacy Konsole
+fonts to $HOME/.fonts, where, after restarting KDE, all applications run by
+that user, including Konsole, will be able to find them. Also make sure that
+fontconfig is configured to allow the use of bitmap fonts. If you're not sure,
+run, as root, 'dpkg-reconfigure fontconfig' from Konsole.
--- kdebase-3.5.7.orig/debian/kdm.postinst
+++ kdebase-3.5.7/debian/kdm.postinst
@@ -0,0 +1,137 @@
+#! /bin/sh
+
+set -e
+
+# source debconf library
+. /usr/share/debconf/confmodule
+
+# debconf is not a registry, so we only fiddle with the default file if it
+# does not exist
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+  DEFAULT_DISPLAY_MANAGER=
+  if db_get shared/default-x-display-manager; then
+    DEFAULT_DISPLAY_MANAGER="$RET"
+  fi
+  if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
+    DAEMON_NAME=
+    if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
+      DAEMON_NAME="$RET"
+    fi
+    if [ ! -n "$DAEMON_NAME" ]; then
+      # if we were unable to determine the name of the selected daemon (for
+      # instance, if the selected default display manager doesn't provide a
+      # daemon_name question), guess
+      DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null)
+      if [ ! -n "$DAEMON_NAME" ]; then
+        echo .
+        # FIXME - redo this part uses shell-lib.sh from xfree86
+        #warn "unable to determine path to default X display manager" \
+        #     "$DEFAULT_DISPLAY_MANAGER; not updating" \
+        #     "$DEFAULT_DISPLAY_MANAGER_FILE"
+      fi
+    fi
+    if [ -n "$DAEMON_NAME" ]; then
+      # FIXME - redo this part uses shell-lib.sh from xfree86
+      #observe "committing change of default X display manager"
+      echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE"
+    fi
+  fi
+fi
+
+# remove the displaced old default display manager file if it exists
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+  rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
+fi
+
+# restarting the daemon may cause output to stdout
+db_stop
+
+# don't start kdm if we are upgrading without stopping it
+NOSTART=
+if [ -e /var/run/kdm.upgrade ]; then
+  NOSTART=yes
+fi
+# or if we're currently in X on the display it attempts to manage by default
+for HOST in "" \
+            "localhost" \
+            "$(hostname 2> /dev/null)" \
+            "$(hostname -f 2> /dev/null)"; do
+  if echo "$DISPLAY" | grep -q "^$HOST:0.*"; then
+    NOSTART=yes
+    break
+  fi
+done
+# or if it's already running
+if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/kdm.pid --name kdm; then
+  NOSTART=yes
+fi
+# or if the options file says not to
+if ! grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options; then
+  NOSTART=yes
+fi
+
+
+# md5sum of the stock Xservers shipped with KDE 3.3.2, which shipped with Sarge
+SARGEXSERVERS=d3ab063f564492e0e31830f56ccd350e
+
+CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/kde3/kdm/kdmrc | sed s/^ConfigVersion=//`
+
+if [ -e /etc/kde3/kdm/kdmrc ]; then
+  if dpkg --compare-versions "$CONFIGLEVEL" ge "2.3"; then
+    KDMRCUPDATED=yes
+  fi
+fi
+
+if [ -e /etc/kde3/kdm/Xservers ]; then
+  if [ `md5sum /etc/kde3/kdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then
+    XSERVERSUNCHANGED=yes
+  fi
+fi
+
+# With KDE 3.4, /etc/kde3/kdm/Xservers is no longer required, so we remove it, if
+# the user has updated their kdmrc (if they haven't, kdm notices and keeps using
+# Xservers), and if it wasn't touched, i.e. there are no local changes the user
+# will want to merge into kdmrc.
+
+case "$1" in
+
+  configure)
+
+    if [ ! -z $KDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then
+      echo "Removing obsolete /etc/kde3/kdm/Xservers (detected no user changes)."
+      rm -f /etc/kde3/kdm/Xservers
+    elif [ ! -z $KDMRCUPDATED ] && [ -e /etc/kde3/kdm/Xservers ]; then
+      echo "Note that /etc/kde3/kdm/Xservers is no longer used by KDM."
+      echo "You must merge your changes (if any) into /etc/kde3/kdm/kdmrc manually."
+      echo "Otherwise, /etc/kde3/kdm/Xservers is safe to remove."
+    fi
+
+  ;;
+
+  abort-upgrade|abort-remove|abort-deconfigure)
+  ;;
+
+  *)
+  echo "postinst called with unknown argument \`$1'" >&2
+  exit 1
+  ;;
+
+esac
+
+
+if [ -x "/etc/init.d/kdm" ]; then
+  update-rc.d kdm defaults 99 01 >/dev/null
+fi
+
+if [ -n "$NOSTART" ]; then
+  exit 0
+else
+  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+    invoke-rc.d kdm start || true
+  else
+    /etc/init.d/kdm start || true
+  fi
+fi
+
+exit 0
--- kdebase-3.5.7.orig/debian/control.in
+++ kdebase-3.5.7/debian/control.in
@@ -0,0 +1,535 @@
+Source: kdebase
+Section: kde
+Priority: optional
+Maintainer: @@@MAINTAINER@@@
+Uploaders: @@@UPLOADERS@@@
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.7), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
+Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
+Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
+Standards-Version: 3.7.2
+
+Package: kdebase
+Section: kde
+Architecture: all
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), kdebase-bin (>= ${Source-Version}), kdebase-data (>= ${Source-Version}), kdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Recommends: kdm (>= ${Source-Version})
+Suggests: kdebase-doc-html (>= ${Source-Version})
+Description: base components 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 nucleus of KDE, namely the minimal package
+ set necessary to run KDE as a desktop environment. This includes the
+ window manager, taskbar, control center, a text editor, file manager,
+ web browser, X terminal emulator, and many other programs and components.
+
+Package: kappfinder
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase (<< 4:3.0.0)
+Description: non-KDE application finder for KDE
+ kappfinder searches your workstation for many common applications and
+ creates menu entries for them.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kate
+Section: editors
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: kregexpeditor
+Suggests: aspell | ispell | hspell, kate-plugins, khelpcenter, konsole
+Replaces: kdebase-doc (<< 4:3.0.0)
+Description: advanced text editor for KDE
+ Kate is a multi document editor, based on a rewritten version of the kwrite
+ editing widget of KDE.
+ .
+ It is a multi-view editor that lets you view several instances of the same
+ document with all instances being synced, or view more files at the same
+ time for easy reference or simultaneous editing. The terminal emulation
+ and sidebar are docked windows that can be plugged out of the main window,
+ or replaced therein according to your preference.
+ .
+ Some random features:
+ .
+  * Editing of big files
+  * Extensible syntax highlighting
+  * Folding
+  * Dynamic word wrap
+  * Selectable encoding
+  * Filter command
+  * Global grep dialog
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kcontrol
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), usbutils
+Recommends: udev | hotplug
+Suggests: khelpcenter, ntpdate | ntp-simple
+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.0.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.
+ .
+ It is made up of multiple modules. Each module is a separate application,
+ but the control center organizes all of these programs into a convenient
+ location.
+ .
+ In combination with udev or hotplug, KControl supports the advanced
+ configuration of Logitech mice, though the user must be a member of the
+ plugdev group.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-bin
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
+Recommends: gdb
+Suggests: khelpcenter
+Conflicts: kdebase-libs (<< 4:3.0.0), kdm (<< 4:3.4.1-2)
+Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), kdm (= 4:3.3.2-1b)
+Description: core binaries for the KDE base module
+ This package contains miscellaneous programs needed by other
+ KDE applications, particularly those in the KDE base module.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-data
+Section: kde
+Architecture: all
+Conflicts: kcontrol (<< 4:3.4.2-1), kwin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1)
+Replaces: kdebase (<< 4:3.0.0), kdeedu-data (<< 4:3.4.0), kdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.3)
+Description: shared data files for the KDE base module
+ This package contains the architecture-independent shared data files
+ needed for a basic KDE desktop installation.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-dev
+Section: devel
+Architecture: any
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), kdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.6)
+Replaces: kate (<< 4:3.0.0), kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Description: development files for the KDE base module
+ This package contains headers and other development files needed to
+ compile software based on the KDE base module.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-doc
+Section: doc
+Architecture: all
+Replaces: libkonq4-dev (<< 4:3.2.0)
+Description: developer documentation for the KDE base module
+ This package contains documentation for the KDE base module, of
+ use more for developers creating applications than regular users.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdebase
+Description: KDE base 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 base 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/kate/. Documentation is provided for most
+ KDE base packages.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-kio-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdesktop, libsasl2-modules, psmisc
+Recommends: hal, pmount, kamera, kdemultimedia-kio-plugins
+Suggests: khelpcenter, mtools
+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.0.0)
+Description: core I/O slaves for KDE
+ This package includes the base kioslaves. They include, amongst many
+ others, file, http, ftp, smtp, pop and imap.
+ .
+ It also includes the media kioslave, which handles removable devices,
+ and which works best with hal (and therefore udev) and pmount. Media
+ also extends the functionality of many other kioslaves. To use this
+ service, please make sure that your user is a member of the plugdev
+ group.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdepasswd
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: password changer for KDE
+ This is a simple application which allows users to change their
+ system passwords.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdeprint
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, enscript, poster, psutils
+Recommends: kghostview | postscript-viewer
+Suggests: khelpcenter, efax | hylafax-client | mgetty-fax
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Description: print system for KDE
+ This package contains the KDE printing subsystem. It can use CUPS,
+ lpd-ng or the traditional lpd. It also includes support for fax and
+ pdf printing.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+ .
+ Homepage: http://printing.kde.org
+
+Package: kdesktop
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), eject
+Replaces: kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Description: miscellaneous binaries and files for the KDE desktop
+ This package contains miscellaneous binaries and files integral to
+ the KDE desktop.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdm
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
+Recommends: logrotate, xserver-xorg
+Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu
+Provides: x-display-manager
+Description: X display manager for KDE
+ kdm manages a collection of X servers, which may be on the local host or
+ remote machines. It provides services similar to those provided by init,
+ getty, and login on character-based terminals: prompting for login name and
+ password, authenticating the user, and running a session. kdm supports XDMCP
+ (X Display Manager Control Protocol) and can also be used to run a chooser
+ process which presents the user with a menu of possible hosts that offer
+ XDMCP display management.
+ .
+ A collection of icons to associate with individual users is included with
+ KDE, but as part of the kdepasswd package.
+ .
+ The menu package will help to provide KDM with a list of window managers
+ that can be launched, if the window manager does not register with KDM
+ already. Most users won't need this.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kfind
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Conflicts: kdebase-libs (<< 4:3.0.0)
+Replaces: kdebase (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
+Description: file-find utility for KDE 
+ kfind can be used to find files and directories on your
+ workstations.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: khelpcenter
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, htdig
+Replaces: kdebase-doc (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Description: help center for KDE
+ The KDE Help Center provides documentation on how to use the KDE desktop.
+ .
+ The htdig package is needed to build a searchable archive of KDE
+ documentation.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kicker
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kicker-applets, menu
+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.0.0)
+Description: desktop panel for KDE
+ Kicker provides the KDE panel on you desktop. It can be used as a
+ program launcher and can load plugins to provide additional
+ functionality.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: klipper
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Description: clipboard utility for KDE
+ klipper provides standard clipboard functions (cut and paste, history
+ saving) plus additional features, like the ability to offer actions to 
+ take dependent on the clipboard contents. For example, it can launch a 
+ web browser if the clipboard contains a URL.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kmenuedit
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Description: menu editor for KDE
+ The KDE menu editor allows you to make customisations to the KDE menu
+ structure.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: konqueror
+Section: web
+Architecture: any
+Provides: info-browser, man-browser, www-browser
+Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), kdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
+Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt, libjessie-java
+Conflicts: kdebase-audiolibs (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
+Replaces: kdebase (<< 4:3.0.0), kdebase-audiolibs (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
+Description: KDE's advanced file manager, web browser and document viewer
+ Konqueror is the file manager for the K Desktop Environment.
+ It supports basic file management on local UNIX filesystems,
+ from simple cut/copy and paste operations to advanced remote
+ and local network file browsing.
+ .
+ It is also the canvas for all the latest KDE technology,
+ from KIO slaves (which provide mechanisms for file access) to
+ component embedding via the KParts object interface, and it
+ is one of the most customizable applications available.
+ .
+ Konqueror is an Open Source web browser with HTML4.0 compliance,
+ supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
+ as well as Netscape plugins (for example, Flash or RealVideo plugins).
+ .
+ It is a universal viewing application, capable of embedding
+ read-only viewing components in itself to view documents without
+ ever launching another application.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+ .
+ Homepage: http://konqueror.kde.org
+
+Package: konqueror-nsplugins
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: konqueror (<< 4:3.0.0)
+Description: Netscape plugin support for Konqueror
+ This package includes support for Netscape plugins in Konqueror.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: konsole
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase (<< 4:3.0.0)
+Suggests: khelpcenter
+Provides: x-terminal-emulator
+Description: X terminal emulator for KDE
+ Konsole is an X terminal emulation which provides a command-line interface
+ (CLI) while using the graphical K Desktop Environment. Konsole helps to
+ better organize user's desktop by containing multiple sessions in a single
+ window (a less cluttered desktop).
+ .
+ Its advanced features include a simple configuration and the ability to use
+ multiple terminal shells in a single window
+ .
+ Using Konsole, a user can open:
+ .
+  Linux console sessions
+  Midnight Commander file manager sessions
+  Shell sessions
+  Root consoles sessions
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kpager
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Description: desktop pager for KDE
+ This package contains KDE's desktop pager, which displays your virtual
+ desktops iconically in a window, along with icons of any running
+ applications. It is used to switch between applications or desktops.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kpersonalizer
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3})
+Replaces: kdebase (<< 4:3.0.0)
+Description: installation personalizer for KDE
+ KDE Personalizer is the application that configures the KDE desktop for you.
+ It's a very useful wizard that allows you to quickly change the KDE desktop to
+ suit your own needs. When you run KDE for the first time, KPersonalizer is
+ automatically started. KPersonalizer can also be called later.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ksmserver
+Section: kde
+Architecture: any
+Provides: x-session-manager
+Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager
+Recommends: kpersonalizer (= ${Source-Version})
+Replaces: kdebase (<< 4:3.0.0)
+Description: session manager for KDE
+ This package contains the KDE session manager. It is responsible for
+ restoring your KDE session on login. It is also needed to properly
+ start a KDE session. It registers KDE with X display managers, and
+ provides the 'startkde' command, for starting an X session with KDE
+ from the console.
+ .
+ If you are running KDE for the first time for a certain user,
+ kpersonalizer is used to help with setup. If it is not present,
+ KDE will start, but many good defaults will not be set.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ksplash
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter
+Replaces: kdebase (<< 4:3.0.0)
+Description: the KDE splash screen
+ This package includes the KDE Splash screen, which is seen when
+ a KDE session is launched.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ksysguard
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ksysguardd (= ${Source-Version})
+Suggests: khelpcenter
+Conflicts: kpm (<< 4:3.0.0)
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kpm (<< 4:3.0.0)
+Description: system guard for KDE
+ KDE System Guard allows you to monitor various statistics about your
+ computer.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ksysguardd
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase (<< 4:3.0.0)
+Description: system guard daemon for KDE
+ KDE System Guard Daemon is the daemon part of ksysguard. The daemon can
+ be installed on a remote machine to enable ksysguard on another machine
+ to monitor it through the daemon running there.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ktip
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase (<< 4:3.0.0)
+Description: useful tips for KDE
+ ktip provides many useful tips on using KDE when you log in.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kwin
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Provides: x-window-manager
+Suggests: kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version})
+Replaces: kdeartwork-theme-window (<< 4:3.4.0), kdebase (<< 4:3.0.0)
+Description: the KDE window manager
+ This package contains the default X window manager for KDE.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: libkonq4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: kdebase-libs (<< 4:3.0.0)
+Replaces: kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Description: core libraries for Konqueror
+ These libraries are used by several KDE applications, most notably
+ Konqueror and the kdesktop package.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: libkonq4-dev
+Section: libdevel
+Architecture: any
+Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.6)
+Conflicts: libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
+Replaces: kdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
+Description: development files for Konqueror's core libraries
+ This package contains headers and other development files for the core
+ Konqueror libraries.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: libkonq4 (= ${Source-Version}), kdelibs-dbg
+Description: debugging symbols for kdebase
+ This package contains the debugging symbols associated with kdebase.
+ They will automatically be used by gdb for debugging kdebase-related
+ issues.
--- kdebase-3.5.7.orig/debian/control
+++ kdebase-3.5.7/debian/control
@@ -0,0 +1,535 @@
+Source: kdebase
+Section: kde
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.7), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
+Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
+Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
+Standards-Version: 3.7.2
+
+Package: kdebase
+Section: kde
+Architecture: all
+Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), kdebase-bin (>= ${Source-Version}), kdebase-data (>= ${Source-Version}), kdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), kwin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd
+Recommends: kdm (>= ${Source-Version})
+Suggests: kdebase-doc-html (>= ${Source-Version})
+Description: base components 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 nucleus of KDE, namely the minimal package
+ set necessary to run KDE as a desktop environment. This includes the
+ window manager, taskbar, control center, a text editor, file manager,
+ web browser, X terminal emulator, and many other programs and components.
+
+Package: kappfinder
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase (<< 4:3.0.0)
+Description: non-KDE application finder for KDE
+ kappfinder searches your workstation for many common applications and
+ creates menu entries for them.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kate
+Section: editors
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: kregexpeditor
+Suggests: aspell | ispell | hspell, kate-plugins, khelpcenter, konsole
+Replaces: kdebase-doc (<< 4:3.0.0)
+Description: advanced text editor for KDE
+ Kate is a multi document editor, based on a rewritten version of the kwrite
+ editing widget of KDE.
+ .
+ It is a multi-view editor that lets you view several instances of the same
+ document with all instances being synced, or view more files at the same
+ time for easy reference or simultaneous editing. The terminal emulation
+ and sidebar are docked windows that can be plugged out of the main window,
+ or replaced therein according to your preference.
+ .
+ Some random features:
+ .
+  * Editing of big files
+  * Extensible syntax highlighting
+  * Folding
+  * Dynamic word wrap
+  * Selectable encoding
+  * Filter command
+  * Global grep dialog
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kcontrol
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), usbutils
+Recommends: udev | hotplug
+Suggests: khelpcenter, ntpdate | ntp-simple
+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.0.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.
+ .
+ It is made up of multiple modules. Each module is a separate application,
+ but the control center organizes all of these programs into a convenient
+ location.
+ .
+ In combination with udev or hotplug, KControl supports the advanced
+ configuration of Logitech mice, though the user must be a member of the
+ plugdev group.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-bin
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
+Recommends: gdb
+Suggests: khelpcenter
+Conflicts: kdebase-libs (<< 4:3.0.0), kdm (<< 4:3.4.1-2)
+Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), kdm (= 4:3.3.2-1b)
+Description: core binaries for the KDE base module
+ This package contains miscellaneous programs needed by other
+ KDE applications, particularly those in the KDE base module.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-data
+Section: kde
+Architecture: all
+Conflicts: kcontrol (<< 4:3.4.2-1), kwin (<< 4:3.4.2-1), kicker (<< 4:3.4.2-1)
+Replaces: kdebase (<< 4:3.0.0), kdeedu-data (<< 4:3.4.0), kdelibs-data (<< 4:3.3.0), kdewallpapers (<< 4:3.0.0), kcontrol (<< 4:3.5.3)
+Description: shared data files for the KDE base module
+ This package contains the architecture-independent shared data files
+ needed for a basic KDE desktop installation.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-dev
+Section: devel
+Architecture: any
+Depends: kate (= ${Source-Version}), kcontrol (= ${Source-Version}), kdebase-bin (= ${Source-Version}), kdeprint (= ${Source-Version}), kdesktop (= ${Source-Version}), khelpcenter (= ${Source-Version}), kicker (= ${Source-Version}), klipper (= ${Source-Version}), kmenuedit (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), konsole (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version}), ksysguard (= ${Source-Version}), kwin (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.6)
+Replaces: kate (<< 4:3.0.0), kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Description: development files for the KDE base module
+ This package contains headers and other development files needed to
+ compile software based on the KDE base module.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-doc
+Section: doc
+Architecture: all
+Replaces: libkonq4-dev (<< 4:3.2.0)
+Description: developer documentation for the KDE base module
+ This package contains documentation for the KDE base module, of
+ use more for developers creating applications than regular users.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdebase
+Description: KDE base 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 base 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/kate/. Documentation is provided for most
+ KDE base packages.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-kio-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdesktop, libsasl2-modules, psmisc
+Recommends: hal, pmount, kamera, kdemultimedia-kio-plugins
+Suggests: khelpcenter, mtools
+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.0.0)
+Description: core I/O slaves for KDE
+ This package includes the base kioslaves. They include, amongst many
+ others, file, http, ftp, smtp, pop and imap.
+ .
+ It also includes the media kioslave, which handles removable devices,
+ and which works best with hal (and therefore udev) and pmount. Media
+ also extends the functionality of many other kioslaves. To use this
+ service, please make sure that your user is a member of the plugdev
+ group.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdepasswd
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: password changer for KDE
+ This is a simple application which allows users to change their
+ system passwords.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdeprint
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, enscript, poster, psutils
+Recommends: kghostview | postscript-viewer
+Suggests: khelpcenter, efax | hylafax-client | mgetty-fax
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Description: print system for KDE
+ This package contains the KDE printing subsystem. It can use CUPS,
+ lpd-ng or the traditional lpd. It also includes support for fax and
+ pdf printing.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+ .
+ Homepage: http://printing.kde.org
+
+Package: kdesktop
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), eject
+Replaces: kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Description: miscellaneous binaries and files for the KDE desktop
+ This package contains miscellaneous binaries and files integral to
+ the KDE desktop.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdm
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
+Recommends: logrotate, xserver-xorg
+Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu
+Provides: x-display-manager
+Description: X display manager for KDE
+ kdm manages a collection of X servers, which may be on the local host or
+ remote machines. It provides services similar to those provided by init,
+ getty, and login on character-based terminals: prompting for login name and
+ password, authenticating the user, and running a session. kdm supports XDMCP
+ (X Display Manager Control Protocol) and can also be used to run a chooser
+ process which presents the user with a menu of possible hosts that offer
+ XDMCP display management.
+ .
+ A collection of icons to associate with individual users is included with
+ KDE, but as part of the kdepasswd package.
+ .
+ The menu package will help to provide KDM with a list of window managers
+ that can be launched, if the window manager does not register with KDM
+ already. Most users won't need this.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kfind
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Conflicts: kdebase-libs (<< 4:3.0.0)
+Replaces: kdebase (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
+Description: file-find utility for KDE 
+ kfind can be used to find files and directories on your
+ workstations.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: khelpcenter
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, htdig
+Replaces: kdebase-doc (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Description: help center for KDE
+ The KDE Help Center provides documentation on how to use the KDE desktop.
+ .
+ The htdig package is needed to build a searchable archive of KDE
+ documentation.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kicker
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter, kicker-applets, menu
+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.0.0)
+Description: desktop panel for KDE
+ Kicker provides the KDE panel on you desktop. It can be used as a
+ program launcher and can load plugins to provide additional
+ functionality.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: klipper
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Description: clipboard utility for KDE
+ klipper provides standard clipboard functions (cut and paste, history
+ saving) plus additional features, like the ability to offer actions to 
+ take dependent on the clipboard contents. For example, it can launch a 
+ web browser if the clipboard contains a URL.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kmenuedit
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Description: menu editor for KDE
+ The KDE menu editor allows you to make customisations to the KDE menu
+ structure.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: konqueror
+Section: web
+Architecture: any
+Provides: info-browser, man-browser, www-browser
+Depends: ${shlibs:Depends}, kcontrol (= ${Source-Version}), kdebase-kio-plugins (= ${Source-Version}), kdesktop (= ${Source-Version}), kfind (= ${Source-Version})
+Suggests: khelpcenter, konq-plugins, ksvg, gij-4.1, libgcj7-awt, libjessie-java
+Conflicts: kdebase-audiolibs (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
+Replaces: kdebase (<< 4:3.0.0), kdebase-audiolibs (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
+Description: KDE's advanced file manager, web browser and document viewer
+ Konqueror is the file manager for the K Desktop Environment.
+ It supports basic file management on local UNIX filesystems,
+ from simple cut/copy and paste operations to advanced remote
+ and local network file browsing.
+ .
+ It is also the canvas for all the latest KDE technology,
+ from KIO slaves (which provide mechanisms for file access) to
+ component embedding via the KParts object interface, and it
+ is one of the most customizable applications available.
+ .
+ Konqueror is an Open Source web browser with HTML4.0 compliance,
+ supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
+ as well as Netscape plugins (for example, Flash or RealVideo plugins).
+ .
+ It is a universal viewing application, capable of embedding
+ read-only viewing components in itself to view documents without
+ ever launching another application.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+ .
+ Homepage: http://konqueror.kde.org
+
+Package: konqueror-nsplugins
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: konqueror (<< 4:3.0.0)
+Description: Netscape plugin support for Konqueror
+ This package includes support for Netscape plugins in Konqueror.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: konsole
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase (<< 4:3.0.0)
+Suggests: khelpcenter
+Provides: x-terminal-emulator
+Description: X terminal emulator for KDE
+ Konsole is an X terminal emulation which provides a command-line interface
+ (CLI) while using the graphical K Desktop Environment. Konsole helps to
+ better organize user's desktop by containing multiple sessions in a single
+ window (a less cluttered desktop).
+ .
+ Its advanced features include a simple configuration and the ability to use
+ multiple terminal shells in a single window
+ .
+ Using Konsole, a user can open:
+ .
+  Linux console sessions
+  Midnight Commander file manager sessions
+  Shell sessions
+  Root consoles sessions
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kpager
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Description: desktop pager for KDE
+ This package contains KDE's desktop pager, which displays your virtual
+ desktops iconically in a window, along with icons of any running
+ applications. It is used to switch between applications or desktops.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kpersonalizer
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3})
+Replaces: kdebase (<< 4:3.0.0)
+Description: installation personalizer for KDE
+ KDE Personalizer is the application that configures the KDE desktop for you.
+ It's a very useful wizard that allows you to quickly change the KDE desktop to
+ suit your own needs. When you run KDE for the first time, KPersonalizer is
+ automatically started. KPersonalizer can also be called later.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ksmserver
+Section: kde
+Architecture: any
+Provides: x-session-manager
+Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager
+Recommends: kpersonalizer (= ${Source-Version})
+Replaces: kdebase (<< 4:3.0.0)
+Description: session manager for KDE
+ This package contains the KDE session manager. It is responsible for
+ restoring your KDE session on login. It is also needed to properly
+ start a KDE session. It registers KDE with X display managers, and
+ provides the 'startkde' command, for starting an X session with KDE
+ from the console.
+ .
+ If you are running KDE for the first time for a certain user,
+ kpersonalizer is used to help with setup. If it is not present,
+ KDE will start, but many good defaults will not be set.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ksplash
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3})
+Suggests: khelpcenter
+Replaces: kdebase (<< 4:3.0.0)
+Description: the KDE splash screen
+ This package includes the KDE Splash screen, which is seen when
+ a KDE session is launched.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ksysguard
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ksysguardd (= ${Source-Version})
+Suggests: khelpcenter
+Conflicts: kpm (<< 4:3.0.0)
+Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kpm (<< 4:3.0.0)
+Description: system guard for KDE
+ KDE System Guard allows you to monitor various statistics about your
+ computer.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ksysguardd
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase (<< 4:3.0.0)
+Description: system guard daemon for KDE
+ KDE System Guard Daemon is the daemon part of ksysguard. The daemon can
+ be installed on a remote machine to enable ksysguard on another machine
+ to monitor it through the daemon running there.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: ktip
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase (<< 4:3.0.0)
+Description: useful tips for KDE
+ ktip provides many useful tips on using KDE when you log in.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kwin
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Provides: x-window-manager
+Suggests: kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), kpager (= ${Source-Version}), kpersonalizer (= ${Source-Version}), ksmserver (= ${Source-Version}), ksplash (= ${Source-Version})
+Replaces: kdeartwork-theme-window (<< 4:3.4.0), kdebase (<< 4:3.0.0)
+Description: the KDE window manager
+ This package contains the default X window manager for KDE.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: libkonq4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: kdebase-libs (<< 4:3.0.0)
+Replaces: kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
+Description: core libraries for Konqueror
+ These libraries are used by several KDE applications, most notably
+ Konqueror and the kdesktop package.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: libkonq4-dev
+Section: libdevel
+Architecture: any
+Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.6)
+Conflicts: libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
+Replaces: kdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
+Description: development files for Konqueror's core libraries
+ This package contains headers and other development files for the core
+ Konqueror libraries.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
+Package: kdebase-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: libkonq4 (= ${Source-Version}), kdelibs-dbg
+Description: debugging symbols for kdebase
+ This package contains the debugging symbols associated with kdebase.
+ They will automatically be used by gdb for debugging kdebase-related
+ issues.
--- kdebase-3.5.7.orig/debian/kdm.dirs
+++ kdebase-3.5.7/debian/kdm.dirs
@@ -0,0 +1,2 @@
+etc/default/kdm.d
+var/lib/kdm
--- kdebase-3.5.7.orig/debian/konsole.preinst
+++ kdebase-3.5.7/debian/konsole.preinst
@@ -0,0 +1,24 @@
+#! /bin/sh -e
+
+case "$1" in
+
+    upgrade)
+	rm -f /etc/kde3/konsolerc
+    ;;
+
+    install)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
--- kdebase-3.5.7.orig/debian/konsole.manpages
+++ kdebase-3.5.7/debian/konsole.manpages
@@ -0,0 +1 @@
+debian/man/konsole.1
--- kdebase-3.5.7.orig/debian/libkonq4.install
+++ kdebase-3.5.7/debian/libkonq4.install
@@ -0,0 +1,16 @@
+debian/tmp/usr/lib/kde3/kded_favicons.la
+debian/tmp/usr/lib/kde3/kded_favicons.so
+debian/tmp/usr/lib/kde3/konq_sound.la
+debian/tmp/usr/lib/kde3/konq_sound.so
+debian/tmp/usr/lib/libkonq.so.4
+debian/tmp/usr/lib/libkonq.so.4.2.0
+debian/tmp/usr/share/apps/kbookmark/directory_bookmarkbar.desktop
+debian/tmp/usr/share/apps/kconf_update/favicons.upd
+debian/tmp/usr/share/apps/kconf_update/move_favicons.sh
+debian/tmp/usr/share/apps/konqueror/pics/arrow_bottomleft.png
+debian/tmp/usr/share/apps/konqueror/pics/arrow_bottomright.png
+debian/tmp/usr/share/apps/konqueror/pics/arrow_topleft.png
+debian/tmp/usr/share/apps/konqueror/pics/arrow_topright.png
+debian/tmp/usr/share/apps/konqueror/pics/thumbnailfont_7x4.png
+debian/tmp/usr/share/services/kded/favicons.desktop
+debian/tmp/usr/share/servicetypes/konqpopupmenuplugin.desktop
--- kdebase-3.5.7.orig/debian/kdebase-doc-html.doc-base.kicker
+++ kdebase-3.5.7/debian/kdebase-doc-html.doc-base.kicker
@@ -0,0 +1,11 @@
+Document: kdebase-doc-html-kicker
+Title: Kicker Handbook
+Author: Orville Bennett, Dirk Doerflinger
+Abstract: Kicker is the KDE application starter panel and is also capable of
+ some useful applets and extensions.
+Section: Apps/Utils
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kicker/index.html
+Files: /usr/share/doc/kde/HTML/en/kicker/*.html
+
--- kdebase-3.5.7.orig/debian/kwin.lintian
+++ kdebase-3.5.7/debian/kwin.lintian
@@ -0,0 +1,2 @@
+kwin: shlib-missing-in-control-file libkdeinit_kwin.so usr/lib/libkdeinit_kwin.so
+kwin: shlib-missing-in-control-file libkdeinit_kwin_rules_dialog.so usr/lib/libkdeinit_kwin_rules_dialog.so
--- kdebase-3.5.7.orig/debian/libkonq4.docs
+++ kdebase-3.5.7/debian/libkonq4.docs
@@ -0,0 +1 @@
+libkonq/SERVICEMENUS
--- kdebase-3.5.7.orig/debian/konsole.README.Debian
+++ kdebase-3.5.7/debian/konsole.README.Debian
@@ -0,0 +1,16 @@
+Installing konsole's bitmap fonts
+=================================
+
+Formerly, the few bitmap fonts KDE included, designed for use with Konsole,
+were shipped as part of the xfonts-konsole package. However, as Konsole no
+longer uses these fonts by default, and most users no longer use bitmap
+fonts at all, KDE now includes these fonts with Konsole itself, and Debian
+has followed this practice, including the fonts in the konsole package, and
+eliminating the xfonts-konsole package entirely.
+
+To make use of these legacy fonts, start Konsole, and under Settings --> Font
+select "Install Bitmap...". This will allow you to copy the legacy Konsole
+fonts to $HOME/.fonts, where, after restarting KDE, all applications run by
+that user, including Konsole, will be able to find them. Also make sure that
+fontconfig is configured to allow the use of bitmap fonts. If you're not sure,
+run, as root, 'dpkg-reconfigure fontconfig' from Konsole.
--- kdebase-3.5.7.orig/debian/klipper.install
+++ kdebase-3.5.7/debian/klipper.install
@@ -0,0 +1,28 @@
+debian/tmp/etc/kde3/klipperrc
+debian/tmp/usr/bin/klipper
+debian/tmp/usr/lib/kde3/klipper.la
+debian/tmp/usr/lib/kde3/klipper_panelapplet.la
+debian/tmp/usr/lib/kde3/klipper_panelapplet.so
+debian/tmp/usr/lib/kde3/klipper.so
+debian/tmp/usr/lib/libkdeinit_klipper.so
+debian/tmp/usr/share/applications/kde/klipper.desktop
+debian/tmp/usr/share/apps/kconf_update/klipper-1-2.pl
+debian/tmp/usr/share/apps/kconf_update/klipper-kde31.sh
+debian/tmp/usr/share/apps/kconf_update/klipperrc.upd
+debian/tmp/usr/share/apps/kconf_update/klippershortcuts.upd
+debian/tmp/usr/share/apps/kicker/applets/klipper.desktop
+debian/tmp/usr/share/autostart/klipper.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/klipper/common
+debian/tmp/usr/share/doc/kde/HTML/en/klipper/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/klipper/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/klipper/screenshot.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/klipper.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/klipper.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/klipper.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/klipper.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/klipper.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/klipper.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/klipper.svgz
+
+debian/icons/klipper.xpm		/usr/share/pixmaps
+debian/icons/klipper-16.xpm		/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/kappfinder.menu
+++ kdebase-3.5.7/debian/kappfinder.menu
@@ -0,0 +1,11 @@
+?package(kappfinder):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="kAppfinder"\
+	icon32x32="/usr/share/pixmaps/kappfinder.xpm"\
+	icon16x16="/usr/share/pixmaps/kappfinder-16.xpm"\
+	command="/usr/bin/kappfinder"
+
+# Icon 32x32 kappfinder/cr32-app-kappfinder.png kappfinder.xpm
+# Icon 16x16 kappfinder/cr16-app-kappfinder.png kappfinder-16.xpm
--- kdebase-3.5.7.orig/debian/kdm.manpages
+++ kdebase-3.5.7/debian/kdm.manpages
@@ -0,0 +1,7 @@
+debian/local/kdm.options.5
+debian/man/genkdmconf.1
+debian/man/kdm.1
+debian/man/kdm_config.1
+debian/man/kdmctl.1
+debian/man/kdm_greet.1
+debian/man/krootimage.1
--- kdebase-3.5.7.orig/debian/ksysguard.install
+++ kdebase-3.5.7/debian/ksysguard.install
@@ -0,0 +1,36 @@
+debian/tmp/usr/bin/kpm
+debian/tmp/usr/bin/ksysguard
+debian/tmp/usr/lib/kde3/sysguard_panelapplet.la
+debian/tmp/usr/lib/kde3/sysguard_panelapplet.so
+debian/tmp/usr/lib/libksgrd.so.1
+debian/tmp/usr/lib/libksgrd.so.1.2.0
+debian/tmp/usr/share/applications/kde/ksysguard.desktop
+debian/tmp/usr/share/apps/kicker/applets/ksysguardapplet.desktop
+debian/tmp/usr/share/apps/ksysguard/eventsrc
+debian/tmp/usr/share/apps/ksysguard/KSysGuardApplet.xml
+debian/tmp/usr/share/apps/ksysguard/ksysguardui.rc
+debian/tmp/usr/share/apps/ksysguard/pics/computer.png
+debian/tmp/usr/share/apps/ksysguard/pics/daemon.png
+debian/tmp/usr/share/apps/ksysguard/pics/kdeapp.png
+debian/tmp/usr/share/apps/ksysguard/pics/kernel.png
+debian/tmp/usr/share/apps/ksysguard/pics/ksysguardd.png
+debian/tmp/usr/share/apps/ksysguard/pics/running.png
+debian/tmp/usr/share/apps/ksysguard/pics/shell.png
+debian/tmp/usr/share/apps/ksysguard/pics/tools.png
+debian/tmp/usr/share/apps/ksysguard/pics/unknownapp.png
+debian/tmp/usr/share/apps/ksysguard/pics/waiting.png
+debian/tmp/usr/share/apps/ksysguard/pics/X.png
+debian/tmp/usr/share/apps/ksysguard/ProcessTable.sgrd
+debian/tmp/usr/share/apps/ksysguard/SystemLoad.sgrd
+debian/tmp/usr/share/doc/kde/HTML/en/ksysguard/common
+debian/tmp/usr/share/doc/kde/HTML/en/ksysguard/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/ksysguard/index.docbook
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/ksysguard.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/ksysguard.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/ksysguard.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/ksysguard.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/ksysguard.png
+debian/tmp/usr/share/mimelnk/application/x-ksysguard.desktop
+
+debian/icons/ksysguard.xpm		/usr/share/pixmaps
+debian/icons/ksysguard-16.xpm		/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/konsole.prerm
+++ kdebase-3.5.7/debian/konsole.prerm
@@ -0,0 +1,44 @@
+#! /bin/sh
+# prerm script for konsole
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+        /usr/sbin/update-alternatives --remove x-terminal-emulator /usr/bin/konsole
+    ;;
+
+    upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm 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
+
+
--- kdebase-3.5.7.orig/debian/kpersonalizer.install
+++ kdebase-3.5.7/debian/kpersonalizer.install
@@ -0,0 +1,13 @@
+debian/tmp/usr/bin/kpersonalizer
+debian/tmp/usr/share/applications/kde/kpersonalizer.desktop
+debian/tmp/usr/share/applnk/System/kpersonalizer.desktop
+debian/tmp/usr/share/apps/kpersonalizer/pics/step1.png
+debian/tmp/usr/share/apps/kpersonalizer/pics/step2.png
+debian/tmp/usr/share/apps/kpersonalizer/pics/step3.png
+debian/tmp/usr/share/apps/kpersonalizer/pics/step4.png
+debian/tmp/usr/share/apps/kpersonalizer/pics/step5.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpersonalizer.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpersonalizer.png
+
+debian/icons/kpersonalizer.xpm		/usr/share/pixmaps
+debian/icons/kpersonalizer-16.xpm	/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/ksmserver.lintian
+++ kdebase-3.5.7/debian/ksmserver.lintian
@@ -0,0 +1,2 @@
+ksmserver: no-shlibs-control-file usr/lib/libkdeinit_ksmserver.so
+ksmserver: postinst-must-call-ldconfig usr/lib/libkdeinit_ksmserver.so
--- kdebase-3.5.7.orig/debian/kdebase-doc-html.doc-base.ksysguard
+++ kdebase-3.5.7/debian/kdebase-doc-html.doc-base.ksysguard
@@ -0,0 +1,11 @@
+Document: kdebase-doc-html-ksysguard
+Title: KSysGuard Handbook
+Author: Chris Schlaeger
+Abstract: KSysGuard is a network enabled task manager and system monitor
+ application, with the additional functionality of top.
+Section: Apps/System
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ksysguard/index.html
+Files: /usr/share/doc/kde/HTML/en/ksysguard/*.html
+
--- kdebase-3.5.7.orig/debian/kdm.preinst
+++ kdebase-3.5.7/debian/kdm.preinst
@@ -0,0 +1,29 @@
+#! /bin/sh -e
+
+case "$1" in
+
+    upgrade)
+	rm -f /etc/kde3/debian/kdm-update-menu.sh
+	rm -f /etc/kde3/debian/kdm.options
+	rm -f /etc/kde3/kdm/pixmaps/XFree86bw.xpm
+	rm -f /etc/kde3/kdm/pixmaps/XFree86.xpm
+	rm -f /etc/kde3/kdm/Xresources
+	rm -f /etc/menu-methods/kdm
+    ;;
+
+    install)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
--- kdebase-3.5.7.orig/debian/konqueror.manpages
+++ kdebase-3.5.7/debian/konqueror.manpages
@@ -0,0 +1,3 @@
+debian/man/konqueror.1
+debian/man/kfmclient.1
+debian/man/keditbookmarks.1
--- kdebase-3.5.7.orig/debian/konqueror.prerm
+++ kdebase-3.5.7/debian/konqueror.prerm
@@ -0,0 +1,22 @@
+#! /bin/sh -e
+
+case "$1" in
+    remove)
+        /usr/sbin/update-alternatives --remove x-www-browser /usr/bin/konqueror
+    ;;
+
+    upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- kdebase-3.5.7.orig/debian/kdebase-doc-html.doc-base.klipper
+++ kdebase-3.5.7/debian/kdebase-doc-html.doc-base.klipper
@@ -0,0 +1,10 @@
+Document: kdebase-doc-html-klipper
+Title: Klipper Handbook
+Author: Philip.Rodrigues
+Abstract: Klipper is the KDE clipboard cut and paste utility.
+Section: Apps/Utils
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/klipper/index.html
+Files: /usr/share/doc/kde/HTML/en/klipper/*.html
+
--- kdebase-3.5.7.orig/debian/libkonq4-dev.install
+++ kdebase-3.5.7/debian/libkonq4-dev.install
@@ -0,0 +1,23 @@
+debian/tmp/usr/include/kde/kfileivi.h
+debian/tmp/usr/include/kde/kivdirectoryoverlay.h
+debian/tmp/usr/include/kde/knewmenu.h
+debian/tmp/usr/include/kde/konqbookmarkmanager.h
+debian/tmp/usr/include/kde/konq_defaults.h
+debian/tmp/usr/include/kde/konq_dirpart.h
+debian/tmp/usr/include/kde/konq_drag.h
+debian/tmp/usr/include/kde/konq_events.h
+debian/tmp/usr/include/kde/konq_faviconmgr.h
+debian/tmp/usr/include/kde/konq_filetip.h
+debian/tmp/usr/include/kde/konq_historycomm.h
+debian/tmp/usr/include/kde/konq_historymgr.h
+debian/tmp/usr/include/kde/konq_iconviewwidget.h
+debian/tmp/usr/include/kde/konq_operations.h
+debian/tmp/usr/include/kde/konq_pixmapprovider.h
+debian/tmp/usr/include/kde/konq_popupmenu.h
+debian/tmp/usr/include/kde/konq_propsview.h
+debian/tmp/usr/include/kde/konq_settings.h
+debian/tmp/usr/include/kde/konq_undo.h
+debian/tmp/usr/include/kde/konq_xmlguiclient.h
+debian/tmp/usr/include/kde/libkonq_export.h
+debian/tmp/usr/lib/libkonq.la
+debian/tmp/usr/lib/libkonq.so
--- kdebase-3.5.7.orig/debian/kpager.manpages
+++ kdebase-3.5.7/debian/kpager.manpages
@@ -0,0 +1 @@
+debian/man/kpager.1
--- kdebase-3.5.7.orig/debian/ksysguardd.install
+++ kdebase-3.5.7/debian/ksysguardd.install
@@ -0,0 +1,2 @@
+debian/tmp/etc/ksysguarddrc
+debian/tmp/usr/bin/ksysguardd
--- kdebase-3.5.7.orig/debian/kdesktop.install
+++ kdebase-3.5.7/debian/kdesktop.install
@@ -0,0 +1,72 @@
+debian/tmp/etc/kde3/kdesktop_custom_menu1
+debian/tmp/etc/kde3/kdesktop_custom_menu2
+debian/tmp/usr/bin/kcheckrunning
+debian/tmp/usr/bin/kdeeject
+debian/tmp/usr/bin/kdesktop
+debian/tmp/usr/bin/kdesktop_lock
+debian/tmp/usr/bin/kwebdesktop
+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/patterns/fish.desktop
+debian/tmp/usr/share/apps/kdesktop/patterns/fish.png
+debian/tmp/usr/share/apps/kdesktop/patterns/flowers.desktop
+debian/tmp/usr/share/apps/kdesktop/patterns/flowers.png
+debian/tmp/usr/share/apps/kdesktop/patterns/night-rock.desktop
+debian/tmp/usr/share/apps/kdesktop/patterns/night-rock.jpg
+debian/tmp/usr/share/apps/kdesktop/patterns/pavement.desktop
+debian/tmp/usr/share/apps/kdesktop/patterns/pavement.png
+debian/tmp/usr/share/apps/kdesktop/patterns/rattan.desktop
+debian/tmp/usr/share/apps/kdesktop/patterns/rattan.png
+debian/tmp/usr/share/apps/kdesktop/patterns/stonewall2.desktop
+debian/tmp/usr/share/apps/kdesktop/patterns/stonewall2.png
+debian/tmp/usr/share/apps/kdesktop/patterns/triangles.desktop
+debian/tmp/usr/share/apps/kdesktop/patterns/triangles.png
+debian/tmp/usr/share/apps/kdesktop/pics/kde2.xbm
+debian/tmp/usr/share/apps/kdesktop/pics/ksslogo.png
+debian/tmp/usr/share/apps/kdesktop/pics/splash2.png
+debian/tmp/usr/share/apps/kdesktop/pics/splash.png
+debian/tmp/usr/share/apps/kdesktop/programs/kwebdesktop.desktop
+debian/tmp/usr/share/apps/kdesktop/programs/xearth.desktop
+debian/tmp/usr/share/apps/kdesktop/programs/xglobe.desktop
+debian/tmp/usr/share/apps/kdesktop/programs/xplanet.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
+debian/tmp/usr/share/autostart/kdesktop.desktop
+debian/tmp/usr/share/config.kcfg/kdesktop.kcfg
+debian/tmp/usr/share/config.kcfg/klaunch.kcfg
+debian/tmp/usr/share/config.kcfg/kwebdesktop.kcfg
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/error.png
+debian/tmp/usr/share/templates/Directory.desktop
+debian/tmp/usr/share/templates/HTMLFile.desktop
+debian/tmp/usr/share/templates/linkCAMERA.desktop
+debian/tmp/usr/share/templates/linkCDROM.desktop
+debian/tmp/usr/share/templates/linkCDWRITER.desktop
+debian/tmp/usr/share/templates/linkDVDROM.desktop
+debian/tmp/usr/share/templates/linkFloppy.desktop
+debian/tmp/usr/share/templates/linkHD.desktop
+debian/tmp/usr/share/templates/linkMO.desktop
+debian/tmp/usr/share/templates/linkNFS.desktop
+debian/tmp/usr/share/templates/linkProgram.desktop
+debian/tmp/usr/share/templates/linkURL.desktop
+debian/tmp/usr/share/templates/linkZIP.desktop
+debian/tmp/usr/share/templates/.source/CAMERA-Device.desktop
+debian/tmp/usr/share/templates/.source/CDROM-Device.desktop
+debian/tmp/usr/share/templates/.source/CDWRITER-Device.desktop
+debian/tmp/usr/share/templates/.source/DVDROM-Device.desktop
+debian/tmp/usr/share/templates/.source/emptydir
+debian/tmp/usr/share/templates/.source/Floppy.desktop
+debian/tmp/usr/share/templates/.source/HD.desktop
+debian/tmp/usr/share/templates/.source/HTMLFile.html
+debian/tmp/usr/share/templates/.source/MO-Device.desktop
+debian/tmp/usr/share/templates/.source/NFS.desktop
+debian/tmp/usr/share/templates/.source/Program.desktop
+debian/tmp/usr/share/templates/.source/TextFile.txt
+debian/tmp/usr/share/templates/.source/URL.desktop
+debian/tmp/usr/share/templates/.source/ZIP-Device.desktop
+debian/tmp/usr/share/templates/TextFile.desktop
--- kdebase-3.5.7.orig/debian/kpersonalizer.manpages
+++ kdebase-3.5.7/debian/kpersonalizer.manpages
@@ -0,0 +1 @@
+debian/man/kpersonalizer.1
--- kdebase-3.5.7.orig/debian/kdebase-kio-plugins.manpages
+++ kdebase-3.5.7/debian/kdebase-kio-plugins.manpages
@@ -0,0 +1,2 @@
+debian/man/kio_media_mounthelper.1
+debian/man/ktrash.1
--- kdebase-3.5.7.orig/debian/kdebase-kio-plugins.README.Debian
+++ kdebase-3.5.7/debian/kdebase-kio-plugins.README.Debian
@@ -0,0 +1,16 @@
+KDE and media kioslave support
+==============================
+
+The media kioslave, new in KDE 3.4, supports the automatic mounting of
+removable devices, such as CD-ROM and DVD drives, USB pen drives, digital
+cameras, and many other types of equipment.
+
+While some functionality is available without the use of HAL, media works
+best with HAL (and therefore udev), in combination with pmount. Media
+also extends the functionality of many other kioslaves. Check which
+packages are recommended by the kdebase-kio-plugins package, and install
+accordingly.
+
+Note that for regular users to use media in conjunction with HAL, they must
+be members of the plugdev group. (permanently, not through
+/etc/security/group.conf).
--- kdebase-3.5.7.orig/debian/khelpcenter.menu
+++ kdebase-3.5.7/debian/khelpcenter.menu
@@ -0,0 +1,11 @@
+?package(khelpcenter):\
+	needs="X11"\
+	section="Help"\
+	hints="KDE"\
+	title="KDE Help Center"\
+	icon32x32="/usr/share/pixmaps/khelpcenter.xpm"\
+	icon16x16="/usr/share/pixmaps/khelpcenter-16.xpm"\
+	command="/usr/bin/khelpcenter"
+
+# Icon 32x32 khelpcenter/pics/cr32-app-khelpcenter.png khelpcenter.xpm
+# Icon 16x16 khelpcenter/pics/cr16-app-khelpcenter.png khelpcenter-16.xpm
--- kdebase-3.5.7.orig/debian/ksmserver.manpages
+++ kdebase-3.5.7/debian/ksmserver.manpages
@@ -0,0 +1 @@
+debian/man/startkde.1
--- kdebase-3.5.7.orig/debian/kmenuedit.menu
+++ kdebase-3.5.7/debian/kmenuedit.menu
@@ -0,0 +1,11 @@
+?package(kmenuedit):\
+	needs="X11"\
+	section="Applications/System/Administration"\
+	hints="KDE"\
+	title="KMenuEdit"\
+	icon32x32="/usr/share/pixmaps/kmenuedit.xpm"\
+	icon16x16="/usr/share/pixmaps/kmenuedit-16.xpm"\
+	command="/usr/bin/kmenuedit"
+
+# Icon 32x32 kmenuedit/cr32-app-kmenuedit.png kmenuedit.xpm
+# Icon 16x16 kmenuedit/cr16-app-kmenuedit.png kmenuedit-16.xpm
--- kdebase-3.5.7.orig/debian/kcontrol.postrm
+++ kdebase-3.5.7/debian/kcontrol.postrm
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+case "$1" in
+
+	purge)
+	LINK="/etc/udev/rules.d/025_logitechmouse.rules"
+	[ ! -L "$LINK" ] || rm -f "$LINK"
+	;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
--- kdebase-3.5.7.orig/debian/ksmserver.install
+++ kdebase-3.5.7/debian/ksmserver.install
@@ -0,0 +1,9 @@
+debian/tmp/usr/bin/ksmserver
+debian/tmp/usr/bin/startkde
+debian/tmp/usr/lib/kde3/ksmserver.la
+debian/tmp/usr/lib/kde3/ksmserver.so
+debian/tmp/usr/lib/libkdeinit_ksmserver.so
+debian/tmp/usr/share/apps/kconf_update/ksmserver.upd
+debian/tmp/usr/share/apps/kconf_update/move_session_config.sh
+debian/tmp/usr/share/apps/kdm/sessions/kde.desktop	usr/share/xsessions/
+debian/tmp/usr/share/apps/ksmserver/pics/shutdownkonq.png
--- kdebase-3.5.7.orig/debian/changelog
+++ kdebase-3.5.7/debian/changelog
@@ -0,0 +1,2842 @@
+kdebase (4:3.5.7-4~bpo40+1) etch-backports; urgency=low
+
+  * Rebuilt for Etch.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 29 Sep 2007 07:24:03 +0200
+
+kdebase (4:3.5.7-4) unstable; urgency=low
+
+  * Add patch to fix unauthorized login problem in kdm.
+    CVE-2007-4569.
+
+ -- Sune Vuorela <debian@pusling.com>  Wed, 19 Sep 2007 20:30:01 +0200
+
+kdebase (4:3.5.7-3) unstable; urgency=low
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Update section in Debian menu files.
+  * Add patch 50_several-CVE-konqueror.diff to make Konqueror address
+    bar more robust against addressbar spoofing. (Closes: #433072)
+    Related CVEs: CVE-2007-4224, CVE-2007-4225, CVE-2007-3820.
+
+  +++ Changes by Fathi Boudra:
+
+  * Add xserver-xorg Recommends to kdm. (Closes: #436573)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 27 Jul 2007 16:29:18 +0200
+
+kdebase (4:3.5.7-2) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Ignore gecko also in wm class list in klipper. Thanks Sean.
+    (Closes: #428026)
+  * Add support or back references in klipper. Thanks to Sean Finney.
+    (Closes: #427843)
+  * Updated nb debconf translation. (Closes: #417942)
+  * Fix typo in startkde manpage. Thanks A. Costa. (Closes: #432062)
+  * Fix typo in kdmrc. Thanks Greg. (Closes: #422142)
+  * Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820)
+  * Updated pt_BR debconf translation. Thanks Eder L. Marques. 
+    (Closes: #422285)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 07 Jul 2007 22:18:23 +0200
+
+kdebase (4:3.5.7-1) unstable; urgency=low
+
+  * New upstream release:
+    - Now checks lnusertmp return values. (Closes: #292078)
+    - Uses correct encoding in error messages. (Closes: #362653)
+  
+  ++ Changes by Sune Vuorela:
+
+  * Patches:
+    - Redo patch 18 about fonts.
+    - Remove patch 21 - applied upstream.
+    - Adapt patch 27 - kfreebsd - minor changes.
+    - Adapt patch 41 - amd64 and nspluginviewer -  small changes.
+    - Remove patch 42 - kwin and 64 bit. applied upstream.
+    - Remove patch 44 - opengl logo is fixed.
+    - Remove patch 45 - keyboard handler - applied upstream.
+
+  ++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Update kdebase-data.install to remove "Serbia and Montenegro" (yu), and 
+    add "Serbia" (rs) and "Montenegro" (me). 
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 15 May 2007 17:03:48 +0100
+
+kdebase (4:3.5.6.dfsg.2-2) unstable; urgency=low
+
+  * Add patch 45_plugin-keyboard-handler.diff to fix keyboard events handling.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Apr 2007 18:43:34 +0200
+
+kdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low
+
+  * Upload to unstable after Etch release. Some bugs fixed in this release:
+    - A javascript related crash is fixed. (Closes: #416142)
+    - Prevent ksplash from locking due to race conditions. (Closes: #413273)
+
+  +++ Changes by Modestas Vainius:
+
+  * Correct false assumptions about the size of long always being 32bit. This
+    should fix nspluginviewer segfaults in some cases on 64bit arches
+    (Closes: #410091). Thanks to Matthias Dellweg for the bug analysis and the
+    patch. Patch No. 41.
+  * Use NET::timestampCompare() for comparing timestamps. It takes into
+    account that Higher 32bit of long get lost on 64bit archs due to
+    Xlib 32bit-in-long wrapping (Closes: #416615). Patch No. 42.
+
+  +++ Changes by Fathi Boudra:
+
+  * add autologin overrides, useful for live debian environment. It introduces
+    AUTOLOGINAGAIN, AUTOLOGINDELAY, AUTOLOGINLOCKED and AUTOLOGINUSER.
+
+  +++ Changes by Sune Vuorela:
+  
+  * Support where the frosty furry animals wants their plugins. (Patch 38)
+  * Better distinguish wether users has modified their kdm theme. (Patch 39)
+  * Update kdm debconf template, thanks to Christian Perrier. (Closes: #415941)
+    Also update kdm debconf translations:
+      - Norwegian Bokmal
+      - Swedish thanks to Daniel Nylander (Closes: #417875)
+      - Arabic thanks to Ossama Khayat (Closes: #417886)
+      - Japanese thanks to Kenshi Muto (Closes: #417891)
+      - Portuguese (pt_PT) thanks to Eduardo Silva. (Closes: #418000)
+      - Italian thanks to Danilo Piazzalunga. (Closes: #418151)
+      - German thanks to Alwin Meschede. (Closes: #418160)
+      - Galician thanks to Jacobo Tarrío. (Closes: #418186)
+      - Danish is something I just did myself. No bugs filed.
+      - French thanks to Christian Perrier. (Closes: #418518)
+      - Dutch thanks to Bart Cornelis. (Closes: #418606)
+      - Czech thanks to Miroslav Kure. (Closes: #418569)
+      - Catalan thanks to Leopold Palomo-Avellaneda. (Closes: #412303)
+      - Russian thanks to Yuri Kozlov. (Closes: #418739)
+      - Brazilian Portuguese thanks to Christian Perrier.
+
+    New translations:
+      - Tamil thanks to Tirumurti Vasudevan. (Closes: #417943)
+      - Slovak thanks to Peter Mann. (Closes: #417878)
+      - Basque thanks to Piarres Beobide. (Closes: #417993)
+      - Korean thanks to Sunjae Park. (Closes: #418211)
+      - Simplified chinese thanks to Ming Hua. (Closes: #418486)
+      - Malayam thanks to Praveen A. (Closes: #418495)
+      - Greek (still has a couple of fuzzy strings).
+  * Add a patch to put some quotes in kdeprintgfax to have spaces in
+    names/numbers. Thanks to Robert Cheramy. (Closes: #247396)
+  * Fix minor issues in manpage. Thanks JS Bygott. (Closes: #414270)
+  * Enable kerberos in kio slaves. It seems do not break anything. 
+    Thanks to Raúl Sánchez Siles. (Closes: #376952)
+  * Improve klipper description, thanks to J S Bygott. (Closes: #410202)
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+  
+  * Repackage to remove non-free OpenGL logo and update prune-nonfree
+    script. Also, patch 44 to not install the logo. (Closes: #419962)
+  * Update spanish kdm debconf template translation, thanks to Enrique Matías.
+  * Fix changelog typos ;-)
+  * And, as always, upload.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 19 Apr 2007 13:27:00 +0100
+
+kdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Don't install gvim desktop file in kappfinder. gvim does it by itself -
+    and much better. (Closes: #408233)
+  * Improve documentation about styling kdm (thanks to Jeremy Bygott).
+    This is a note in kdm.init, in kdm.README.Debian and in the
+    generated kdmrc.  (Closes: #408418, #403776, #403797, #406438)
+  * Add portuguese debconf translation. Thanks to Carlos Lisboa.
+    (Closes: #408021)
+
+  +++ Changes by Modestas Vainius:
+
+  * Add patch from upstream svn to fix "switching desktops with win+tab
+    key broken" bug (patch no. 21) .(Closes: #406549)
+  * Fix khelpcenter documentation indexing/searching. Thanks to Vedran Furač
+    for the solution (patch 25) .(Closes: #386283)
+  * Promote htdig from Suggests to Depends. Indexing and searching are
+    important for most people. (Closes: #389844)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  8 Feb 2007 12:14:08 +0200
+
+kdebase (4:3.5.6.dfsg.1-1) experimental; urgency=low
+
+  * New upstream release:
+    * Fixes "kdm does not obey pam_limits". (Closes: #242641)
+    * Resolves ksysguard problem that it was not possible to sensor order.
+      (Closes: #350561)
+    * Fixes kdesktop_lock and pam_krb5. (Closes: #374394, #376803)
+
+  +++ Changes by Modestas Vainius:
+
+  * Update debian/*.install files.
+  * Resync debian/patches:
+    * Adapt to upstream changes - 18, 23.
+    * Remove, applied upstream - 02, 29, 30, 32, 33, 35, 36.
+    * Fix offsets - 14, 19, 20, 28.
+  * Update Uploaders.
+
+  +++ Changes by Sune Vuorela:
+  
+  * Add norwegian (nb) translation of debconf questions. Thanks to 
+    Bjorn Steensrud. (Closes: #405417)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 16 Jan 2007 18:13:20 +0100
+
+kdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
+
+  +++ Changes by Sune Vuorela:
+  * Add | kfreebsd-gnu | hurd as dependencies to help installability on
+    non-linux archs (Closes: 399059)
+
+  +++ Changes by Modestas Vainius:
+  * Fix 36_kwin.diff patch. In some cases clients were not properly added to
+    the group. (Closes: #404226)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 29 Dec 2006 19:15:23 +0200
+
+kdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+  * Add a section to man page about how to use sudo as kdesu backend 
+    (Closes: #399823, #384416)
+ 
+  +++ Changes by Ana Guerrero:
+  * Applied patch to avoid kwin crashes when switching desktop 
+    (Closes: #365829).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 13 Dec 2006 13:09:33 +0100
+
+kdebase (4:3.5.5a.dfsg.1-3) unstable; urgency=high
+
+  * Urgency high for etch's KDE artwork.
+
+  +++ Changes by Fathi Boudra:
+  * Remove debian kde background, it will be provided by desktop-base:
+    * debian-kde_default.png.desktop
+    * 21_default_background_image.diff.uu
+    * 22_default_backgrounds.diff
+  * Add kdm customization support and update kdm README.Debian. Main changes
+    can be found in kdm init script:
+    * use an alternative kdm master configuration file (/var/run/kdm/kdmrc)
+      and background configuration file (/var/run/kdm/backgroundrc)
+    * source override file in kdm override directory (/etc/default/kdm.d)
+    (Closes: #385839)
+
+  +++ Changes by Sune Vuorela:
+  * Add kdelibs-dbg to kdebase-dbg dependencies.
+
+  +++ Changes by Josh Metzler:
+  * Restore kdm's default user face icon by adding a symlink to kdm.links.
+    (Closes: #267722)
+
+  +++ Changes by Modestas Vainius:
+  * Add patch (number 35) from KDE bug #120619 comment #34, which fixes 
+    mounting and unmounting of floppy devices managed by HAL. (Closes: #350097)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 11 Dec 2006 17:26:16 +0100
+
+kdebase (4:3.5.5a.dfsg.1-2) unstable; urgency=medium
+
+  +++ Changes by Fathi Boudra:
+
+  * Remove kde-applications-merged directory in kdebase-data.preinst as we must
+    use applications-merged as the default merge directory.
+  * Urgency medium, as along with kdelibs this upload fixes broken fresh
+    installs.
+
+  +++ Changes by Sune Vuorela:
+
+  * Fix a typo in konsole manpage and extend the description about -e a bit.
+    Inspired by xterm man page.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch from the upstream bug report (http://bugs.kde.org/41744) that
+    fixes the display of Japanese fullwidth characters in Konsole.
+    (Closes: #395141)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 16 Nov 2006 17:08:46 -0500
+
+kdebase (4:3.5.5a.dfsg.1-1) unstable; urgency=medium
+
+  * Add 4 new patches. Thanks to Sune Vuorela for investigating and
+    to Modestas Vainius for creating them:
+    * 29_halbackend_fstab_improvements
+      * fixes HALBackend::inInFstab() to correctly match the fstab device node
+        that is a symlink.
+      * Improve error messages for HAL/fstab unmount failures. Include a list
+        of processes using the device in them (if there are any).
+      * When handling fstab devices, make HALBackend::mount() and
+        HALBackend::umount() calls block until the operation actually
+        completes (the same behaviour as with HAL devices).
+      * In mounthelper always unmount a device before ejecting it. However,
+        if unmount fails, still try to eject the device. In case of failure,
+        display the unmount error message which is more informative.
+    * 30_mediamanager_followsymlinks
+      * MediaManager::properties() follows symlinks on local paths.
+    * 32_camera_icon_from_mimetype
+      * Do not set icons for cameras explicitly, because they can be
+        determined from the mimetype. In addition, always reset a medium icon
+        when properties of the medium change. This fixes a problem when the
+        camera_mounted icon is not reset once the camera storage has been
+        unmounted.
+    * 33_mounthelper_find_medium_by_url
+      * Mounthelper should search for the medium by the whole url in addition
+        to just the filename. This unbreaks krusader 1.70.x media:/ 
+        unmount/eject commands.
+
+  * Add psmisc to Depends of kdebase-kio-plugins since it provides 'fuser'
+    utility, needed for listUsingProcesses() function added in
+    29_halbackend_fstab_improvements patch. Thanks to Modestas Vainius.
+
+  * Promote eject from Recommends to Depends for kdesktop, and make sure
+    kdebase-kio-plugins Depends on kdesktop, so that kdeeject is always
+    present.
+
+  * Update 20_applications_menu_move patch to fix an incomptability with
+    freedesktop.org menu specification: Note that a system that uses either
+    gnome-applications.menu or kde-applications.menu depending on the desktop
+    environment in use must still use applications-merged as the default merge
+    directory in both cases. Thanks to Kevin Krammer. (Closes: #392807)
+
+  * Version our build-conflict with nvidia-glx, since newer packages should
+    work. (Closes: #393855)
+
+  * Drop thunderbird and mozilla icons from the tarball, as they are non-free.
+    (Closes: #394045)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Nov 2006 17:59:48 -0500
+
+kdebase (4:3.5.5a-2) unstable; urgency=low
+
+  * Re-add pmount to kdebase's dependencies. It turns out that there remain
+    strange cases where pmount is needed in conjunction with HAL to do the
+    right thing.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 13 Oct 2006 17:05:08 -0400
+
+kdebase (4:3.5.5a-1) unstable; urgency=high
+
+  * New upstream tarball, with a number of fixes. Also include several
+    important patches that didn't make the tarball.
+    + Fixes 'konsole flashes and is unusable' with some focus policies.
+      (Closes: #391357, #391361)
+    + This upload, and the last one, must make Etch with their RC fixes,
+      so urgency=high.
+
+  * Drop the pmount Depends from the kdebase metapackage, since pmount isn't
+    important with the latest HAL. (Closes: #391502)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 10 Oct 2006 17:12:10 -0400
+
+kdebase (4:3.5.5-1) unstable; urgency=low
+
+  [ Debian Qt/KDE Maintainers ]
+  * New upstream release.
+    + Reorders the paths which kxkb searches. This should prevent it from
+      mistakenly thinking that it has found its data; this was breaking
+      keyboard layouts for many users. (Closes: #382988)
+    + Fixes kxkb with multiple users - create properly named files in /tmp.
+      (Closes: #383893)
+    + Fixes kdesktop crash when copying things to the kde clipboard under
+      special configuration. (Closes: #386336)
+    + Fixes kicker external taskbar sizing. (Closes: #373919)
+
+  +++ Changes by Christopher Martin:
+
+  * Join the club by adding full depends on hal and pmount to the kdebase
+    metapackage. kdebase-kio-plugins will retain recommends for hal and
+    pmount. This way, people who still really hate udev can simply ditch the
+    kdebase metapackage, but most users will automatically get the full
+    Utopia. This is good, since nobody reads recommends anyway, and volume
+    handling is becoming standard and expected basic functionality. The
+    kde-desktop task depends on kde-core, a metapackage that in turn
+    depends on kdebase, so the kde-desktop task will now pull in hal/pmount
+    as well. (Closes: #384663)
+
+  * Fix typo in /etc/pam.d/kdm-np. (Closes: #381908)
+
+  * Remove /usr/share/apps/kappfinder/apps/Office/lyx.desktop, as lyx-qt
+    provides its own better .desktop file. (Closes: #383412)
+
+  * Revamp patches/18_default_fonts.diff, not only to sync it with the latest
+    changes in the KDE_3_5_BRANCH, but also to fix a number of recent problems
+    with KDE's font handling. These include mismatches between defaults in
+    different parts of KDE, which led to different apps using different
+    settings, with respect to the enabling of anti-aliasing, subpixel
+    rendering, and other settings. Also, set the default font hinting level
+    to 'full', since anything other than that has the effect of actually
+    disabling hinting with Debian's fontconfig. This probably led many users
+    to wonder why their fonts suddenly became so ugly after they ran KControl
+    and accepted the then-default 'medium' hinting level. (Closes: #381232)
+
+  * Clarify in the kdebase and kdebase-kio-plugins README.Debian files that
+    plugdev membership through /etc/security/group.conf doesn't cut it.
+
+  * Add Romanian debconf translation, thanks to Stan Ioan-Eugen.
+    (Closes: #387586)
+
+  * New default background, thanks to Andre L.R. Ferreira. This background was
+    chosen from a group of images proposed for a standard Debian background by
+    the Debian Desktop project. This work doesn't look like it will make Etch,
+    but the old background wasn't super, so we took the one we judged to be
+    best.
+
+  * Grab a few minipager fixes from the KDE_3_5_BRANCH.
+
+  +++ Changes by Fathi Boudra:
+
+  * Fix typos in libkonq4 description. (Closes: #385148)
+
+  * Re-write kpersonalizer description. (Closes: #385309)
+
+  * Fix typos in kdebase-kio-plugins description. (Closes: #385734)
+
+  * Remove non-free firefox icon. [CM: Add a prune-nonfree script to the
+    debian packaging that makes it easy to drop the icons from a source
+    tree, since we must remove the icons from the tarball as well.]
+    (Closes: #284699)
+
+  +++ Changes by Pierre Habouzit:
+
+  * Add kfreebsd-specific patches to the configure system, ensuring that
+    all needed files are installed on all platforms, even though the build
+    system erroneously leaves them out of non-Linux builds. (Closes: #339937)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  4 Oct 2006 18:43:28 -0400
+
+kdebase (4:3.5.4-2) unstable; urgency=low
+
+  * KDE_3_5_BRANCH update (up to r567687).
+
+  +++ Changes by Christopher Martin:
+
+  * Re-upload 3.5.4 with a new build hack that disables the use of
+    --enable-final on slow architectures. This will hopefully allow kdebase
+    (and other KDE modules) to build on arm and m68k more easily. This should
+    in turn ease the movement of recent KDE modules into Testing. Thanks to
+    Adeodato Simo for the fix.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 29 Jul 2006 15:41:35 -0400
+
+kdebase (4:3.5.4-1) unstable; urgency=low
+
+  * New upstream release:
+    + fixes setting of the xrdb resource Xft.antialias to always match what's
+      configured in the control center, not in ~/.qt/qtrc. (Closes: #377147)
+    + fixes konqueror crahshes. (Closes: #367090)
+    + fix a crash in kate at save time. (Closes: #368504)
+
+  +++ Changes by Christopher Martin:
+
+  * Add more manpages from Holger Hartmann. Thanks again!
+    (Closes: #193527, #373759, #374087)
+
+  * Add libjessie-java to konqueror's Java Suggests, since it is needed for
+    JSSE in conjunction with GCJ.
+
+  * Add a LSB header to the KDM init script, making KDM usable with a parallel
+    bootscripts setup. Thanks to Carlos Villegas. (Closes: #376958)
+
+  * 25_khelp_htdig.diff: With the htdig package, searchable indexes should
+    be usable in the KDE Help Center. (Closes: #313375, #368208, #378408)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 28 Jul 2006 00:04:41 +0200
+
+kdebase (4:3.5.3-2) unstable; urgency=medium
+
+  * KDE_3_5_BRANCH update (up to r549661).
+    + Fixes kpager crash. (Closes: #370158)
+
+  * Urgency medium for RC kpager crash fix.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a small patch to make the Printer panel available from the KMenu
+    again.
+
+  * Add numerous manpages from Holger Hartmann. Thanks!
+    (Closes: #370140, #370164, #370358)
+
+  * Make kcontrol suggest ntpdate | ntp-simple, since the Date and Time panel
+    can use NTP to set up the clock. (Closes: #369899)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri,  9 Jun 2006 09:51:32 -0400
+
+kdebase (4:3.5.3-1) unstable; urgency=low
+
+  * New upstream release.
+    + fix kwin alt-tab problems. (Closes: #363357, #361421, #361127)
+    + fix problems with systram. (Closes: #347320)
+
+  +++ Changes by Christopher Martin:
+
+  * Add konqueror Suggests for java, since java works (more or less)
+    with the DFSG-free gij-4.1 and libgcj7-awt.
+
+  * Lower konqueror's Recommends on ksvg to a Suggests.
+
+  * Improve kpager's package description. Thanks to David Liontooth.
+    (Closes: #366476)
+
+  * Update the kate manpage. (Closes: #347883)
+
+  * Manually add /usr/bin/X11 to the KDM's default session path, as otherwise
+    systems still running X11R6.9 won't be able to find X binaries, which can
+    cause the login process to fail under certain circumstances. This bit of
+    cruft (for X11R7 users) should be harmless, and can be removed post-Etch.
+    (Closes: #367072)
+
+  +++ Changes by Pierre Habouzit:
+
+  * Move arch indep files from kcontrol into kdebase-data. (Closes: #233379)
+    (still *.desktop files remains in kcontrol to avoid beeing advertised from
+    KDE menus with no corresponding binaries).
+
+  * Add 'ru' debconf templates translation, thanks to Yuriy Talakan.
+    (Closes: #367206)
+
+  * Add konqueror.presubj (konqueror is responsible of 25% of the kdebase bug
+    reports) to ask for more precise bug reports, because often they lack the
+    fundamental information necessary to make them useful.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Mon, 29 May 2006 09:55:11 +0200
+
+kdebase (4:3.5.2-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Now that menu-xdg+menu can provide xsession .desktop files for window
+    managers, add /var/lib/menu-xdg/xsessions to kdmrc's default list of
+    places to search. Window managers should continue to provide their
+    own .desktop files, however, since they will be more customized and
+    won't force users to install the menu package. This is merely a
+    fallback. (Closes: #360919)
+
+  * Make kdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way
+    out. Adjust other paths in kdmrc as well. kdm should now work better with
+    X.Org 7. (Closes: #362924)
+
+  * Patch kdm so that if it can't find the X executable in kdmrc (now
+    /usr/bin/X by default), then try /usr/X11R6/bin/X, then finally
+    /usr/bin/X. This should keep kdm working for users who have a partial or
+    botched dist-upgrade, or neglected to permit the installation of an
+    up-to-date kdmrc.
+
+  * Revamp /etc/pam.d/kdm and the other pam files. They should now find the
+    new /etc/default/locale language settings. (Closes: #361089, #361163)
+
+  * Remove xlibs-static-pic build-dependency, and replace it with
+    libfontenc-dev, for the more modular X.Org 7. Also add libxkbfile-dev to
+    the build-depends. (Closes: #363438)
+
+  * Improve konqueror's use of alternatives, by slaving the konqueror manpage
+    to the x-www-browser manpage. Thanks to Magnus Holmgren. (Closes: #363076)
+
+  * Fix klipper description typo. (Closes: #364171)
+
+  +++ Changes by Pierre Habouzit.
+
+  * Add gl.po to the debconf templates. (Closes: #361208)
+
+  * Improve konsole's use of alternatives, by slaving the konsole manpage to
+    the x-terminal-emulator manpage. Thanks to Magnus Holmgren.
+    (Closes: #363280)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 22 Apr 2006 20:00:39 -0400
+
+kdebase (4:3.5.2-1) unstable; urgency=low
+
+  * New upstream release.
+    + Fixes the klipper + OpenOffice.org problems.
+    (Closes: #350930)
+
+  * KDE_3_5_BRANCH update (up to r523654).
+
+  +++ Changes by Christopher Martin:
+
+  * Add a kpersonalizer manpage from Joe Zonker Brockmeier. Thanks.
+    (Closes: #327395)
+
+  * Make the KDM option "Restart X Server" visible by default again.
+
+  * Fix the logitechmouse udev rules. Thanks to Henrique de Moraes Holschuh
+    for spotting the problems. (Closes: #359751, #359773)
+
+  +++ Changes by Pierre Habouzit:
+
+  * Add a recommends on ksvg for konqueror. (Closes: #200008)
+
+  * Add a note on how to read Kdm help, since no "help" button exists for it.
+    (Closes: #294126)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 28 Mar 2006 20:19:46 -0500
+
+kdebase (4:3.5.1-1) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Enable zeroconf support in ksysguardd; add libavahi-compat-libdnssd-dev to
+    the build-depends. (Closes: #348583)
+
+  * Merge startkde manpage (and maintainer script patch to fully integrate it)
+    from Philipp Grau. Thanks. (Closes: #348501)
+
+  * Upload to unstable.
+
+  +++ Changes by Luk Claes:
+
+  * Add Italian debconf translation (thanks to Luca Monducci).
+    (Closes: #349344)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 26 Jan 2006 19:18:45 -0500
+
+kdebase (4:3.5.0-4) unstable; urgency=low
+
+  +++ Changes by Isaac Clerencia
+
+  * Add kdnssd kcontrol module files to kcontrol package
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 11 Jan 2006 23:05:12 +0100
+
+kdebase (4:3.5.0-3) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Install kdm's NEWS file in all kdebase packages. This ensures that
+    apt-listchanges will display the news to all users. (Closes: #344947)
+
+  +++ Changes by Adeodato Simó:
+
+  * Upload to unstable.
+
+  * KDE_3_5_BRANCH update (up to r494868).
+
+  * Use the new --with-usbids configure option to use the usb.ids file
+    provided by usbutils instead of the one included in the source. Make
+    kcontrol depend on usbutils for this, and do not ship usb.ids anymore.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat,  7 Jan 2006 19:11:37 +0100
+
+kdebase (4:3.5.0-2) experimental; urgency=low
+
+  * Upload to experimental.
+
+  * KDE_3_5_BRANCH update (up to r488815).
+
+  +++ Changes by Christopher Martin:
+
+  * Add strict build-depends on dbus and hal, ensuring that we build against
+    the latest packages. (Closes: #332647)
+
+  * No longer build with gcc-3.4 on any architectures, since gcc-4.0 should
+    be fixed. (Closes: #342980)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 15 Dec 2005 19:25:37 -0500
+
+kdebase (4:3.5.0-1) alioth; urgency=low
+
+  * New upstream release.
+
+  * Fixed in this release:
+  
+    + A bug that caused switching to Administrator mode in KControl to
+      fail on occasion is resolved. (Closes: #306951)
+
+  +++ Changes by Christopher Martin:
+
+  * In light of upstream changes, remove the xfonts-konsole package. Instead,
+    ship bitmap fonts as part of konsole.
+
+  * Improve kcontrol's Logitech mouse support in conjunction with udev.
+    However, kcontrol + udev now requires kernel 2.6.14 or later. Older
+    kernels are still supported with the hotplug package.
+
+  * Bump DH_COMPAT to 5. No changes.
+
+  * Add a kdebase-dbg package for helping to trace problems.
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Add manpage for Konsole.
+  
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 30 Nov 2005 02:29:16 -0500
+
+kdebase (4:3.4.3-3) unstable; urgency=low
+
+  * Upload to unstable, rebuilding against kdelibs4c2a.
+
+  * KDE_3_4_BRANCH update (up to r484262).
+
+  +++ Changes by Christopher Martin:
+
+  * Temporarily bump build-depends on dbus to >= 0.23.4-8, ensuring that
+    we build against a package that doesn't link against the pre-transition
+    kdelibs4c2.
+
+  * Add "noextendedglob" to zsh's options when reading the X startup scripts
+    for kdm. This works around some of its quirks. (Closes: #336305)
+
+  * Backport a fix from KDE 3.5 for a bug that caused switching to
+    Administrator mode in KControl to fail on occasion. (Closes: #306951)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed, 30 Nov 2005 01:14:06 +0100
+
+kdebase (4:3.4.3-2) experimental; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Add "chmod +x" for usermap.pl in debian/rules, to ensure that the package
+    builds...
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 18 Oct 2005 17:49:19 -0400
+
+kdebase (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a small addition to the "Improving KDE" patch selection used in
+    Debian. The rounded icon text selection now applies on the desktop
+    as well. (Closes: #329484)
+
+  * Increase konsole's x-terminal-emulator priority from 20 to 35, placing it
+    above xterm. (Closes: #332223)
+
+  * Adapt kcontrol's hotplug support for special control of Logitech mice to
+    work with udev as well.
+
+  * Add the Swedish debconf translation by Daniel Nylander. (Closes: #333798)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 15 Oct 2005 14:00:13 -0400
+
+kdebase (4:3.4.2-4) unstable; urgency=medium
+
+  +++ Changes by Christopher Martin:
+
+  * Fix kicker's dependency on kdebase-data so that a binNMU does not render
+    kdebase uninstallable. This is currently a problem on ia64.
+    (Closes: #335285)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 23 Oct 2005 08:25:27 -0400
+
+kdebase (4:3.4.2-3) unstable; urgency=low
+
+  * KDE_3_4_BRANCH update (up to r458655). This includes a fix for a local
+    root exploit, CAN-2005-2494, in the kcheckpass binary (Closes: #327039)
+
+  +++ Changes by Christopher Martin:
+
+  * Add a NEWS entry that explains the KDM upgrade process for users moving
+    from KDM 3.3.x, as well as KDM's new behaviour regarding login scripts.
+    (Closes: #326542, #327191)
+
+  * Add a patch from the "Improving KDE" set that eliminates a superfluous
+    border around kicker's systray that appeared on mouseover.
+
+  * Add another "Improving KDE" patch that allows the selection of a special
+    tranparent selection rectangle (off by default) to be made from the
+    Control Center's Style module. Temporarily bump our kdelibs build-depends,
+    to ensure that we build against a similarly patched Qt and kdelibs.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 16 Sep 2005 16:59:45 -0400
+
+kdebase (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * For kdebase-data, add conflicts against old versions of kcontrol, kwin,
+    and kicker. This should prevent users from unwittingly upgrading
+    kdebase-data to 3.4.x, while the rest of KDE stays at the 3.3.x level.
+    This had resulted in kcontrol breaking and other assorted issues.
+    (Closes: #325592)
+
+  +++ 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.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 02 Sep 2005 10:59:00 +0200
+
+kdebase (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_4_BRANCH update.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+    - kdm uses /dev/urandom instead of /dev/random as the default source
+      of entropy. This solves myriad issues on low-entropy systems.
+      (Closes: #240027, #294267, #298254, #320838)
+
+    - "-nolisten tcp" no longer prevents kdm from connecting to remote
+      hosts. (Closes: #263449)
+
+  +++ Changes by Pierre Habouzit:
+
+  * [debian/po/vi.po] : add the Vietnamese debconf translation by Clytie
+    Siddall. (Closes: #312156)
+
+  +++ Changes by Christopher Martin:
+
+  * Add build-dependencies on libxss-dev, libxxf86misc-dev, libxau-dev,
+    libxdmcp-dev, libxcomposite-dev, libxdamage-dev, and prune the
+    07_xlibs-static-pic.diff accordingly, for the X.Org transition. kompmgr
+    is also now built and installed with kwin.
+
+  * Tightened build dependency on dbus-qt-1-dev to force building against a
+    C++ transitioned version. Can be removed once dbus (>= 0.23.4-5) is
+    available on all arches.
+
+  * Tighten all package relations between packages in kdebase, preventing many
+    instances of potentially harmful partial upgrades. In particular, ensure
+    that kdm is upgraded along with kdebase-bin. (Closes: #312358)
+
+  * Fix typos in the kappfinder manpage. Thanks to A Costa. (Closes: #312767)
+
+  * Add a patch that makes knotify aware that arts is available when arts is
+    manually started. This (more or less) resolves the issue wherein knotify
+    did not work with arts, had arts ever once been unavailable.
+    (Closes: #312217)
+
+  * No longer set a random ForgingSeed in the kdmrc conffile, for this caused
+    each kdebase build to generate a different kdmrc, and therefore made
+    updates a nuissance.
+
+  * Make kdm Suggest kdepasswd, since the later contains icons that can be
+    used to provide users with 'face' icons.
+
+  * Fix formatting of the kdepasswd manpage. (Closes: #313472)
+
+  * Add the Arabic debconf translation by Mohammed Adnene Trojette.
+    (Closes: #320768)
+
+  * Fix kdm session files that contain the incorrent binary names.
+    (Closes: #320628)
+
+  * Change kdm's debconf dependency into a dependency on debconf |
+    debconf-2.0, as this allows the installation of cdebconf.
+
+  * Move all of konsole's README documentation into /usr/share/doc/konsole.
+    (Closes: #324003)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu, 25 Aug 2005 22:58:52 +0200
+
+kdebase (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
+
+kdebase (4:3.4.0-0pre4) alioth; urgency=low
+
+  * New upstream release.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+
+    - KDE can now use pmount if available. (Closes: #294258)
+
+    - drag'n'dropping local files from Konqueror to Thunderbird works now
+      (file:/// is used instead of file:/ for the url). (Closes: #296255)
+
+    - konsole now uses a proper set of default fonts, resulting in less
+      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:
+
+  * Added a patch to set reasonable default fonts, using the fontconfig
+    defaults, for kpersonalizer, kcontrol, kdm, and the Plastik theme. We
+    also use the Debian Blue artwork to provide a standard desktop
+    background.
+
+  * KDM no longer shows the Custom session. When it works at all, it simply
+    duplicates Default's behaviour anyway. (Closes: #251602)
+
+  * New KDM patches source /etc/profile and the user's normal shell startup
+    scripts. (Closes: #173802, #211953, #250645, #250765, #289143)
+
+  * KDM once again looks for window manager session definitions in
+    /usr/share/apps/kdm/sessions by default. (Closes: #293645, #310155)
+
+  * USB usermap for Logitech mice is now installed, with device permissions
+    set so that members of the plugdev group can make use of the Logitech
+    KControl module (under Peripherals/Mouse).
+
+  * Added README.Debian files for kcontrol and kdebase-kio-plugins, explaining
+    how to setup Logitech mouse advanced configuration, and the media
+    kioslave.
+
+  * New kdebase-doc-html package, containing doc-base registered HTML versions
+    of application handbooks, for users without Konqueror or KHelpCenter.
+
+  * Fixed typos in the kate manpage. Thanks to A. Costa. (Closes: #302812)
+
+  * KControl and KInfoCenter are now only visible in the KDE menu. Their
+    presence elsewhere had caused user confusion. They are both still
+    available through the Debian menu system. Trivial patch borrowed from
+    Kubuntu. (Closes: #246280)
+
+  * Make ksmserver Recommend kpersonalizer, since it is used when
+    running KDE for the first time. Also patch startkde so it doesn't
+    fail when kpersonalizer is not present. (Closes: #309803)
+
+  * 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ó:
+
+  * After clearing up some issues with multiple de.po files being sent for
+    inclusion, include an updated German po-debconf translation sent by
+    Florian Ernst, and agreed upon several translators. (Closes: #291954)
+
+  * 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@lists.debian.org>  Sat, 14 May 2005 13:00:44 -0400
+
+kdebase (4:3.3.2-1) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update.
+
+  * Fix typo in kdebase-bin description. (Closes: #286587)
+
+  * Update kdeprint documentation to sync with kdelibs patches.
+
+  * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work"
+    problem when upgrading to KDE 3.3, and how to deal with it.
+    (Closes: #266106, #267622)
+
+  * Fix update-alternatives prerm scripts: only --remove when
+    the package is actually being removed, not upgraded. This
+    should prevent the needless resetting of the sysadmin's
+    preferences on package upgrade. (Closes: #247243)
+
+  * Fix debian/copyright to refer to License rather than to Copyright
+    when discussing KDE's licenses.
+
+  +++ Changes by Adeodato Simó:
+
+  * debian/control:
+    - make kdebase-dev depend on kwin for the libkdecorations.so ->
+      libkdecorations.so.1.0.0 symlink. (Closes: #289544)
+
+  * Included Czech po-debconf translation by Miroslav Kure.
+    (Closes: #289454)
+
+  * Add manpages for keditbookmarks, konqueror, and kfmclient.
+    (Closes: #286373)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 23 Jan 2005 16:11:07 +0100
+
+kdebase (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update. Includes the kdebase part of the fix
+    for CAN-2004-1158.
+  * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590)
+  * kwin is now registered as an x-window-manager. (Closes: #249162)
+  * Added /usr/share/xsessions to KDM's default session path, so
+    .desktop files installed there are found.
+    (Closes: #243770, #247365, #247747, #250384)
+  * kdm can now be installed while building kdebase, without affecting
+    the generated kdmrc and other config files.
+  * Adjust documentation to reflect the CUPS document path used by
+    Debian.
+  * Incorporate new manpages, for kdepasswd, kappfinder, kfind,
+    kmenuedit, kate, kwrite, kpager, from Andre Ramos and
+    Clement Stenac.
+    (Closes: #189574, #207123, #207124, #207125, #207126, #207130)
+  * Incorporate new package descriptions for konqueror, kcontrol,
+    and kate, from Tomas Pospisek. (Closes: #280358, #280362, #280795)
+  * Remove build-dependency on automake1.9.
+  * Acknowledge old NMUs. (Closes: #178507, #261740, #244547, #247407)
+    (Closes: #237062, #237065, #237067)
+  * Take some action wrt #284844: [AS]
+    - rename README.linux.console to README.Linux-font, more explicit
+      and does not create confusion with the original file. Removed
+      note about this file not being the original one.
+    - when talking about dpkg-reconfigure fontconfig, be clear about
+      which one the relevant question is and what the answer has to be.
+    - added patches/14_konsole_README.Linux-font.diff to make the popup
+      that konsole displays when it can find the font specify the full
+      path to the README file. (Closes: #284844)
+
+ -- Christopher Martin <chrsmrtn@freeshell.org>  Sat, 18 Dec 2004 14:54:58 -0500
+
+kdebase (4:3.3.1-4) unstable; urgency=high
+
+  +++ Changes by Adeodato Simó:
+
+  * High urgency upload to fix security vulnerability in sarge.
+
+  * Include patch to fix CAN-2004-1158, "Konqueror Window Injection
+    Vulnerability". (Closes: #286516)
+
+  * Include small patch from Christoffer Sawicki to ignore /sys and /.dev and
+    not report them as hard disks in Konqueror. (Closes: #287424)
+
+  * Included Dutch po-debconf translation by Luk Claes. (Closes: #283971)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Wed,  5 Jan 2005 17:11:03 +0100
+
+kdebase (4:3.3.1-3) unstable; urgency=medium
+
+  * Include patch to fix CAN-2004-1171 ("plain text password exposure").
+    Closes half of #285126.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Fri, 10 Dec 2004 22:28:25 +0100
+
+kdebase (4:3.3.1-2) unstable; urgency=low
+
+  * Forgot then in ksmserver.preinst.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu,  4 Nov 2004 18:00:00 -0600
+
+kdebase (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+  * ksmserver: only reset x-session-manager on install. (Closes: #247243)
+  * kdm: remove log files on purge. (Closes: #273542)
+  * Correct Danish po-debconf translations. (Closes: #273832)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu,  4 Nov 2004 04:00:00 -0600
+
+kdebase (4:3.3.0a-1) unstable; urgency=low
+
+  * Respin orig.tar.gz.
+  * KDE_3_3_BRANCH update.
+  * Add Turkish po-debconf translations. (Closes: #248326)
+  * Add German po-deconf translations. (Closes: #264608)
+  * Correct /etc/kde3/kdm/Xsession file. (Closes: #265795)
+  * Correct usage of "its" in konsole description. (Closes: #268517)
+  * Correct Danish po-debconf translations. (Closes: #269575)
+  * Correct kdm name in /etc/init.d/kdm. (Closes: #272062)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat, 25 Sep 2004 20:00:00 -0500
+
+kdebase (4:3.3.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Fri, 13 Aug 2004 20:00:00 -0500
+
+kdebase (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * ksmserver Provides: x-session-manager. (Closes: #258677)
+  * Remove Energy Star logo png files. (Closes: #259638)
+  * Build-Depends: xlibs-static-pic. (Closes: #260959)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue,  3 Aug 2004 02:00:00 -0500
+
+kdebase (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added Build-Depends: libsensors-dev.
+  * Corrected kdm postinst startup code. (Closes: #195052)
+  * Removed Debian menu desktop files. (Closes: #198661)
+  * Added a README.linux.console document. (Closes: #218035)
+  * Remove kdm log files on purge. (Closes: #225157)
+  * Corrected kate/konqueror mime nametemplate support. (Closes: #235216)
+  * Removed "FIXME - observe" lines from kdm scripts. (Closes: #236422)
+  * Added Danish po-debconf translations. (Closes: #236480)
+  * Remove old x-session-manager alternatives. (Closes: #236515, #236795,
+    #237081, #240773)
+  * Removed kdebase and kicker menu-methods. (Closes: #236700)
+  * Corrected kdm-np PAM service. (Closes: #236750, #238182, #242381)
+  * Added kcontrol Depends: kdebase-data. (Closes: #239297)
+  * Updated GDM session file. (Closes: #240980)
+  * debian/*.menu: remove the obsolete kderemove tag.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sun, 11 Apr 2004 04:00:00 -0500
+
+kdebase (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added Catalan po-deconf translations. (Closes: #139733)
+  * Added Polish po-deconf translations. (Closes: #142540)
+  * Added Japanese po-deconf translations. (Closes: #137940, #210431)
+  * Updated kate Recommends: kregexpeditor. (Closes: #227677)
+  * Added konqueror Depends: kdebase-kio-plugins. (Closes: #230203)
+  * Added kdm Provides: x-display-manager. (Closes: #231442)
+  * Added kdebase-bin/kdm Depends libpam-runtime. (Closes: #233562, #236078)
+  * Added kate/konqueror mime nametemplate support. (Closes: #235216)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Fri,  5 Mar 2004 04:00:00 -0600
+
+kdebase (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue, 17 Feb 2004 17:00:00 -0600
+
+kdebase (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Fri, 23 Jan 2004 18:00:00 -0600
+
+kdebase (4:3.1.5-2) unstable; urgency=low
+
+  * Remove Build-Depends: libsensors-dev.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu, 29 Jan 2004 22:00:00 -0600
+
+kdebase (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added pt_BR debconf translation. (Closes: #107023)
+  * Updated /etc/gdm/Sessions/KDE file. (Closes: #177144)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Mon, 12 Jan 2004 19:00:00 -0600
+
+kdebase (4:3.1.4-2) unstable; urgency=low
+
+  * Added es debconf translation. (Closes: #128933)
+  * Added fr debconf translation. (Closes: #132615, #225899)
+  * Corrected konqueror gs mime tests. (Closes: #160428)
+  * kdesktop Recommends eject. (Closes: #223642)
+  * konqueror Provides info-browser. (Closes: #223913)
+  * Added '|| true' to db_input lines in kdm debconf support. (Closes: #224548)
+  * Corrected typo in kdm.config script. (Closes: #224578)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Mon,  5 Jan 2004 23:00:00 -0600
+
+kdebase (4:3.1.4-1) unstable; urgency=low
+
+  * The "Why isn't KDE installable yet" release.
+  * 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.
+  * Demote kdeprint Depends 'efax | hylafax-client | mgetty-fax' to Suggests.
+    (Closes: #142489)
+  * Change kicker.menu-method to not display the empty_mime icon if a menu file
+    doesn't provide an icon. (Closes: #154065)
+  * Make konqueror depend on kdesktop. (Closes: #192550)
+  * Update pam support to use new common module fragments. (Closes: #206958)
+  * Update package descriptions. (Closes: #209532, #209856)
+  * Strip SUID root from kcheckpass since its not needed. (Closes: #212212)
+  * Update kdm debconf and use po-debconf. (Closes: #218731)
+  * Make kicker depend on kdebase-data. (Closes: #223407)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu, 18 Dec 2003 13:30:00 -0600
+
+kdebase (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Wed, 30 Jul 2003 15:00:00 -0500
+
+kdebase (4:3.1.2-1.1) unstable; urgency=low
+
+  * NMU (Maintainer is aware for a while but is dumb)
+      - Summary: kdebase-dev depends on kdebase that is not installable
+                 some package have build-depends on kdebase-dev so they are
+                 buildable since at least 06 Jun 2003
+  * Fix Depends: field (previous was libsensors1 and it was replaced by
+    libsensors-1debian1) (Closes: #196370, #200224)
+  * Fix FTBFS with gcc-3.3 (Closes: #200620)
+      - Thanks Riku Voipio <riku.voipio@iki.fi>
+      - use cvs files from KDE_3_1_BRANCH
+      	+ recentapps.cpp version 1.3.6.2
+      	+ recentapps.h version 1.3.8.2
+      	+ service_mnu.cpp version 1.50.2.4
+      	+ browser_mnu.cpp version 1.44.2.2
+
+ -- Igor Genibel <igenibel@debian.org>  Fri, 18 Jul 2003 10:35:34 +0200
+
+kdebase (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove Build-Depends on libsasl-dev. (Closes: #189949, #193866)
+  * Add libkregexpeditor to kate Recommends. (Closes: #183280)
+  * Add efax | hylafax | mgetty-fax to kdeprint Depends. (Closes: #142489)
+  * Add kfind to konqueror Depends. (Closes: #192859)
+  * Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438,
+    #193274)
+  * Add log rotation for KDM logfile. (Closes: #145345, #153728)
+  * Add screen number to KDM Xservers file. (Closes: #182708, #184737, #187257)
+  * Moved xfonts-konsole fonts to /usr/X11R6/lib/X11/fonts/misc/
+    (Closes: #184548)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Wed, 21 May 2003 08:00:00 -0500
+
+kdebase (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #180816, #181309)
+  * Corrected kdm-update-menu.sh kdm.options path. (Closes: #180355)
+  * Added xbase-clients depend to kdm. (Closes: #180536)
+  * Added xutils depend to xfonts-konsole. (Closes: #180695)
+  * Improved xfonts-konsole description. (Closes: #180696)
+  * Remove upgrade from alternatives removal prerm script. (Closes: #180927)
+  * Change Xservers to launch /usr/X11R6/bin/X. (Closes: #182037)
+  * Add entries for kdm reserve xserver feature. (Closes: #182708)
+  * Add kcontrol depends to konqueror (Closes: #182724)
+  * Change konqueror menu entry to allow execution. (Closes: #183225)
+  * Make konqueror provide www-browser. (Closes: #183391)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Tue, 11 Mar 2003 22:00:00 -0600
+
+kdebase (4:3.1.0-2) unstable; urgency=low
+
+  * Add 'chmod +x configure' to rules.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat,  8 Feb 2003 02:00:00 -0600
+
+kdebase (4:3.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redo debian dir.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sat, 01 Feb 2003 23:00:00 -0600
+
+kdebase (4:2.2.2-14.7) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Updated patch from KDE advisory 20030916
+
+ -- Matt Zimmerman <mdz@debian.org>  Tue, 16 Sep 2003 15:18:59 -0400
+
+kdebase (4:2.2.2-14.6) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Apply updated patch from KDE advisory 20030915
+    - Fixes CAN-2003-0690 (setcred())
+    - Fixed CAN-2003-0692 (session cookie issue)
+
+ -- Matt Zimmerman <mdz@debian.org>  Mon,  8 Sep 2003 19:56:40 -0400
+
+kdebase (4:2.2.2-14.5) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Apply patch from KDE advisory 20030908 to fix local root vulnerability in
+    PAM authentication in KDM
+
+ -- Matt Zimmerman <mdz@debian.org>  Sun, 31 Aug 2003 04:39:47 -0400
+
+kdebase (4:2.2.2-14.4) stable-security; urgency=medium
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patch from Dirk Mueller (uninitialized variable use)
+    to fix problems with klipper and pasted urls (klipper/urlgrabber.cpp,
+    Bug#178407, thanks to Niccolo Rigacci)
+
+ -- Martin Schulze <joey@infodrom.org>  Sat, 12 Apr 2003 09:48:40 +0200
+
+kdebase (4:2.2.2-14.3) 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@infodrom.org>  Thu, 10 Apr 2003 11:44:04 +0200
+
+kdebase (4:2.2.2-14.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@infodrom.org>  Thu,  9 Jan 2003 09:38:33 +0100
+
+kdebase (4:2.2.2-14.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@infodrom.org>  Sun,  5 Jan 2003 21:36:47 +0100
+
+kdebase (4:2.2.2-14) unstable; urgency=high
+
+  * New maintainer.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Sun,  3 Mar 2002 01:30:00 -0600
+
+kdebase (4:2.2.2-13) unstable; urgency=low
+
+  * Adopting orphaned package. Thanks Ivan for all your great work on KDE over
+    the years; you'll be sorely missed. (closes: #127706)
+  * Relink with libpng2. (closes: #128275)
+  * debian/rules, debian/konsole.dirs:
+    - Make symlinks in the X fonts directory to Konsole fonts in
+      /usr/share/fonts in the install target. (closes: #127871)
+  * debian/kdmrc:
+    - Disallow remote users from shutting down the machine. (Yeah, yeah, I
+      know - dodgy grammar). (closes: #127616)
+  * debian/control:
+    - Depend on kdebase | x-s-m | x-w-m, instead of just the latter two, so
+      that KDE gets installed in preference to, say, GNOME. (closes: #128208)
+    - Shuffle Build-Deps back to libpng2.
+  * kpersonalizer/keyecandypage.cpp:
+    - Stop anti-aliasing from being selected by default when the level of cool
+      stuff selected is high enough.
+
+ -- Daniel Stone <daniel@sfarc.net>  Fri,  4 Jan 2002 09:14:11 -0500
+
+kdebase (4:2.2.2-12) unstable; urgency=low
+
+  * Yet another overwrite. (Closes: #126699)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 28 Dec 2001 00:15:00 -0700
+
+kdebase (4:2.2.2-11) unstable; urgency=low
+
+  * Crap.  fix -audiolibs again.
+  * Fix spelling error (Closes: #124779)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 17 Dec 2001 22:00:00 -0700
+
+kdebase (4:2.2.2-10) unstable; urgency=low
+
+  * Move the audio kcm modules over to kdebase-libs since they a) don't depend
+    on audio libs and b) are required for sound to automatically start.  
+    (Closes: #124144)
+  * More upstream konsole fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 16 Dec 2001 00:30:00 -0700
+
+kdebase (4:2.2.2-9) unstable; urgency=low
+
+  * Fix klipperrc (Closes: #123904)
+  * Add lynx/opera/etc to klipperrc
+  * Add libfam-dev to Build-Depends as well as other packages which we
+    depend on but have relied on other depended upon packages to provide.
+  * libkonq_sound.* needs to be in kdebase-audiolibs.  We don't need
+    to require libarts to be installed in order to use konq.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 15 Dec 2001 00:02:00 -0700
+
+kdebase (4:2.2.2-8) unstable; urgency=low
+
+  * Sync with upstream
+  * Fix Xsetup (Closes: #123115)
+  * Fix file location (Closes: #122621)
+  * Move keditbookmarks stuff into kdebase-libs
+  * Let's attempt to import mozilla bookmarks along with netscape automatically
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 09 Dec 2001 14:07:00 -0700
+
+kdebase (4:2.2.2-7) unstable; urgency=low
+
+  * Sync with upstream
+  * Add missing dependency for kdebase-libs to kdebase
+  * Move Sound .desktop files to kdebase-audiolibs
+  * Fix file location...
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 05 Dec 2001 16:59:00 -0700
+
+kdebase (4:2.2.2-6) unstable; urgency=low
+
+  * Move libkcm_launch.so to where it belongs (Closes: #122136)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 02 Dec 2001 15:49:00 -0700
+
+kdebase (4:2.2.2-5) unstable; urgency=low
+
+  * Crap.  Fix build-depends since we now need the latest kdelibs package
+    I uploaded first.  (Closes: #122066)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 01 Dec 2001 22:29:00 -0700
+
+kdebase (4:2.2.2-4) unstable; urgency=low
+
+  * Sync with upstream
+  * Build-Depends cleanup
+  * Depends/Suggests/etc... cleanup for freeze
+  * Build cleanup
+  * Build with xinerama support for i386
+  * Another update for Nedit.ad to work with newer Nedit
+  * Cleanup kdmrc for release..default to security
+  * Update documentation for freeze
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 30 Nov 2001 02:30:00 -0700
+
+kdebase (4:2.2.2-3) unstable; urgency=low
+
+  * Update Brazilian Portuguese debconf entries (Closes: #120841)
+  * Remove kdmrc debconf note
+  * Add in replaces to fix those people using testing who don't know
+    how to use --force-overwrite or don't know how to let dpkg fix 
+    things on the second go around.  What a waste of disk space.
+    You know...people who don't know how to use dpkg or know how
+    releases are done shouldn't be allowed to manipulate severities
+    on bug reports.  (Closes: #121163, #121165)
+  * Fix konsole (Closes: #120840, #120984, #121159)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Nov 2001 14:47:00 -0700
+
+kdebase (4:2.2.2-2) unstable; urgency=low
+
+  * Update deps to allow for temp -crypto packages
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 22 Nov 2001 22:54:00 -0700
+
+kdebase (4:2.2.2-1) unstable; urgency=low
+
+  * new upstream version
+  * Add in suggests for libpam-krb/heimdel to kdm so we can get rid of the
+    kdm-krb package
+  * Update Nedit.ad (Closes: #117881)
+  * Apply kdm cleanup patch by Branden (Closes: #118217)
+  * Fix mime checks (Closes: #117747)
+  * Fix kate syntax highlights (Closes: #113773)
+  * Add kate undocumented manpage
+  * Run lilo query for kdm with -w
+  * Fix konsole crashes (Closes: #119480)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 21 Nov 2001 16:18:00 -0700
+
+kdebase (4:2.2.1.0-7) unstable; urgency=low
+
+  * Update build-deps for lesstif-dev since certain recent versions do
+    not contain files we need to build
+  * Sync with upstream
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Oct 2001 11:37:00 -0700
+
+kdebase (4:2.2.1.0-6) unstable; urgency=low
+
+  * Sync with upstream
+  * Should fix Home/End keys (Closes: #117149, #100878, #107071, #114312)
+  * Fixes default.Schema (Closes: #107450)
+  * Transparant forgetfullness should also be fixed (Closes: #110773)
+  * Fix rearrange issues (Closes: #112113)
+  * Pause option fixed (Closes: #95928)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 26 Oct 2001 11:20:00 -0700
+
+kdebase (4:2.2.1.0-5) unstable; urgency=low
+
+  * Sync with upstream
+  * build with newer binutils
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 24 Oct 2001 10:11:00 -0700
+
+kdebase (4:2.2.1.0-4) unstable; urgency=low
+
+  * more upstream fixes
+  * Get rid of automake hacks
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 19 Oct 2001 12:46:00 -0700
+
+kdebase (4:2.2.1.0-3) unstable; urgency=low
+
+  * More konsole/transparancy fixes
+  * build against newer kdelibs with fixed shlibs.  this'll fix several problems
+    with users running incompatable versions.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 15 Oct 2001 00:30:00 -0700
+
+kdebase (4:2.2.1.0-2) unstable; urgency=low
+
+  * hopefully fix kicker/aa problems
+  * Fix Xpdf.ad (Closes: #115293)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 11 Oct 2001 13:26:00 -0700
+
+kdebase (4:2.2.1.0-1) unstable; urgency=low
+
+  * remove auto* bits from configure so it doesn't try to run them after
+    configure runs and thus re-introducing the whole automake problem with 1.5
+  * Sync with upstream..new binaries so new source version...ack
+  * Update standards version
+  * Take out the extra space in the !s390 requirement
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 08 Oct 2001 20:54:00 -0700
+
+kdebase (4:2.2.1-6) unstable; urgency=low
+ 
+  * Fix configure
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 05 Oct 2001 14:21:00 -0700
+
+kdebase (4:2.2.1-5) unstable; urgency=low
+ 
+  * build with automake 1.5..well a way around it at least for now
+  * undocumented man page (Closes: #114144)
+  * Sync with upstream
+  * don't build-dep on xserver for s390 (Closes: #114237)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 02 Oct 2001 00:01:00 -0700
+
+kdebase (4:2.2.1-4) unstable; urgency=low
+
+  * More upstream fixes
+  * don't set background in startkde script by default.  
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 27 Sep 2001 12:13:00 -0700
+
+kdebase (4:2.2.1-3) unstable; urgency=low
+ 
+  * Build-Conflicts for nas-lib so we can build properly
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 Sep 2001 19:28:00 -0700
+
+kdebase (4:2.2.1-2) unstable; urgency=low
+
+  * fix kdm preinst (Closes: #112900)
+  * fix overwrite (Closes: #112903)
+  * A couple kdm fixes and on keditbookmarks fix from upstream
+  * Use usbutils's usb.ids if it exists (Closes: #112879)
+  * konsole save fixes (Closes: #112982, 112943)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 23 Sep 2001 18:05:00 -0700
+
+kdebase (4:2.2.1-1) unstable; urgency=low
+ 
+  * New upstream version 2.2.1
+  * Fix init script (Closes: #110474)
+  * Fix --type (Closes: #109704)
+  * Fix prerm (Closes: #111223)
+  * Fixes preinst (Closes: #111584)
+  * url paste/del behaviour fixed (Closes: #98121)
+  * item list selection works (Closes: #102879)
+  * GL screensaver fixes (Closes: #109270)
+  * Fix --type foo (Closes: #109704)
+  * Fix transparency issues (Closes: #84062)
+  * File view fix (Closes: #94641)
+  * kde logo rotation fix (Closes: #95841)
+  * desktop link url added
+  * kxmlrpcd not started by default (Closes: #110381)
+  * ppc build hack/fix for linking to -lgcc
+  * Fix audiocd.desktop (Closes: #111713)
+  * Don't use objprelink
+  * Don't merge resources (Closes: #112198)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 07 Sep 2001 00:01:00 -0700
+
+kdebase (4:2.2.0.20010822-1) unstable; urgency=low
+ 
+  * Apply GL patch for Bug #109270
+  * Font/Schema/Session Management fixes for konsole
+  * Remove gvim.desktop and gvim.png files so there is no confliction with
+    new vim package.
+  * sync with upstream
+  * Fix kdm not allowing typing after the first boot
+  * kdm now uses new x-display-manager bits
+  * Fix typos and update script bits from Branden
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 22 Aug 2001 00:01:00 -0700
+
+kdebase (4:2.2.0-final-3) unstable; urgency=low
+ 
+  * Fix Typo (Closes: #109115)
+  * Fix GL bits (Closes: #109136)
+  * Fix prerm - Thanks Branden (Closes: #109142)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 19 Aug 2001 00:01:00 -0700
+
+kdebase (4:2.2.0-final-2) unstable; urgency=low
+
+  * Re-Add the *proper* Xsession script that will use the one provided
+    by Debian's X rather than the one provided by kdm which is broken.
+    The one provided by Debian works better anyways. (Closes: #108736)
+  * Fix klipperrc (Closes: #108856)
+  * Add a debconf note to kdm about SessionTypes being auto-generated.  This
+    is now noted in 3 locations.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 14 Aug 2001 16:53:00 -0700
+
+kdebase (4:2.2.0-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Fix debconf template (Closes: #107021)
+  * fix mime (Closes: #107145)
+  * Fix kdebase compile issues (Closes: #107010, #104045)
+  * Provide x-display-manager as well as all the new bells and whistles
+    that Branden Robinson hacked together to allow *dm's to play nice
+  * Move around EBS's for bug: stuff (Closes: #107832)
+  * Hack to work around hppa problems. (Closes: #108274)
+  * If ~/.resources exists, load it (Closes: #108394)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Aug 2001 01:52:00 -0700
+
+kdebase (4:2.2.0-0.3beta1-1) unstable; urgency=low
+ 
+  * Sync with upstream
+  * Fix http connection problems (Closes: 106909)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 28 Jul 2001 14:08:00 -0700
+
+kdebase (4:2.2.0-0.2beta1-2) unstable; urgency=low
+ 
+  * konsole bits are fixed (Closes: #100878)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 27 Jul 2001 02:14:00 -0700
+
+kdebase (4:2.2.0-0.2beta1-1) unstable; urgency=low
+ 
+  * add GL_LDFLAGS="-lpthread" to build process for building with X4.1
+  * Fix htdig pathing for htdig.gif (Closes: #103977)
+  * Update Build-Depends and Depends
+  * Fix pdf viewing problem (Closes: #88006)
+  * Fix reference to woody's version in userguide (Closes: #105301)
+  * kdm Brazilian debconf translations (Closes: #105374)
+  * Fix kde-update-menu script so that it can be run as a normal user 
+    (Closes: #105786)
+  * sync with upstream
+  * gcc3 fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Jul 2001 03:40:00 -0700
+
+kdebase (4:2.2.0-0.1beta1-2) unstable; urgency=low
+ 
+  * Sync with upstream
+  * Update README (Closes: #103680)
+  * Build with -mieee for Alpha
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Jul 2001 01:13:00 -0700
+
+kdebase (4:2.2.0-0.1beta1-1) unstable; urgency=low
+ 
+  * Sync with upstream
+  * Spanish template (Closes: #103065, #103232)
+  * Fix kde-update-menu (Closes: #103228)
+  * don't let debhelper compress .bz2 files
+  * Auto-build for alpha
+  * Fix overwrite (Closes: #103390)
+  * Fix "same file" problem (Closes: #103528)
+  * Add missing Build-Depends (Closes: #103535)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 04 Jul 2001 01:45:00 -0700
+
+kdebase (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * Fix konsole mappings maybe?
+  * Fix overwrites (Closes: #102852, #102856)
+  * Fixes pam file (Closes: #102854)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 29 Jun 2001 22:00:00 -0700
+
+kdebase (4:2.2.0-0beta1-2) unstable; urgency=low
+ 
+  * Fix kdm preinst
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 29 Jun 2001 09:51:00 -0700
+
+kdebase (4:2.2.0-0beta1-1) unstable; urgency=low
+
+  * Update path info in kdm files...these were in the comments so
+    it wasn't a big deal
+  * Add a comment to default kdmrc about SessionType generation
+  * Re-hash kdm README
+  * KDE 2.2 beta1
+  * Sync with upstream
+  * Fix typo in Xsetup
+  * Fix dup dependencies (Closes: #99690)
+  * Fix other replaces and whatnot (Closes: #101187)
+  * Add filterproxy,freenet user to kdmrc (Closes: #96707, #98746)
+  * Upstream reports these bugs fixed (Closes: #77151)
+  * Adding in a note about kwrited (Closes: #97245)
+  * Add w3m to klipperrc
+  * Re-adding debian xpm files
+  * Fix gdm script (Closes: #92712)
+  * Update konq mime (Closes: #97694)
+  * Fix menu-method (Closes: #98816)
+  * Change to -cvs* versioning for entrance into experimental
+  * Merge all changelogs from -alpha1 versions 
+  * This is a post alpha1 snapshot taken from the HEAD cvs branch.  The 
+    date listed in the version number states when the initial pull was made
+    however updates may and most likely will have taken place since that
+    date.  Look at it as a >= cvs{date}
+  * Generate SessionTypes line in kdmrc during kdm postinst.
+  * Change KDE logo's in konq's about:konqueror to Debian powered-by logo with
+    link to debian.org instead of kde.org
+  * Remove old menu debian xpm files and use existing debian png mimetype
+    graphic as it still looks good and is already there.
+  * Downgrade x-session-manager alternative priority to conform to policy
+    even tho there is none for x-session-manager yet.  Using x-window-manager
+    as the guide
+  * Add in a suggests for x-terminal-emulator to libkonq3
+  * Change call to konsole in libkonq3 to use x-terminal-emulator instead
+  * Add in missing mimetypes
+  * Don't run mkfontdir during package build. make sure there is not fonts.dir
+    files created
+  * Move to debhelper 3..or rather actually depend on v3 which is what 
+    we were using.
+  * Fix description of kate...oops..thanks Oswald. :)
+  * More menu clean...full pathing
+  * ton of kdm updates...basically syncing conffiles with those from
+    the xdm from 4.0.3
+  * More build-deps:
+    libogg-dev, libvorbis-dev  (For auidocd:/ support)
+  * Provide man link from kdm to chooser
+  * More build cleanup..take more of the automation out to make sure things
+    are constant
+  * Remove custom startkde
+  * Revert old overrides so we can start from scratch
+  * Add in new python-base dependency
+  * New packages: kate, kdebase-audiolibs (so that those without sound do
+    not have to install sound libs.  Your welcome.)
+  * Lots of files moving around...out of kdebase-libs into the new 
+    kdebase-audiolibs and to konqueror.  This should drastically reduce
+    the size of kdebase-libs which is required by alot of non-kdebase packages
+    in order to provide things like smtp, bug reporting, etc...
+  * And let's list the bugs fixed...
+       ctrl-u problems with location bar fixed (Closes: #81425)
+       image transparency fixed for konsole on startup (Closes: #84062)
+       fixes kwin's conflicting key accelerators (Closes: #86370)
+       fixes rendering error for www.bluesnews.com (Closes: #79800)
+       fixes button problems for katalog.ub.uni-heidelberg.de (Closes: #88934)
+       now provides the audiocd ioslave bits which allow for ripping audio
+         tracks using konqueror..ie drag and drop..I'm not saying it works...
+         just saying the code is there now...(Closes: #91829)
+       Oh...and did I say...IMP works now via konqueror!@# YEA!@#  I personally
+         can now drop netscape.
+       Fix description (Closes: #95939)
+       Fixes anchor problem (Closes: #88605)
+       New HD Templates (Closes: #94004)
+       lots and lots and lots of little things of course have been fixed
+       lots and lots and lots of little things of course have been added
+  * Move khelpcenter's menu entry into Top level Help (Closes: #93702)
+  * New man pages for: konqueror
+  * More debconf cleanup
+  * Adding in suggests for xearth
+  * Add in Dependency for x-window-manager | x-session-manager to kdm
+  * Add icons to debian sub menus
+  * kdm auto-generation of session list
+  * Merging Debian and KDE menus a bit
+  * Add lynx and links to default klipperc
+  * Fixed communicator entry in klipperrc so that it will actually launch 
+    communicator
+  * More x-terminal-emulator fixes (Closes: #99982)
+  * Fix render issues with inline scripts (Closes: #99402)
+  * Fix sed issues (Closes: #101280, #101333)
+  * Trash problem no longer exists (Closes: #101129)
+  * Now properly understands environment variables either directly or 
+    indirectly.  By release it will have a GUI option for this or will have
+    information in the FAQ on konqueror.org that will tell how to do it.  
+    (Closes: #87178)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Jun 2001 06:30:00 -0700
+
+kdebase (4:2.1.1-5) unstable; urgency=low
+ 
+  * Overhaul menu-method bits.  
+    kderemove="y"  in a menu entry will cause that menu item to not show
+    up in the KDE Debian submenu.  (Closes: #93260)
+  * Update build-depends to recognize real | virtual
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Apr 2001 17:21:00 -0700
+
+kdebase (4:2.1.1-4) unstable; urgency=low
+ 
+  * Fix a couple debconf problems
+  * Couple more lintain errors down the tubes
+  * Some more upstream fixes
+  * Remove AA items as they now go in task-kde-aa
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 07 Apr 2001 04:11:00 -0700
+
+kdebase (4:2.1.1-3) unstable; urgency=low
+ 
+  * Fix kdmrc file (Closes: #92415)
+  * Update XftConfig example
+  * Fix kfmclient and kicker crashes (Closes: #89146, #88647)
+  * More upstream fixes
+    Fix for Proxy Authentication
+  * Apply Dutch debconf konq translations (Closes: #92533)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 03 Apr 2001 10:26:00 -0700
+
+kdebase (4:2.1.1-2) unstable; urgency=low
+ 
+  * Move startkde script into /etc/kde2 so that it will be a conffile and
+    link it back to /usr/bin/kde2.  (Closes: #91787)
+  * Build on older libc
+  * Adding in recommends for klisa
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 26 Mar 2001 10:59:00 -0700
+
+kdebase (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Remove manpage alternative for x-terminal-emulator (Closes: #91357)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Mar 2001 20:49:00 -0700
+
+kdebase (4:2.1.0.1-5) unstable; urgency=low
+ 
+  * One more shot the AA settings fix
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 15 Mar 2001 20:49:00 -0700
+
+kdebase (4:2.1.0.1-4) unstable; urgency=low
+ 
+  * pam_env fixes for kdm as well as a ton of other updates to kdm
+  * Fixing a problem with the default AA settings.  It looks like I "fixed" 
+    the wrong bit when I first fixed this.  (Closes: #89741)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 15 Mar 2001 10:41:00 -0700
+
+kdebase (4:2.1.0.1-3) unstable; urgency=low
+ 
+  * Adding in debconf note for systems that have a /.kde directory
+  * Adding debconf dependency to kdm
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 13 Mar 2001 18:20:00 -0700
+
+kdebase (4:2.1.0.1-2) unstable; urgency=low
+ 
+  * Fix kdm init script. actually stop when we tell you to stop (Closes: #89235)
+  * More documentation added to the QT AA Font Howto
+  * Fix for K Menu restarts and other funky behaviour
+  * XftConfig example included
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 11 Mar 2001 05:23:00 -0700
+
+kdebase (4:2.1.0.1-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding a QT AA Font HOWTO written by Lars Knoll <lars@trolltech.com> with
+    his permission...it's been slightly modified with Debian specific infoz.
+  * Major cleanup to debian.diff
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 10 Mar 2001 00:17:00 -0700
+
+kdebase (4:2.1.0-4) unstable; urgency=low
+ 
+  * More upstream fixes
+   konqueror - minimum size for history is 1
+   konqueror - check config key for minimum size of 1
+   KSysGuardApplet - use correct catalog for translations
+   KSysGuardApplet - save settings on exit
+  * Adding in "Replaces" for faulty kde-i18n package
+  * Removing link to non-existant man page for x-session-manager
+  * Adding xserver to build-depends as the configure scripts look for it to
+    determine pathing and whatnot
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 07 Mar 2001 02:32:00 -0700
+
+kdebase (4:2.1.0-3) unstable; urgency=low
+ 
+  * Grrr...let's try this konsole thing again
+  * Add in Mozilla plugin paths for nspluginscan
+  * More upstream fixes
+  * FIXED - manual URL input. Users may have to restart KDE. (Closes: #88331)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 03 Mar 2001 00:01:00 -0700
+
+kdebase (4:2.1.0-2) unstable; urgency=low
+ 
+  * Re-Enable AA support in konsole as it's brokt if you enable AA either
+    way...but if AA support is enabled at least you can change the font. 
+  * url entry problems should also be fixed now
+  * FIXED - anyone was allowed to shutdown despite RootOnly mode
+  * More cleanup on konsole default keytabs
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 03 Mar 2001 00:01:00 -0700
+
+kdebase (4:2.1.0-1) unstable; urgency=low
+ 
+  * Changing version number so that I can re-upload the source.  This is a
+    CVS sync with the 2.1 branch which will eventually become 2.1.1
+    The main purpose for doing this is to allow an easier way for handling
+    upstream fixes as the old source had the head tag and not the branch tag.
+  * Fix kmenuedit...not sure how kmenuedit.so got moved to -dev (Closes: #87817)
+  * Include utf8.sh as konsole-utf8 (Closes: #87724)
+  * Remove hacks for XFT bug
+  * Turn off XFT for konsole as konsole doesn't handle AA very well right now
+  * Turn off AA support by default...grrrrr..this fixes alot of crashes and
+    other issues.  (Closes: #84472)
+  * Adding in Recommends for xfonts-scalable and a Suggests for xfs-xtt. If
+    AA is turned on and there are no type1 fonts it seems to be very unhappy.
+  * Includes fix for QT 2.3.0 so that the url entry problems go away
+  * Adding in Suggests for fttools (creates the fonts.dir for truetype fonts
+  * More information added to kdebase's README.debian on truetype font 
+    setup
+  * Make the XFree 3.x.x keytab for konsole the default one to fit policy
+  * Fix for stylesheet application (Closes: #87188)
+  * The url entry bug is believed to be a bug in QT and a report has gone
+    on to trolltech.  The KDE developer who made this report stated that
+    a hack patch might be applied to get around it for now.  I'm choosing not
+    to go that route.  If the bug is in QT, that's where it needs to be fixed.
+    I don't want to have to update this package and QT both to fix a single
+    problem and I definatly hate bandaides.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 01 Mar 2001 00:15:00 -0700
+
+kdebase (4:2.1-final-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Fix kdm init.d script
+  * Upping standards version
+  * Fix for "chooser not running from kdm" (Closes: #76586)
+  * Fix graphics display (Closes: #85166)
+  * Fix bg clear issue (Closes: #77649)
+  * Fix kdm and expiring passwords
+  * Fix for konq crash on startup and other crashes (Closes: 84472, #77151, #80102)
+  * Moving task-kde* packages out of kdebase source
+  * Fixes for khelpcenter hangs (Closes: #81683)
+  * konq provides ftp-client as well
+  * Update /usr/bin/kde2 script
+  * Compile ldap kioslave
+  * Updated kdm init.d script
+  * Fix these rendering issues (Closes: #87183)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdebase (4:2.1-beta2-0128-1) unstable; urgency=low
+ 
+  * More work on nspluginscan to avoid problems with faulty plugins
+  * Several small bug fixes from upstream
+  * Adding xutils to task-kde-devel package
+  * Fixing conflict with kfind (Closes: #83709)
+  * Fixing default bs for konsole for those not using "linux" or "vt100" 
+    (Closes: #83705)
+  * Adding notation to konqueror about page about kdelibs3-crypto
+  * Applying German debconf template (Closes: #83871)
+  * Should also handle upgrade cleanup better.  This is across the board but
+    affects base more than any other package. (Closes: #83543)
+  * Fixes problem with symbols in konsole (Closes: #83987)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Jan 2001 01:30:00 -0700
+
+kdebase (4:2.1-beta2-3) unstable; urgency=low
+ 
+  * Don't crash when trying to load/read faulty plugins (Closes: #82983)
+  * Moving kdesu to kdebase-libs so that we can use it without needing
+    kdebase installed
+  * Adding autoconf and gettext to build-deps
+  * Several small bug fixes from upstream
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 25 Jan 2001 02:10:00 -0700
+
+kdebase (4:2.1-beta2-2) unstable; urgency=low
+ 
+  * Updating menu entries (Closes: #83216)
+  * Fixes form content memory in konq (Closes: #77317)
+  * Fixes problem with version numbers not showing
+  * Adding Build-Depends for xutils as it seems kdm needs imake
+  * Applied patch for konq template (Closes: #83355)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 23 Jan 2001 12:36:00 -0700
+
+kdebase (4:2.1-beta2-1) unstable; urgency=low
+ 
+  * New upstream beta
+  * No Response header fixing (Closes: #77398)
+  * Fixes toolbar settings (Closes: #80487)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 22 Jan 2001 00:10:00 -0700
+
+kdebase (4:2.1-20010118-1) unstable; urgency=low
+ 
+  * More upstream fixes
+    Fix JS crashes with onmouseover
+    Updated print dialog
+  * Updated sections
+  * Change Recommend to Suggests (Closes: #82764)
+  * Another fix to the gtk non-overwrite bits
+  * clean source tree
+  * Fixing documentation inclusion and Changelog inclusion
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 18 Jan 2001 12:45:00 -0700
+
+kdebase (4:2.1-20010115-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * ask where the mozilla bookmarks are (Closes: #81710)
+  * tip that was annoying to some seems to be gone (Closes: #82253)
+  * Adding in kscreensaver pam file
+  * Updating kdmrc to match current features and all
+  * Add a link in /etc/X11/kdm to kdmrc (Closes: #82643)
+  * Updated kde2 start script that fixes overwriting of gtk confs
+  * This version fixes smb problems...you just need to make sure
+    you have smbclient installed.  Added that as a Recommend (Closes: #82612)
+  * (Closes: #76838, #77093)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 15 Jan 2001 01:00:00 -0700
+
+kdebase (4:2.1-20010109-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing some more task- related issues
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 09 Jan 2001 10:05:00 -0700
+
+kdebase (4:2.1-20010106-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Moving task- conflicts/replaces into kdebase so as to keep dist-upgrade
+    from being unhappy.  (Closes: #81365)
+  * Adding in a debconf note about SSL support
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 06 Jan 2001 20:54:00 -0700
+
+kdebase (4:2.1-20010101-2) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 04 Jan 2001 03:30:00 -0700
+
+kdebase (4:2.1-20010101-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing development task
+  * Should also fix klipper crashes (Closes: 80330) 
+        
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 05:15:00 -0700
+
+kdebase (4:2.1-20001218-2) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in a undocumented manpage for /usr/bin/kde2
+  * Fixing problem with Netscape.ad again
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Dec 2000 15:15:00 -0700
+
+kdebase (4:2.1-20001218-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fix for GDM Session (Closes: #79987)
+  * Update to kdm man page and README
+  * Adding /usr/bin/kde2 as a x-session-manager
+  * Adding new menu hints (Closes: #80022, #80020)
+  * Fixing menu-method to handle new hints
+  * Updating menu files for konqueror
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Dec 2000 11:16:00 -0700
+
+kdebase (4:2.1-20001216-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Removing x-window-alternative as it's causing more problems than 
+    solutions
+  * Adding in better notation about htdig (Closes: #79710)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 16 Dec 2000 23:13:00 -0700
+
+kdebase (4:2.1-20001213-1) unstable; urgency=low
+ 
+  * New upstream beta
+  * Fixing alternative priority for konsole
+  * Adding in a session for gdm (Closes: #74678)
+  * new x4 port of xdm -> kdm (Closes: #79196, #79509)
+  * Fix whatis typo (Closes: #78178)
+  * Fix segfaults (Closes: #78903)
+  * Adding in a Recommend for kview to konqueror (Closes: #79201)
+  * Changing x-window-manager alternative from kde2 to kwin
+  * KDM init.d script cleanup (Closes: #79320)
+  * Fixed default kdmrc script to show new options
+  * Adding in a kwm script for non-session launches
+  * Adding new users to NoUsers (Closes: #79617)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 13 Dec 2000 14:41:00 -0700
+
+kdebase (4:2.0-final-5) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing suid bits and ownerships - security fixes
+  * More suggests added
+  * Again removing update-alternatives --auto (Closes: #75623)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 14 Nov 2000 14:10:00 -0700
+
+kdebase (4:2.0-final-4.3) unstable; urgency=low
+ 
+  * New i18n patch for krdb kcontrol module
+  * More dependency work
+  * Minor tweak to Netscape.ad to fix font problem in messanger
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Nov 2000 20:00:00 -0700
+
+kdebase (4:2.0-final-4.2) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Setting konsole as a x-terminal-emulator alternative
+  * Adding in provides for www-browser and x-terminal-emulator
+  * Removing dpkg-alternatives x-windows-manager auto setting
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 10 Nov 2000 13:30:00 -0700
+
+kdebase (4:2.0-final-4.1) unstable; urgency=low
+ 
+  * Adding in menu hints
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
+                                                                                
+kdebase (4:2.0-final-4) unstable; urgency=low
+ 
+  * Minor upstream documentation updates
+  * more kdebase-libs work
+    now properly handles pop3 and other services correctly
+    now allows for email configuration without kdebase installed
+  * more dependency work with kdm (Closes: #76565)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 08 Nov 2000 17:30:00 -0700
+                                                                                
+kdebase (4:2.0-final-3.1) unstable; urgency=low
+ 
+  * applying i18n patch (Closes: #75831)
+  * more kdmrc default setting updates
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 05 Nov 2000 23:00:00 -0700
+
+kdebase (4:2.0-final-3) unstable; urgency=low
+ 
+  * more upstream fixes
+  * more kdmrc default setting updates
+  * build against new xlibs and updating depends
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 04 Nov 2000 01:00:00 -0700
+                                                                                
+kdebase (4:2.0-final-2) unstable; urgency=low
+
+  * more upstream fixes
+  * klipper should be happy again
+  * more konqueror debian settings (ie..jdk default path)
+  * Minor kde2 script fixes
+  * Fixing task-kde-devel depends
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
+
+kdebase (4:2.0-final-0) unstable; urgency=low
+ 
+  * KDE 2.0
+  * Updating nsplugin search paths
+  * Adding in suggest for java-virtual-machine
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
+                                                                                
+kdebase (4:2.0-20001016-0) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
+
+kdebase (4:2.0-20001015-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More konqueror fixes for seperate package
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 15 Oct 2000 20:05:00 -0700      
+
+kdebase (4:2.0-20001013-0) unstable; urgency=low
+ 
+  * kdmdesktop fixes from upstream
+  * more i18n work
+  * applying i18n patche
+  * more fixes for konqueror
+  * Creating a kdebase-libs package
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 13 Oct 2000 07:13:00 -0700
+
+kdebase (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * Lintian error cleanup
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 12 Oct 2000 05:30:00 -0700
+                                                                                
+kdebase (4:2.0-20001010-0) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 10 Oct 2000 17:00:00 -0700
+                                                                                
+kdebase (4:2.0-20001009-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+  * more upstream fixes
+  * minor kdmdekstop fix
+  
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 09 Oct 2000 08:00:00 -0700
+                                                                                
+kdebase (4:2.0-20001008-0) unstable; urgency=low
+ 
+  * Breaking out konqueror, konsole, libkonq3 (and -dev) into seperate packages
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 08:30:00 -0700
+                                                                                
+kdebase (4:2.0-20001006-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Applying kdebase-1.94-kwin-nofreeze-20000924.diff patch (Closes: #74051)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 08 Oct 2000 03:30:00 -0700
+                                                                                
+kdebase (4:2.0-20001006-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Breaking out crypto modules into a seperate package
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 06 Oct 2000 01:30:00 -0700
+                                                                                
+kdebase (4:2.0-20001004-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * No longer depend on versioned kdelibs
+  * Fixing up kdm's postinst to better handle kdmrc
+  * More spice for kdm
+  * Fixes the following:  (Closes: #73057, #73015, #73002, #72921, #72989, #72919, #72638) 
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:00:00 -0700
+                                                                                
+kdebase (4:2.0-20001002-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC1
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 02 Oct 2000 01:00:00 -0700
+                                                                                
+kdebase (4:2.0-20000927-2) unstable; urgency=low
+ 
+  * Fixing up dependencies forcing versioned kdelibs
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 28 Sep 2000 05:00:00 -0700
+
+kdebase (4:2.0-20000927-1) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 27 Sep 2000 22:00:00 -0700
+ 
+kdebase (4:2.0-20000925-3) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing crypto support
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 27 Sep 2000 18:00:00 -0700
+
+kdebase (4:2.0-20000925-2) unstable; urgency=low
+
+  * More upstream fixes
+  * More build-depend cleanup
+  * Clean build against new libc6
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 26 Sep 2000 22:30:00 -0700
+
+kdebase (4:2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * More build-depend cleanup
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdebase (4:2.0-20000923-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 23 Sep 2000 00:30:00 -0700
+
+kdebase (4:2.0-20000920-2) unstable; urgency=low
+ 
+  * Trying some build tweaks
+  * Fixing build-depends some more
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 22 Sep 2000 15:00:00 -0700
+
+kdebase (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes 
+  * Rebuild on kdelibs3-nossl
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Sep 2000 23:00:00 -0700
+
+kdebase (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * More upstream fixes (-beta5)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 18 Sep 2000 17:30:00 -0700
+
+kdebase (4:2.0-20000912-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Fixing typo in menu for kde window manager (Closes: #71395)
+  * Adding in menu-method fix to use .desktop instead of .kdelnk
+  * More copyright updates
+  * Fixing startmenu LD_LIBRARY_PATH problem (Closes: #10390)
+  * Fixing up Debian menu entries (Closes: #71402)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 12 Sep 2000 09:00:00 -0700
+
+kdebase (4:2.0-20000910-2) unstable; urgency=low
+
+  * Fixing Debian menu graphic problem
+  * More cleanup of kdm settings
+  * More dependency fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 10 Sep 2000 23:00:00 -0700
+
+kdebase (4:2.0-20000910-0) unstable; urgency=low
+
+  * Changing kdm banner graphic to be the Debian swirl
+  * Fixing start script so that kde actually starts with the desktop 
+    functional.  (sorry)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 10 Sep 2000 11:45:00 -0700
+
+kdebase (4:2.0-20000909-0) unstable; urgency=low
+
+  * More upstream updates
+  * More kdm cleanup (star'd password option added)
+  * Migrating binary-indep build pieces into their own area
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 09 Sep 2000 01:00:00 -0700
+
+kdebase (4:2.0-20000907-1) unstable; urgency=low
+
+  * New upstream cvs pull
+  * Built against qt 2.2 final (GPL'd version)
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 07 Sep 2000 01:00:00 -0700
+
+kdebase (4:2.0-20000905-0) unstable; urgency=low
+
+  * New upstream fixes
+  * Fixing up sections
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 05 Sep 2000 00:30:00 -0700
+
+kdebase (4:2.0-20000901-0) unstable; urgency=low
+ 
+  * New upstream fixes
+  * Fixing menu entries for konqueror
+  * Fixing build issues with random
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Sep 2000 00:02:00 -0700
+                                                                                
+kdebase (4:2.0-20000825-0) unstable; urgency=low
+ 
+  * New upstream fixes
+  * Updating kdm init script to match current xdm one
+  * Typo fixes in kdmrc
+  * Turning off xconsole by default for kdm
+  * Some work on menus
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 25 Aug 2000 21:30:00 -0700
+                                                                                
+kdebase (4:2.0-20000821-1.0) experimental; urgency=low
+ 
+  * New upstream fixes
+  * changed xdm.options to kdm.options to seperate from xdm
+  * cleaned up pre/post scripts for kdm to handle proper upgrade from
+    kdm1.  Forcing a restart (if possible and without killing the upgrade)
+    during an upgrade.
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 21 Aug 2000 22:45:00 -0700
+                                                                                
+kdebase (4:2.0-20000816-1.0) experimental; urgency=low
+
+  * New upstream beta version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 16 Aug 2000 22:30:00 -0700
+
+kdebase (4:2.0-20000810-1.0) experimental; urgency=low
+ 
+  * New upstream version
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 10 Aug 2000 02:30:00 -0700
+
+kdebase-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+ 
+  * Adding in a conflict for man2html since we provide it
+  * Fixing ln issues with documentation
+  * Fixing file permissions in CVS tree
+  * Fixing some kdm issues
+  * Changing suggest to depend for kde-i18n since some documentation, etc
+    resides in that package now.  (including english)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 21 May 2000 02:30:00 -0700
+
+kdebase-cvs (4:2.0-20000512-1.0) experimental; urgency=low
+
+  * New upstream beta version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 12 May 2000 22:30:00 -0700
+
+kdebase-cvs (4:2.0-20000314-1.0) experimental; urgency=low
+ 
+  * New upstream CVS fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 14 Mar 2000 22:30:00 -0700
+
+kdebase-cvs (4:2.0-20000306-1.1) experimental; urgency=low
+ 
+  * New upstream CVS fixes
+  * More shlibs fixes
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 06 Mar 2000 22:30:00 -0700
+
+kdebase-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+ 
+  * New upstream CVS fixes
+  * Migrating chooser over to kdm-cvs package
+  * Updating kdm config files to match current versions of xdm
+  * Fixing kdm init.d scripts to handle now missing parser script
+  * Fixing kicker applet issues (required -dev to be installed to work)
+ 
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 02 Mar 2000 22:00:00 -0700
+
+kdebase-cvs (4:2.0-20000229-1.0) experimental; urgency=low
+
+  * New upstream CVS fixes 
+  * Adding in build-depends
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
+
+kdebase-cvs (4:2.0-20000223-1.0) experimental; urgency=low
+
+  * New upstream CVS fixes
+  * Fixing pathing for kde help files
+  * Adding in md5 options to pam.d file for kdm
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 23 Feb 2000 22:00:36 -0700
+
+kdebase-cvs (4:2.0-19991130-1.0) experimental; urgency=low
+
+  * New upstream CVS fixes
+  * Removing old update-window-managers piece in leu of new udpate-alternatives
+  * Adding missing dependencies - grep, sed
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 30 Nov 1999 00:30:36 -0400
+
+kdebase-cvs (4:2.0-19991128-1.0) experimental; urgency=low
+
+  * New upstream CVS fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 28 Nov 1999 03:30:36 -0400
+
+kdebase-cvs (4:2.0-19991020-1.0) experimental; urgency=low
+
+  * New upstream CVS fixes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 20 Oct 1999 08:30:36 -0400
+
+kdebase-cvs (4:2.0-19991001-0.1) experimental; urgency=low
+
+  * new upstream version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 14:30:36 -0400
+
+kdebase-cvs (4:2.0-19990912-1.0) experimental; urgency=low
+
+  * new upstream version
+  * Cleaning up debian subtree: removing old window-managers file
+  * Finishing migration to /usr/share/doc
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 12 Sep 1999 15:00:36 -0400
+
+kdebase-cvs (4:2.0-19990903-1.0) experimental; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo@kde.org>  Fri,  3 Sep 1999 21:51:36 +0200
+
+kdebase-cvs (4:2.0-19990825-1.0) experimental; urgency=low
+
+  * New upstream CVS changes
+  * Fixes problem with /usr/bin/kde2 (missing a / )
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Aug 1999 13:00:56 -0400
+
+kdebase-cvs (4:2.0-19990825-1) experimental; urgency=low
+
+  * New upstream CVS changes
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Wed, 25 Aug 1999 07:00:56 -0400
+
+kdebase-cvs (4:2.0-19990823-1) experimental; urgency=low
+ 
+  * New upstream CVS changes
+  * Fixes bug with init.d script for kdm2
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 23 Aug 1999 07:00:56 -0400
+                                                        
+kdebase-cvs (4:2.0-19990820-1.1) experimental; urgency=low
+
+  * several small package fixes mainly with pathing
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 21 Aug 1999 00:30:56 -0400
+
+kdebase-cvs (4:2.0-19990820-1) experimental; urgency=low
+
+  * new CVS version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 20 Aug 1999 13:30:56 -0400
+
+kdebase-cvs (4:2.0-19990626-2) experimental; urgency=low
+
+  * new version
+
+ -- Stephan Kulow <coolo@kde.org>  Sat, 26 Jun 1999 22:37:56 +0200
+
+kdebase-cvs (4:2.0-19990626-1) experimental; urgency=low
+
+  * New upstream CVS version
+  * Brought in sync with -stable tree
+  * Adding in -include statements into the ./configure piece
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sat, 26 Jun 1999 06:00:29 -0400
+
+kdebase-cvs (4:2.0-19990620-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Sun, 20 Jun 1999 11:00:29 -0400
+
+kdebase-cvs (4:2.0-19990601-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Tue, 01 Jun 1999 01:00:29 -0400
+
+kdebase-cvs (4:2.0-19990531-1) experimental; urgency=low 
+
+  * Making kdm not require xdm
+  * Fixing some pam stuff which includes a /etc/pam.d/kde file, making
+    the pam name=kde so that it uses the /etc/pam.d/kde file instead of
+    xdm, kdm, or whatever.
+  * Fixing the linux fonts for konsole.
+  * Fixing the /var/state/kdm issue
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 31 May 1999 19:30:29 -0400
+
+kdebase-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * migrating back to / from /opt
+  * working in new build changes to bring package more in line with
+    current Debian dist
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 24 May 1999 07:00:29 -0400
+
+kdebase-cvs (4:2.0-19990314-3) experimental; urgency=low
+
+  * fixing some lintian problems
+
+ -- Stephan Kulow <coolo@kde.org>  Mon, 15 Mar 1999 17:17:29 +0100
+
+kdebase-cvs (4:2.0-19990314-2) experimental; urgency=low
+
+  * taking out the undocumented call
+
+ -- Stephan Kulow <coolo@kde.org>  Mon, 15 Mar 1999 16:42:47 +0100
+
+kdebase-cvs (4:2.0-19990314-1) experimental; urgency=low
+
+  * moving the -cvs from version to package name
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 14 Mar 1999 21:01:10 +0100
+
+kdebase-cvs (4:2.0-19990314-cvs-1) experimental; urgency=low
+
+  * using newest kdelibs
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 14 Mar 1999 00:16:36 +0100
+
+kdebase (4:2.0-19990309-1) experimental; urgency=low
+
+  * new upstream version with Qt 2.0
+
+ -- Stephan Kulow <coolo@kde.org>  Tue,  9 Mar 1999 23:56:08 +0100
+
+kdebase (4:1.1-19990306-1) unstable; urgency=low
+
+  * new upstream version out of CVS (many translation updates and some
+    security fixes
+
+ -- Stephan Kulow <coolo@kde.org>  Sat,  6 Mar 1999 18:03:04 +0100
+
+kdebase (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo@kde.org>  Wed, 17 Feb 1999 19:09:41 +0100
+
+kdebase (4:1.1-19990214-2) unstable; urgency=low
+
+  * move the link from /var/ to /usr, since /usr may be read only
+  * patch Xserver_0 to run kdmgreeter if kdm runs
+
+ -- Stephan Kulow <coolo@kde.org>  Tue, 16 Feb 1999 18:52:03 +0100
+
+kdebase (4:1.1-19990214-1) unstable; urgency=low
+
+  * fix some bugs (krdb & menu)
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 14 Feb 1999 21:29:34 +0100
+
+kdebase (4:1.1-19990207-3) unstable; urgency=low
+
+  * new kdmrc handling
+
+ -- Stephan Kulow <coolo@kde.org>  Fri, 12 Feb 1999 11:03:56 +0100
+
+kdebase (4:1.1-19990207-2) unstable; urgency=low
+
+  * followed the suggestion of Russel Cooker and splited kdebase
+  * fixed a bug with the jpeglib version
+
+ -- Stephan Kulow <coolo@kde.org>  Tue,  9 Feb 1999 09:59:11 +0100
+
+kdebase (4:1.1-19990207-1) unstable; urgency=low
+
+  * new upstream version 1.1 and new epoche
+
+ -- Stephan Kulow <coolo@kde.org>  Sun,  7 Feb 1999 12:12:58 +0100
+
+kdebase (2:980710-1.0-1) unstable; urgency=low
+
+  * new upstream version 1.0
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 12 Jul 1998 14:44:00 +0200
+
+kdebase (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow <coolo@kde.org>  Sun, 19 Apr 1998 15:04:38 +0200
+
+kdebase (2:980312-5) unstable; urgency=low
+
+  * remove kwm from /etc/X11/window-managers in postrm
+
+ -- Stephan Kulow <coolo@kde.org>  Fri,  3 Apr 1998 18:42:12 +0200
+
+kdebase (2:980312-4) frozen; urgency=low
+
+  * added undocumented man page
+  * renamed kdmconfig to switchdm. This name existed twice
+  * new compile with latest kdelibs shlibs
+
+ -- Stephan Kulow <coolo@kde.org>  Tue, 31 Mar 1998 20:26:23 +0200
+
+kdebase (2:980312-3) unstable; urgency=low
+
+  * use debhelper tools now
+  * changed the directory for debian apps to /var/spool/applnk
+  * set the correct UTMP file
+  * test prefix() before removing it. This should avoid a rm -rf /, when possible
+  * new kdm (with bugfixes and new location for configuration files)
+
+ -- Stephan Kulow <coolo@kde.org>  Fri, 27 Mar 1998 16:07:37 +0100
+
+kdebase (2:980312-2) frozen; urgency=low
+
+  * new compile cycle with qt-1.33 and libstd++-2.8
+
+ -- Stephan Kulow <coolo@kde.org>  Tue, 24 Mar 1998 19:07:00 +0100
+
+kdebase (2:980312-1) experimental; urgency=low
+
+  * added -O2 to CXXFLAGS
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Thu, 12 Mar 1998 23:05:14 +0100
+
+kdebase (2:980310-1) experimental; urgency=low
+
+  * disable the run of kappfinder to not create a non-KDE apps like menu twice
+  * changed the README.debian file to reflect the new state of this package
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Mon,  9 Mar 1998 23:12:46 +0100
+
+kdebase (980228-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Sat, 28 Feb 1998 21:21:55 +0100
+
+kdebase (980227-1) experimental; urgency=low
+
+  * added *.moc to the clean target
+  * added po/no/Makefile to configure.in
+  * disabled all sound applications, because mediatool is broken
+  * disabled rpath
+  * changed section to contrib
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Fri, 27 Feb 1998 20:06:44 +0100
+
+kdebase (1:980225-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo@kde.org>  Wed, 25 Dec 1998 21:48:23 +0100
+
+kdebase (1:Beta2-2.1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Fri,  5 Dec 1997 21:18:40 +0100
+
+kdebase (1:Beta2-2) unstable; urgency=low
+
+  * fixed kde / startkde script. added minimal documentation.
+  * fixed klock permissions.
+  * removed startkde script.
+  * removed virtual package names.
+  * fixed utmp file location in kvt.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sat, 29 Nov 1997 12:53:41 +0100
+
+kdebase (1:Beta2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun, 23 Nov 1997 22:27:46 +0100
+
+kdebase (1:Beta1.2-2) unstable; urgency=low
+
+  * start kdepanel only once.
+  * fixed kfm bug.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun,  9 Nov 1997 17:37:38 +0100
+
+kdebase (1:Beta1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 27 Oct 1997 11:49:11 +0100
+
+kdebase (1:Beta1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 20 Oct 1997 11:44:11 +0200
+
+kdebase (971019-1) unstable; urgency=low
+
+  * added module support to kde menu-method (untested)
+  * dependency on new menu version with extensions for kde
+  * new menu method (thanks joost) 
+  * Fixed screen saver path (debian paths)
+  * New upstream release
+  * Fixed more paths (debian paths)
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun, 19 Oct 1997 12:53:44 +0200
+
+kdebase (971013-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 13 Oct 1997 08:23:08 +0200
+
+kdebase (971011-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun, 12 Oct 1997 12:13:25 +0200
+
+kdebase (971009-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Thu,  9 Oct 1997 10:51:49 +0200
+
+kdebase (971008-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Wed,  8 Oct 1997 10:07:59 +0200
+
+kdebase (971006-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Tue,  7 Oct 1997 10:56:23 +0200
+
+kdebase (971006-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon,  6 Oct 1997 09:24:17 +0200
+
+kdebase (971005-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun,  5 Oct 1997 17:32:13 +0200
+
+kdebase (971003-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Fri,  3 Oct 1997 08:23:44 +0200
+
+kdebase (971002-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Thu,  2 Oct 1997 08:52:11 +0200
+
+kdebase (970930-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Tue, 30 Sep 1997 11:56:08 +0200
+
+kdebase (970929-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 29 Sep 1997 09:40:07 +0200
+
+kdebase (970925-2) unstable; urgency=low
+
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Fri, 26 Sep 1997 08:55:56 +0200
+
+kdebase (970925-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Thu, 25 Sep 1997 08:08:36 +0200
+
+kdebase (970924-2) unstable; urgency=low
+
+  * now use kderules.
+  * daily recompile of everything.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Wed, 24 Sep 1997 10:36:09 +0200
+
+kdebase (970924-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Wed, 24 Sep 1997 08:32:38 +0200
+
+kdebase (970923-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Tue, 23 Sep 1997 08:40:36 +0200
+
+kdebase (970922-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Mon, 22 Sep 1997 09:30:58 +0200
+
+kdebase (970921-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sun, 21 Sep 1997 13:50:08 +0200
+
+kdebase (970920-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Andreas Jellinghaus <aj@debian.org>  Sat, 20 Sep 1997 10:36:15 +0200
--- kdebase-3.5.7.orig/debian/kappfinder.manpages
+++ kdebase-3.5.7/debian/kappfinder.manpages
@@ -0,0 +1 @@
+debian/man/kappfinder.1
--- kdebase-3.5.7.orig/debian/kicker.preinst
+++ kdebase-3.5.7/debian/kicker.preinst
@@ -0,0 +1,26 @@
+#! /bin/sh -e
+
+case "$1" in
+
+    upgrade)
+	rm -f /etc/menu-methods/kdebase
+	rm -f /etc/kde3/debian/kde-update-menu.sh
+	rm -f /etc/menu-methods/kicker
+    ;;
+
+    install)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
--- kdebase-3.5.7.orig/debian/kdm.links
+++ kdebase-3.5.7/debian/kdm.links
@@ -0,0 +1 @@
+usr/share/apps/kdm/pics/users/default1.png usr/share/apps/kdm/faces/.default.face
--- kdebase-3.5.7.orig/debian/kdebase-bin.install
+++ kdebase-3.5.7/debian/kdebase-bin.install
@@ -0,0 +1,107 @@
+debian/tmp/etc/kde3/kxkb_groups
+debian/tmp/usr/bin/drkonqi
+debian/tmp/usr/bin/kapplymousetheme
+debian/tmp/usr/bin/kblankscrn.kss
+debian/tmp/usr/bin/kcheckpass
+debian/tmp/usr/bin/kcminit
+debian/tmp/usr/bin/kcminit_startup
+debian/tmp/usr/bin/kdcop
+debian/tmp/usr/bin/kdebugdialog
+debian/tmp/usr/bin/kdesu
+debian/tmp/usr/bin/kdesud
+debian/tmp/usr/bin/kdialog
+debian/tmp/usr/bin/khotkeys
+debian/tmp/usr/bin/kio_system_documenthelper
+debian/tmp/usr/bin/knetattach
+debian/tmp/usr/bin/krandom.kss
+debian/tmp/usr/bin/kreadconfig
+debian/tmp/usr/bin/kstart
+debian/tmp/usr/bin/ksystraycmd
+debian/tmp/usr/bin/kwriteconfig
+debian/tmp/usr/bin/kxkb
+debian/tmp/usr/lib/kconf_update_bin/khotkeys_update
+debian/tmp/usr/lib/kde3/kcminit.la
+debian/tmp/usr/lib/kde3/kcminit.so
+debian/tmp/usr/lib/kde3/kcminit_startup.la
+debian/tmp/usr/lib/kde3/kcminit_startup.so
+debian/tmp/usr/lib/kde3/kcm_keyboard.la
+debian/tmp/usr/lib/kde3/kcm_keyboard.so
+debian/tmp/usr/lib/kde3/kcm_khotkeys_init.la
+debian/tmp/usr/lib/kde3/kcm_khotkeys_init.so
+debian/tmp/usr/lib/kde3/kcm_khotkeys.la
+debian/tmp/usr/lib/kde3/kcm_khotkeys.so
+debian/tmp/usr/lib/kde3/kded_khotkeys.la
+debian/tmp/usr/lib/kde3/kded_khotkeys.so
+debian/tmp/usr/lib/kde3/kgreet_classic.la
+debian/tmp/usr/lib/kde3/kgreet_classic.so
+debian/tmp/usr/lib/kde3/kgreet_winbind.la
+debian/tmp/usr/lib/kde3/kgreet_winbind.so
+debian/tmp/usr/lib/kde3/khotkeys_arts.la
+debian/tmp/usr/lib/kde3/khotkeys_arts.so
+debian/tmp/usr/lib/kde3/khotkeys.la
+debian/tmp/usr/lib/kde3/khotkeys.so
+debian/tmp/usr/lib/kde3/kxkb.la
+debian/tmp/usr/lib/kde3/kxkb.so
+debian/tmp/usr/lib/libkdeinit_kcminit.so
+debian/tmp/usr/lib/libkdeinit_kcminit_startup.la
+debian/tmp/usr/lib/libkdeinit_kcminit_startup.so
+debian/tmp/usr/lib/libkdeinit_khotkeys.so
+debian/tmp/usr/lib/libkdeinit_kxkb.so
+debian/tmp/usr/lib/libkhotkeys_shared.so.1
+debian/tmp/usr/lib/libkhotkeys_shared.so.1.0.0
+debian/tmp/usr/share/applications/kde/keyboard.desktop
+debian/tmp/usr/share/applications/kde/keyboard_layout.desktop
+debian/tmp/usr/share/applications/kde/khotkeys.desktop
+debian/tmp/usr/share/applications/kde/knetattach.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KBlankscreen.desktop
+debian/tmp/usr/share/applnk/System/ScreenSavers/KRandom.desktop
+debian/tmp/usr/share/apps/drkonqi/debuggers/gdbrc
+debian/tmp/usr/share/apps/drkonqi/pics/konqi.png
+debian/tmp/usr/share/apps/drkonqi/presets/developerrc
+debian/tmp/usr/share/apps/drkonqi/presets/enduserrc
+debian/tmp/usr/share/apps/kconf_update/khotkeys_32b1_update.upd
+debian/tmp/usr/share/apps/kconf_update/khotkeys_printscreen.upd
+debian/tmp/usr/share/apps/kconf_update/konqueror_gestures_kde321_update.upd
+debian/tmp/usr/share/apps/kdcop/kdcopui.rc
+debian/tmp/usr/share/apps/khotkeys/kde32b1.khotkeys
+debian/tmp/usr/share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+debian/tmp/usr/share/apps/khotkeys/printscreen.khotkeys
+debian/tmp/usr/share/autostart/khotkeys.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kdcop/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdcop/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdcop/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdebugdialog/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdesu/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdesu/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdesu/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdesu/man-kdesu.1.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/common
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot1.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot2.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot3.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot4.png
+debian/tmp/usr/share/doc/kde/HTML/en/knetattach/screenshot.png
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/common
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/layout.png
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/switching.png
+debian/tmp/usr/share/doc/kde/HTML/en/kxkb/xkb.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/khotkeys.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kxkb.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/khotkeys.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kxkb.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/knetattach.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kxkb.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/knetattach.png
+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
--- kdebase-3.5.7.orig/debian/kdm.pam
+++ kdebase-3.5.7/debian/kdm.pam
@@ -0,0 +1,11 @@
+#
+# /etc/pam.d/kdm - specify the PAM behaviour of kdm
+#
+auth       required     pam_nologin.so
+auth       required     pam_env.so readenv=1
+auth       required     pam_env.so readenv=1 envfile=/etc/default/locale
+@include common-auth
+session    required     pam_limits.so
+@include common-account
+@include common-password
+@include common-session
--- kdebase-3.5.7.orig/debian/kcheckpass.pam
+++ kdebase-3.5.7/debian/kcheckpass.pam
@@ -0,0 +1,7 @@
+#
+# /etc/pam.d/kcheckpass - specify the PAM behaviour of kcheckpass
+#
+@include common-auth
+@include common-account
+@include common-password
+@include common-session
--- kdebase-3.5.7.orig/debian/kcontrol.README.Debian
+++ kdebase-3.5.7/debian/kcontrol.README.Debian
@@ -0,0 +1,18 @@
+KControl and Logitech mice
+==========================
+
+In combination with the udev or hotplug packages, KControl supports the
+advanced configuration of many models of Logitech mice, though regular users
+must be members of the plugdev group for this to work.
+
+Additionally, the system's kernel must be 2.6.14 or later if you are using
+udev, though earlier kernels are also supported if the hotplug package is being
+used instead. Kernel hotplugging support is essential, as is usbfs/usbdevfs if
+hotplug is being used.
+
+After installing KControl for the first time, or updating to KControl 3.4.x
+or later from an earlier package, you will need to unplug and then replug
+your mouse, in order to force udev or hotplug to grant special permissions
+to your mouse, so that KControl can perform advanced configuration.
+Rebooting or restarting udev/hotplug will of course accomplish the same
+thing.
--- kdebase-3.5.7.orig/debian/local/kdm.options.5
+++ kdebase-3.5.7/debian/local/kdm.options.5
@@ -0,0 +1,87 @@
+.\" $Id: kdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $
+.\"
+.\" Copyright 1998, 2002, 2003 Branden Robinson <branden@debian.org>.
+.\"
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; version 2.
+.\"
+.\" This 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 with
+.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
+.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
+.\" Suite 330, Boston, MA 02111-1307 USA
+.TH kdm.options 5 "2003\-09\-18" "Debian Project"
+.SH NAME
+kdm.options \- configuration options for X display manager
+.SH DESCRIPTION
+.I /etc/kde3/kdm/kdm.options
+contains a set of flags that determine some of the behavior of the
+X display manager
+.BR kdm (1).
+.PP
+.I /etc/kde3/kdm/kdm.options
+may contain comments, which begin with a hash mark and end at the next
+newline, just like comments in shell scripts.  The rest of the file
+consists of options which are expressed as words separated by hyphens, with
+only one option per line.  If an option is present with the \(oqno\-\(cq
+prefix, or absent, it is disabled, otherwise it is considered enabled.
+.PP
+Available options are:
+.TP
+.B ignore\-nologin
+Normally, the contents of the /etc/nologin file will be displayed using
+.BR xmessage (1x)
+(if
+.B xmessage
+is available), and the user will be returned to the kdm login screen after
+the xmessage is dismissed.  If this option is enabled, kdm starts a session
+as usual (after the xmessage is dismissed, if xmessage is available).
+.TP
+.B restart\-on\-upgrade
+Enable this option with caution on \(oqproduction\(cq machines; it causes
+the kdm daemon to be stopped and restarted on upgrade, even if the process
+has children (which means it is managing X sessions).  Typically when a
+package that contains a daemon is being installed or upgraded, its
+maintainer scripts stop a running daemon process before installing the new
+binary, and restart it after the new binary is installed.  Stopping kdm
+causes immediate termination of any sessions it manages; in some situations
+this could be an unwelcome surprise (for instance, for remote kdm users who
+had no idea the administrator was performing system maintenance).  On the
+other hand, for machines that stay up for long periods of time, leaving the
+old daemon running can be a bad idea if the new version has, for instance,
+a fix for a security vulnerability (overwriting kdm's executable on the
+file system has no effect on the copy of kdm in memory).  The kdm
+pre\-removal script checks to see if the kdm process has any children; if
+it does, it is possible that someone's session would be killed by stopping
+kdm, so a warning is issued and an opportunity to abort the upgrade of kdm
+is provided.  If this option is disabled (the Debian default), kdm will be
+not be stopped or started during an install or upgrade; the administrator
+will have to do so by hand (with \(oq/etc/init.d/kdm restart\(cq, or by
+rebooting the system) before the newly installed kdm binary is used.
+.TP
+.B use\-sessreg
+If this option is enabled (the Debian default), the sessreg program will be
+invoked to register X sessions managed by kdm in the utmp and wtmp files.
+Otherwise, it is not, and the utmp and wtmp files will have no record of
+kdm sessions.
+.PP
+Users of older versions of the Debian system should note that the
+\(oqrun\-xconsole\(cq option has been removed.  Shell scripts named
+.I /etc/kde3/kdm/Xsetup
+and
+.I /etc/kde3/kdm/Xreset
+can be edited to disable or modify the running of xconsole on the kdm
+greeter screen; see the
+.B kdm
+manual page for more information.
+.SH AUTHOR
+This manpage was written by Branden Robinson for the Debian Project.
+.SH SEE ALSO
+.BR sessreg (1x),
+.BR xmessage (1x),
+.BR kdm (1x)
--- kdebase-3.5.7.orig/debian/local/kdm.options
+++ kdebase-3.5.7/debian/local/kdm.options
@@ -0,0 +1,8 @@
+# /etc/kde3/kdm/kdm.options
+#
+# configuration options for kdm
+# See kdm.options(5) for an explanation of the available options.
+
+no-ignore-nologin
+no-restart-on-upgrade
+use-sessreg
--- kdebase-3.5.7.orig/debian/kcontrol.lintian
+++ kdebase-3.5.7/debian/kcontrol.lintian
@@ -0,0 +1,3 @@
+kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so
+kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so
+kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so
--- kdebase-3.5.7.orig/debian/kdm.postrm
+++ kdebase-3.5.7/debian/kdm.postrm
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+
+case "$1" in
+    purge)
+	rm -rf /var/log/kdm.log*
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then
+  # roll back displacement of default display manager file
+  if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+    # FIXME - redo this part uses shell-lib.sh from xfree86
+    #observe "rolling back change of default X display manager"
+    mv "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE"
+  fi
+fi
+
+if [ "$1" = "purge" ]; then
+  for DIR in /var/lib/kdm; do
+    if [ -d "$DIR" ]; then
+      rm -rf "$DIR"
+    fi
+  done
+  rm -f /var/log/kdm.log*
+fi
+
+#DEBHELPER#
+
+exit 0
--- kdebase-3.5.7.orig/debian/cdbs/buildvars.mk
+++ kdebase-3.5.7/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
--- kdebase-3.5.7.orig/debian/cdbs/versions.pl
+++ kdebase-3.5.7/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
--- kdebase-3.5.7.orig/debian/cdbs/debian-qt-kde.mk
+++ kdebase-3.5.7/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	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 /usr/share/cdbs/1/class/kde.mk$(_cdbs_makefile_suffix)
+include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/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
--- kdebase-3.5.7.orig/debian/cdbs/team-members
+++ kdebase-3.5.7/debian/cdbs/team-members
@@ -0,0 +1,14 @@
+Sune Vuorela <debian@pusling.com>
+Ana Beatriz Guerrero Lopez <ana@debian.org>
+Fathi Boudra <fboudra@free.fr>
+Modestas Vainius <geromanas@mailas.com>
+Josh Metzler <joshdeb@metzlers.org>
+Isaac Clerencia <isaac@debian.org>
+Adeodato Simó <dato@net.com.org.es>
+Adeodato Simo <dato@net.com.org.es>
+Christopher Martin <chrsmrtn@debian.org>
+Daniel Schepler <schepler@debian.org>
+Sarah Hobbs <hobbsee@ubuntu.com>
+Nacho Barrientos Arias <nacho@debian.org>
+Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Ricardo Cardenes <rcardenes@debian.org>
--- kdebase-3.5.7.orig/debian/cdbs/uploaders.mk
+++ kdebase-3.5.7/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
--- kdebase-3.5.7.orig/debian/kmenuedit.install
+++ kdebase-3.5.7/debian/kmenuedit.install
@@ -0,0 +1,38 @@
+debian/tmp/usr/bin/kcontroledit
+debian/tmp/usr/bin/kmenuedit
+debian/tmp/usr/lib/kde3/kcontroledit.la
+debian/tmp/usr/lib/kde3/kcontroledit.so
+debian/tmp/usr/lib/kde3/kmenuedit.la
+debian/tmp/usr/lib/kde3/kmenuedit.so
+debian/tmp/usr/lib/libkdeinit_kcontroledit.so
+debian/tmp/usr/lib/libkdeinit_kmenuedit.so
+debian/tmp/usr/share/applications/kde/kmenuedit.desktop
+debian/tmp/usr/share/applnk/System/kmenuedit.desktop
+debian/tmp/usr/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
+debian/tmp/usr/share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png
+debian/tmp/usr/share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new.png
+debian/tmp/usr/share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png
+debian/tmp/usr/share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png
+debian/tmp/usr/share/apps/kcontroledit/kcontroleditui.rc
+debian/tmp/usr/share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png
+debian/tmp/usr/share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png
+debian/tmp/usr/share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png
+debian/tmp/usr/share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png
+debian/tmp/usr/share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png
+debian/tmp/usr/share/apps/kmenuedit/kmenueditui.rc
+debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/common
+debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/done.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/itemname.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/kmenueditmain.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/new.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/selecticon.png
+debian/tmp/usr/share/doc/kde/HTML/en/kmenuedit/selectinternet.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kmenuedit.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kmenuedit.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kmenuedit.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kmenuedit.png
+
+debian/icons/kmenuedit.xpm		/usr/share/pixmaps
+debian/icons/kmenuedit-16.xpm		/usr/share/pixmaps
--- kdebase-3.5.7.orig/debian/patches/41_nspluginviewer_64bit_fix.diff
+++ kdebase-3.5.7/debian/patches/41_nspluginviewer_64bit_fix.diff
@@ -0,0 +1,38 @@
+--- kdebase/nsplugins/sdk/npapi.h	2007-02-27 20:26:32.000000000 +0200
++++ kdebase/nsplugins/sdk/npapi.h	2007-02-27 20:26:40.000000000 +0200
+@@ -8,6 +8,7 @@
+ #define _NPAPI_H_
+ 
+ #include "jri.h"                /* Java Runtime Interface */
++#include <sys/types.h>
+ 
+ #ifdef _WINDOWS
+ # ifndef XP_WIN
+@@ -55,23 +56,23 @@
+ /*----------------------------------------------------------------------*/
+ 
+ #ifndef _UINT16
+-typedef unsigned short uint16;
++typedef u_int16_t uint16;
+ #endif
+ #ifndef _UINT32
+ #if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
+ typedef unsigned int uint32;
+ #else /* __alpha || _AIX || __x86_64__ || __LP64__ */
+-typedef unsigned long uint32;
++typedef u_int32_t uint32;
+ #endif /* __alpha || _AIX || __x86_64__ || __LP64__ */
+ #endif
+ #ifndef _INT16
+-typedef short int16;
++typedef int16_t int16;
+ #endif
+ #ifndef _INT32
+ #if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
+ typedef int int32;
+ #else /* __alpha || _AIX || __x86_64__ || __LP64__ */
+-typedef long int32;
++typedef int32_t int32;
+ #endif /* __alpha || _AIX || __x86_64__ || __LP64__ */
+ #endif
+ 
--- kdebase-3.5.7.orig/debian/patches/51_CVE-2007-4569-kdm-autologin.diff
+++ kdebase-3.5.7/debian/patches/51_CVE-2007-4569-kdm-autologin.diff
@@ -0,0 +1,63 @@
+--- kdm/backend/session.c
++++ kdm/bakcend/session.c
+@@ -121,8 +121,9 @@
+ static void
+ DoAutoLogon( void )
+ {
+-	StrDup( &curuser, td->autoUser );
+-	StrDup( &curpass, td->autoPass );
++	ReStr( &curuser, td->autoUser );
++	ReStr( &curpass, td->autoPass );
++	ReStr( &curtype, "classic" );
+ 	cursource = PWSRC_AUTOLOGIN;
+ }
+ 
+@@ -141,7 +142,9 @@
+ 		td->hstent->npass = 0;
+ 		newdmrc = td->hstent->nargs;
+ 		td->hstent->nargs = 0;
++		ReStr( &curtype, "classic" );
+ 		cursource = (td->hstent->rLogin == 1) ? PWSRC_RELOGIN : PWSRC_MANUAL;
++		return 1;
+ 	} else if (*td->autoUser && !td->autoDelay && (tdiff > 0 || td->autoAgain))
+ 	{
+ 		unsigned int lmask;
+@@ -153,11 +156,9 @@
+ 		if (lmask & ShiftMask)
+ 			return 0;
+ 		DoAutoLogon();
+-	} else {
+-		cursource = PWSRC_MANUAL;
+-		return 0;
++		return 1;
+ 	}
+-	return 1;
++	return 0;
+ }
+ 
+ 
+@@ -369,6 +370,7 @@
+ 			if (curtype) free( curtype );
+ 			curtype = GRecvStr();
+ 			Debug( " type %\"s\n", curtype );
++			cursource = PWSRC_MANUAL;
+ 			if (Verify( conv_interact, rootok )) {
+ 				Debug( " -> return success\n" );
+ 				GSendInt( V_OK );
+@@ -378,7 +380,6 @@
+ 		case G_AutoLogin:
+ 			Debug( "G_AutoLogin\n" );
+ 			DoAutoLogon();
+-			StrDup( &curtype, "classic" );
+ 			if (Verify( conv_auto, FALSE )) {
+ 				Debug( " -> return success\n" );
+ 				GSendInt( V_OK );
+@@ -565,7 +566,7 @@
+ 	tdiff = td->autoAgain ? 
+ 	           1 : time( 0 ) - td->hstent->lastExit - td->openDelay;
+ 	if (AutoLogon( tdiff )) {
+-		if (!StrDup( &curtype, "classic" ) || !Verify( conv_auto, FALSE ))
++		if (!Verify( conv_auto, FALSE ))
+ 			goto gcont;
+ 		if (greeter)
+ 			GSendInt( V_OK );
--- kdebase-3.5.7.orig/debian/patches/50_several-CVE-konqueror.diff
+++ kdebase-3.5.7/debian/patches/50_several-CVE-konqueror.diff
@@ -0,0 +1,49 @@
+--- kdebase/konqueror/konq_combo.cc
++++ kdebase/konqueror/konq_combo.cc
+@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
+         kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+                                   "addToCombo(QString,QCString)", data);
+     }
++    // important security consideration: always display the beginning
++    // of the url rather than its end to prevent spoofing attempts.
++    lineEdit()->setCursorPosition( 0 );
+ }
+ 
+ void KonqCombo::setTemporary( const QString& text )
+--- kdebase/konqueror/konq_mainwindow.cc
++++ kdebase/konqueror/konq_mainwindow.cc
+@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
+   }
+   else // no known serviceType, use KonqRun
+   {
+-      if ( ( view && view == m_currentView ) ||
+-              ( !view && !req.newTab ) ) // startup with argument
++      if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup with argument
+       {
+           // Show it for now in the location bar, but we'll need to store it in the view
+           // later on (can't do it yet since either view == 0 or updateHistoryEntry will be called).
+-          kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
++          kdDebug(1202) << "setLocationBarURL (startup) : url = " << url << endl;
+           setLocationBarURL( url );
+       }
+ 
+@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
+         if ( childView )
+         {
+             enableAllActions( true );
+-
+-            m_pViewManager->setActivePart( childView->part() );
+             m_currentView = childView;
+         }
+       }
+--- kdebase/konqueror/konq_viewmgr.cc
++++ kdebase/konqueror/konq_viewmgr.cc
+@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
+ 
+ void KonqViewManager::emitActivePartChanged()
+ {
++    // prevent unnecessary multiple calls to slotPartActivated:
++    m_activePartChangedTimer->stop();
+     m_pMainWindow->slotPartActivated( activePart() );
+ }
+ 
--- kdebase-3.5.7.orig/debian/patches/11_genkdmconf.diff
+++ kdebase-3.5.7/debian/patches/11_genkdmconf.diff
@@ -0,0 +1,162 @@
+--- kde.orig/kdm/kfrontend/genkdmconf.c
++++ kde.patched/kdm/kfrontend/genkdmconf.c
+@@ -531,7 +531,7 @@
+ "# right hand sides can match.\n"
+ "#\n"
+ "\n"
+-"*					#any host can get a login window\n"
++"#*					#any host can get a login window\n"
+ "\n"
+ "#\n"
+ "# To hardwire a specific terminal to a specific host, you can\n"
+@@ -549,7 +549,7 @@
+ "# so this may not work in all environments.\n"
+ "#\n"
+ "\n"
+-"*		CHOOSER BROADCAST	#any indirect host can get a chooser\n"
++"#*		CHOOSER BROADCAST	#any indirect host can get a chooser\n"
+ "\n"
+ "#\n"
+ "# If you'd prefer to configure the set of hosts each terminal sees,\n"
+@@ -585,35 +585,25 @@
+ "#! /bin/sh\n"
+ "# Xstartup - run as root before session starts\n"
+ "\n"
+-"# By convention, both xconsole and xterm -C check that the\n"
+-"# console is owned by the invoking user and is readable before attaching\n"
+-"# the console output.  This way a random user can invoke xterm -C without\n"
+-"# causing serious grief; still, it can cause havoc, so xconsole is started\n"
+-"# by Xsetup usually.\n"
+-"# This is not required if you use PAM with the pam_console module.\n"
+-"#\n"
+-"#chown $USER /dev/console\n"
++"PATH=\"$PATH:/usr/bin/X11\"\n"
+ "\n"
+-#ifdef _AIX
+-"# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
+-"# Without it, finger errors out with \"Can't stat /dev/host:0\".\n"
+-"#\n"
+-"#devname=`echo $DISPLAY | cut -c1-8`\n"
+-"#if [ ! -d /dev/xdm ]; then\n"
+-"#  mkdir /dev/xdm\n"
+-"#  chmod 755 /dev/xdm\n"
+-"#fi\n"
+-"#touch /dev/xdm/$devname\n"
+-"#chmod 644 /dev/xdm/$devname\n"
+-"#exec sessreg -a -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
+-#else
+-"#exec sessreg -a -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
+-# ifdef BSD
+-" -x " KDMCONF "/Xservers"
+-# endif
+-#endif /* _AIX */
+-" $USER\n"
+-"\n# NOTE: The session is aborted if the last command returns non-zero.\n";
++"if [ -e /etc/nologin ]; then\n"
++"  # always display the nologin message, if possible\n"
++"  if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
++"    xmessage -file /etc/nologin -geometry 640x480\n"
++"  fi\n"
++"  if [ \"$(id -u)\" != \"0\" ] && \\\n"
++"     ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n"
++"    exit 1\n"
++"  fi\n"
++"fi\n"
++"\n"
++"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n"
++"   which sessreg > /dev/null 2>&1; then\n"
++"      exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
++"                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
++"      # NOTREACHED\n"
++"fi\n";
+ 
+ static const char def_reset[] =
+ "#! /bin/sh\n"
+@@ -629,12 +619,13 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+ "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
+ #else
+-"#exec sessreg -d -l $DISPLAY -h \"`echo $DISPLAY | cut -d: -f1`\""
+-# ifdef BSD
+-" -x " KDMCONF "/Xservers"
+-# endif
++"if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \\\n"
++"   which sessreg > /dev/null 2>&1; then\n"
++"      exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n"
++"                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
++"      # NOTREACHED\n"
++"fi\n";
+ #endif /* _AIX */
+-" $USER\n";
+ 
+ static const char def_session1[] =
+ "#! /bin/sh\n"
+@@ -666,6 +657,7 @@
+ "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
+ "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
+ "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
++"    setopt shwordsplit noextendedglob\n"
+ "    ;;\n"
+ "  */csh|*/tcsh)\n"
+ "    # [t]cshrc is always sourced automatically.\n"
+@@ -682,28 +674,8 @@
+ "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
+ "    ;;\n"
+ "esac\n"
+-"\n"
+-"[ -f /etc/xprofile ] && . /etc/xprofile\n"
+-"[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+-"\n"
+-"case $session in\n"
+-"  \"\")\n"
+-"    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+-"    ;;\n"
+-"  failsafe)\n"
+-"    exec xterm -geometry 80x24-0-0\n"
+-"    ;;\n"
+-"  custom)\n"
+-"    exec $HOME/.xsession\n"
+-"    ;;\n"
+-"  default)\n"
+-"    exec " KDE_BINDIR "/startkde\n"
+-"    ;;\n"
+-"  *)\n"
+-"    eval exec \"$session\"\n"
+-"    ;;\n"
+-"esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
++"# invoke global X session script\n"
++". /etc/X11/Xsession\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -978,29 +950,6 @@
+ 
+ 	if (maxTTY)
+ 		return;
+-	if (readFile( &it, "/etc/inittab" )) {
+-		usedFile( "/etc/inittab" );
+-		for (p = it.buf; p < it.eof; p = eol + 1) {
+-			for (eol = p; eol < it.eof && *eol != '\n'; eol++);
+-			if (*p != '#') {
+-				if ((ep = mem_mem( p, eol - p, " tty", 4 )) &&
+-				    ep < eol && isdigit( *ep ))
+-				{
+-					if (ep + 1 == eol || isspace( *(ep + 1) ))
+-						tty = *ep - '0';
+-					else if (isdigit( *(ep + 1) ) &&
+-					         (ep + 2 == eol || isspace( *(ep + 2) )))
+-						tty = (*ep - '0') * 10 + (*(ep + 1) - '0');
+-					else
+-						continue;
+-					TTYmask |= 1 << (tty - 1);
+-					if (tty > maxTTY)
+-						maxTTY = tty;
+-				}
+-			}
+-		}
+-		freeBuf( &it );
+-	}
+ 	if (!maxTTY) {
+ 		maxTTY = 6;
+ 		TTYmask = 0x3f;
--- kdebase-3.5.7.orig/debian/patches/14_kdm_no_custom.diff
+++ kdebase-3.5.7/debian/patches/14_kdm_no_custom.diff
@@ -0,0 +1,18 @@
+--- kdebase.orig/kdm/kfrontend/kgreeter.cpp
++++ kdebase/kdm/kfrontend/kgreeter.cpp
+@@ -330,7 +330,6 @@
+ KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
+ {
+ 	int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
+-	                  !strcmp( exe, "custom" ) ? 1 :
+ 	                  !strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
+ 	for (uint i = 0; i < sessionTypes.size(); i++)
+ 		if (sessionTypes[i].type == type) {
+@@ -358,7 +357,6 @@
+ 			}
+ 	}
+ 	putSession( "default", i18n("Default"), false, "default" );
+-	putSession( "custom", i18n("Custom"), false, "custom" );
+ 	putSession( "failsafe", i18n("Failsafe"), false, "failsafe" );
+ 	qBubbleSort( sessionTypes );
+ 	for (uint i = 0; i < sessionTypes.size() && !sessionTypes[i].hid; i++) {
--- kdebase-3.5.7.orig/debian/patches/18_default_fonts.diff
+++ kdebase-3.5.7/debian/patches/18_default_fonts.diff
@@ -0,0 +1,123 @@
+--- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml
++++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
+@@ -113,12 +113,12 @@
+   </panel>
+   <widgets name="Plastik" />
+   <fonts>
+-    <font value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
+-    <fixed value="Courier New,10,-1,5,50,0,0,0,0,0" object="General" />
+-    <toolBarFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
+-    <menuFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
+-    <activeFont value="Arial,12,-1,5,75,0,0,0,0,0" object="WM" />
+-    <taskbarFont value="Arial,11,-1,5,50,0,0,0,0,0" object="General" />
++    <font value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
++    <fixed value="Monospace,10,-1,5,50,0,0,0,0,0" object="General" />
++    <toolBarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
++    <menuFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
++    <activeFont value="Sans Serif,10,-1,5,75,0,0,0,0,0" object="WM" />
++    <taskbarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+     <StandardFont value="" object="FMSettings" />
+   </fonts>
+ </ktheme>
+--- kde.orig/kcontrol/kdm/kdm-font.cpp
++++ kde.patched/kcontrol/kdm/kdm-font.cpp
+@@ -92,7 +92,7 @@
+ {
+   stdFontChooser->setFont(QFont("Sans Serif", 10));
+   failFontChooser->setFont(QFont("Sans Serif", 10, QFont::Bold));
+-  greetingFontChooser->setFont(QFont("Serif", 20));
++  greetingFontChooser->setFont(QFont("Sans Serif", 22));
+ }
+ 
+ void KDMFontWidget::save()
+@@ -128,7 +128,7 @@
+ void KDMFontWidget::defaults()
+ {
+   set_def();
+-  aacb->setChecked(false);
++  aacb->setChecked(true);
+ }
+ 
+ #include "kdm-font.moc"
+--- kde.orig/kdm/config.def
++++ kde.patched/kdm/config.def
+@@ -2096,19 +2096,19 @@
+ # This needs to come _in front_ of the font settings to be effective!
+ Key: AntiAliasing
+ Type: bool
+-Default: false
++Default: true
+ User: greeter
+-Instance: #*/!
++Instance: */
+ Comment: &
+ Description:
+  Whether the fonts used in the greeter should be antialiased.
+ 
+ Key: GreetFont
+ Type: string
+-Default: "Serif,20,5,0,50,0"
++Default: "Sans Serif,22,5,0,50,0"
+ CDefault: "Serif,20,bold"
+ User: greeter:font
+-Instance: #*/"Serif,20,5,0,50,0"
++Instance: #*/"Sans Serif,22,5,0,50,0"
+ Comment: &
+ Description:
+  The font for the greeter headline.
+--- kde.orig/kcontrol/fonts/fonts.cpp
++++ kde.patched/kcontrol/fonts/fonts.cpp
+@@ -321,7 +321,7 @@
+     kglobals.setReadDefaults( useDefaults );
+ 
+     kglobals.setGroup("General");
+-    hStyle=KXftConfig::Hint::Medium;
++    hStyle=KXftConfig::Hint::Full;
+     xft.setHintStyle(hStyle);
+     xft.apply();  // Save this setting
+     kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
+@@ -439,7 +439,7 @@
+     if(hintingStyle->currentText()==KXftConfig::description((KXftConfig::Hint::Style)s))
+       return (KXftConfig::Hint::Style)s;
+ 
+-  return KXftConfig::Hint::Medium;
++  return KXftConfig::Hint::Full;
+ }
+ #endif
+ 
+@@ -504,13 +504,13 @@
+   QFont f0("Sans Serif", 10);
+   QFont f1("Monospace", 10);
+   QFont f2("Sans Serif", 10);
+-  QFont f3("Sans Serif", 9, QFont::Bold);
++  QFont f3("Sans Serif", 10, QFont::Bold);
+   QFont f4("Sans Serif", 10);
+ 
+   f0.setPointSize(10);
+   f1.setPointSize(10);
+   f2.setPointSize(10);
+-  f3.setPointSize(9);
++  f3.setPointSize(10);
+   f4.setPointSize(10);
+ 
+   defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
+--- kdebase/kcontrol/krdb/krdb.cpp
++++ kdebase/kcontrol/krdb/krdb.cpp
+@@ -523,7 +523,7 @@
+ 
+     if (kglobals.hasKey("XftHintStyle"))
+     {
+-      QString hintStyle = kglobals.readEntry("XftHintStyle", "hintmedium");
++      QString hintStyle = kglobals.readEntry("XftHintStyle", "hintfull");
+       contents += "Xft.hinting: ";
+       if(hintStyle.isEmpty())
+         contents += "-1\n";
+@@ -539,7 +539,7 @@
+ 
+     if (kglobals.hasKey("XftSubPixel"))
+     {
+-      QString subPixel = kglobals.readEntry("XftSubPixel");
++      QString subPixel = kglobals.readEntry("XftSubPixel", "none");
+       if(!subPixel.isEmpty())
+         contents += "Xft.rgba: " + subPixel + '\n';
+     }
--- kdebase-3.5.7.orig/debian/patches/40_kdm_override_docs.diff
+++ kdebase-3.5.7/debian/patches/40_kdm_override_docs.diff
@@ -0,0 +1,15 @@
+--- kdm/config.def.orig	2007-01-27 13:37:13.000000000 +0100
++++ kdm/config.def	2007-01-27 13:39:53.000000000 +0100
+@@ -91,6 +91,12 @@
+ <kdmrc>
+  &kdm; master configuration file
+  _
++ Please note: Settings in this file are sometimes ignored (overridden).
++ The default KDM startup script /etc/init.d/kdm looks in /etc/default/kdm.d
++ for theme-related settings which, if found, take precedence. The possibly 
++ overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme.
++ See /usr/share/doc/kdm/README.Debian for details
++ _
+  Definition: the greeter is the login dialog, i.e., the part of &kdm;
+  which the user sees.
+  _
--- kdebase-3.5.7.orig/debian/patches/10_kdmrc_defaults.diff
+++ kdebase-3.5.7/debian/patches/10_kdmrc_defaults.diff
@@ -0,0 +1,98 @@
+--- kde.orig/kcontrol/kdm/kdm-appear.cpp
++++ kde.patched/kcontrol/kdm/kdm-appear.cpp
+@@ -440,7 +440,7 @@
+   config->setGroup("X-*-Greeter");
+ 
+   // Read the greeting string
+-  greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to %s at %n")));
++  greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to Debian at %n")));
+ 
+   // Regular logo or clock
+   QString logoArea = config->readEntry("LogoArea", "Logo" );
+@@ -483,7 +483,7 @@
+ 
+ void KDMAppearanceWidget::defaults()
+ {
+-  greetstr_lined->setText( i18n("Welcome to %s at %n") );
++  greetstr_lined->setText( i18n("Welcome to Debian at %n") );
+   logoRadio->setChecked( true );
+   slotAreaRadioClicked( KdmLogo );
+   setLogo( "" );
+--- kde.orig/kdm/config.def
++++ kde.patched/kdm/config.def
+@@ -47,11 +47,11 @@
+ #endif
+ 
+ #if defined(BSD) || defined(__linux__)
+-# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games"
+-# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11"
+ #else
+-# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games:/usr/ucb"
+-# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR ":/etc:/usr/ucb"
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games:/usr/ucb"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/etc:/usr/ucb"
+ #endif
+ 
+ #if 0 /*def HASXDMAUTH*/
+@@ -1355,7 +1355,7 @@
+  This string is subject to word splitting.
+  </para><para>
+  The default is something reasonable for the system on which &kdm; was built,
+- like <command>/usr/X11R6/bin/X</command>.
++ like <command>/usr/bin/X</command>.
+ 
+ Key: ServerArgsLocal
+ Type: string
+@@ -1921,10 +1921,10 @@
+ 
+ Key: SessionsDirs
+ Type: list
+-Default: KDMDATA "/sessions"
++Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
+ User: core
+ User: greeter-c
+-Instance: #*/"/etc/X11/sessions,/usr/share/xsessions"
++Instance: #*/"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
+ Comment:
+  The directories containing session type definitions in .desktop format.
+ Description:
+@@ -1948,7 +1948,7 @@
+ 
+ Key: UseSessReg
+ Type: bool
+-Default: true
++Default: false
+ User: core
+ Instance: #*/!
+ Comment:
+@@ -2044,9 +2044,9 @@
+ 
+ Key: GreetString
+ Type: string
+-Default: "Welcome to %s at %n"
++Default: "Welcome to Debian at %n"
+ User: greeter
+-Instance: #*/"K Desktop Environment (%n)"
++Instance: #*/"Welcome to Debian at %n"
+ Comment:
+  The headline in the greeter. The following character pairs are replaced:
+  - %d -> current display
+@@ -2482,7 +2482,6 @@
+ Default: 0
+ User: greeter
+ Instance: #*/
+-Update: upd_forgingseed
+ Comment:
+  Random seed for forging saved session types, etc. of unknown users.
+  This value should be random but constant across the login domain.
+@@ -2579,7 +2578,7 @@
+ Type: bool
+ Default: true
+ User: greeter
+-Instance: :*/false
++Instance: :*/true
+ Comment: &
+ Description:
+  Show the <guilabel>Restart X Server</guilabel>/<guilabel>Close Connection</guilabel> action in the greeter.
--- kdebase-3.5.7.orig/debian/patches/20_applications_menu_move.diff
+++ kdebase-3.5.7/debian/patches/20_applications_menu_move.diff
@@ -0,0 +1,20 @@
+--- kde.orig/doc/userguide/kde-for-admins.docbook
++++ kde.patched/doc/userguide/kde-for-admins.docbook
+@@ -1669,7 +1669,7 @@
+ </para>
+ 
+ <informalexample>
+-<para>Example from <filename>applications.menu</filename>:
++<para>Example from <filename>kde-applications.menu</filename>:
+ <programlisting>
+ <markup>
+ 	&lt;Menu&gt;
+@@ -1743,7 +1743,7 @@
+ information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para>
+ 
+ <informalexample>
+-<para>Example from <filename>applications.menu</filename>:
++<para>Example from <filename>kde-applications.menu</filename>:
+ <programlisting>
+ <markup>
+              &lt;Menu&gt;
--- kdebase-3.5.7.orig/debian/patches/23_startkde_kpersonalizer.diff
+++ kdebase-3.5.7/debian/patches/23_startkde_kpersonalizer.diff
@@ -0,0 +1,35 @@
+--- kde.orig/startkde
++++ kde.patched/startkde
+@@ -284,17 +284,21 @@
+ 
+ # run KPersonalizer before the session, if this is the first login
+ if test "$kpersonalizerrc_general_firstlogin" = "true"; then
+-    # start only dcopserver, don't start whole kdeinit (takes too long)
+-    echo 'startkde: Running kpersonalizer...'  1>&2
+-    dcopserver
+-    kwin --lock &
+-    kpersonalizer --before-session
+-    # handle kpersonalizer restarts (language change)
+-    while test $? -eq 1; do
+-        kpersonalizer --r --before-session
+-    done
+-    dcopquit kwin
+-    dcopserver_shutdown --wait
++    if [ ! -x /usr/bin/kpersonalizer ]; then
++        echo 'startkde: kpersonalizer not found! Please install to properly configure your user.'  1>&2
++    else
++        # start only dcopserver, don't start whole kdeinit (takes too long)
++        echo 'startkde: Running kpersonalizer...'  1>&2
++        dcopserver
++        kwin --lock &
++        kpersonalizer --before-session
++        # handle kpersonalizer restarts (language change)
++        while test $? -eq 1; do
++            kpersonalizer --r --before-session
++        done
++        dcopquit kwin
++        dcopserver_shutdown --wait
++    fi
+ fi
+ 
+ if test -z "$dl"; then
--- kdebase-3.5.7.orig/debian/patches/15_cups_docroot.diff
+++ kdebase-3.5.7/debian/patches/15_cups_docroot.diff
@@ -0,0 +1,34 @@
+--- kde.orig/doc/kdeprint/cups-config.docbook
++++ kde.patched/doc/kdeprint/cups-config.docbook
+@@ -487,11 +487,11 @@
+ <term><guilabel>Server group</guilabel></term>
+ <listitem>
+ <para>The group the server runs under.  Normally this must be
+-<systemitem class="groupname">sys</systemitem>, however you can
++<systemitem class="groupname">lpadmin</systemitem>, however you can
+ configure things for another group as needed.</para>
+
+ <informalexample>
+-<para>Enter for example <userinput>sys</userinput>.</para>
++<para>Enter for example <userinput>lpadmin</userinput>.</para>
+ </informalexample>
+ </listitem>
+ </varlistentry>
+@@ -1012,7 +1012,7 @@
+ <listitem>
+ <para>The root folder for &HTTP; documents that are served.  By
+ default the compiled in folder, <filename
+-class="directory">/usr/share/cups/doc</filename></para>
++class="directory">/usr/share/cups/doc-root</filename></para>
+ </listitem>
+ </varlistentry>
+ 
+@@ -1756,7 +1756,7 @@
+ <para>The group name for <systemitem
+ class="groupname">System</systemitem> or printer administration
+ access.  The default varies depending on the operating system, but
+-will be <systemitem class="groupname">sys</systemitem>, <systemitem
++will be <systemitem class="groupname">lpadmin</systemitem>, <systemitem
+ class="groupname">system</systemitem> or <systemitem
+ class="groupname">root</systemitem> (checked for in that order).</para>
+ </listitem>
--- kdebase-3.5.7.orig/debian/patches/common/03_libtool_update.diff
+++ kdebase-3.5.7/debian/patches/common/03_libtool_update.diff
@@ -0,0 +1,7857 @@
+diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
+--- a/admin/libtool.m4.in	2007-05-14 12:58:18.000000000 +0200
++++ b/admin/libtool.m4.in	2007-05-14 23:36:38.000000000 +0200
+@@ -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@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 48 Debian 1.5.22-4 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"
+@@ -172,6 +157,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -191,15 +177,17 @@
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
+   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*)
+@@ -240,11 +228,56 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _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; /^ *+/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; /^ *+/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 +350,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 +527,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 +545,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -547,6 +578,22 @@
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
++sparc*-*solaris*)
++  # 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
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)    LD="${LD-ld} -64" ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -578,7 +625,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 +635,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 -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+      fi
+    fi
+@@ -615,11 +664,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 -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
+      else
+        $2=yes
+      fi
+@@ -643,7 +697,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 +726,70 @@
+     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`
++    ;;
++
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
++
++  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
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    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.
+@@ -702,7 +806,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -710,7 +814,7 @@
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -776,17 +880,19 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
+ }]
+ 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 ;;
+       x$lt_dlneed_uscore) $2 ;;
+-      x$lt_unknown|x*) $3 ;;
++      x$lt_dlunknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+@@ -798,7 +904,7 @@
+ 
+ 
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -835,7 +941,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -869,7 +975,7 @@
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -882,7 +988,7 @@
+     ])
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+     	  lt_cv_dlopen_self_static, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+@@ -924,20 +1030,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 +1048,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 -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || 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 +1118,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 +1176,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -1085,7 +1189,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1199,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 +1277,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 +1286,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 +1302,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -1197,7 +1314,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 +1345,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 +1368,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,20 +1391,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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'
+-  ;;
+-
+-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,14 +1419,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -1331,9 +1451,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 +1468,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 +1479,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
+@@ -1371,6 +1491,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  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'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -1414,29 +1546,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-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'
+   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 -a ! -h /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 +1575,18 @@
+   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'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -1455,7 +1596,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
+@@ -1483,8 +1624,13 @@
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   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 +1650,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'
+@@ -1522,13 +1668,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -1554,7 +1693,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -1587,6 +1726,29 @@
+   fi
+   ;;
+ 
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1600,6 +1762,11 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+ 
+@@ -1624,6 +1791,9 @@
+       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+   fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+@@ -1650,7 +1820,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 +1884,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
+@@ -1750,7 +1922,7 @@
+ 
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -1886,7 +2058,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 +2168,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 +2200,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 +2227,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='$LTCC $LTCFLAGS -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 +2269,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* | 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 +2314,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
+@@ -2157,43 +2330,27 @@
+   esac
+   ;;
+ 
++interix3*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
++
+ 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`
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-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,32 +2369,22 @@
+   ;;
+ 
+ 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
+-  ;;
+-
+-sco3.2v5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   case $host_vendor in
+   motorola)
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+@@ -2258,10 +2405,13 @@
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+@@ -2281,36 +2431,43 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
+ 	  break
+ 	  ;;
+ 	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
+ 	  ;;
+ 	esac
+-      esac
+-    fi
++      fi
++    done
++    IFS="$lt_save_ifs"
+   done
+-  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -2342,13 +2499,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 +2524,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 +2568,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
+ # --------------
+@@ -2454,7 +2622,7 @@
+ 
+ 
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -2487,36 +2655,9 @@
+ 
+ _LT_AC_SYS_COMPILER
+ 
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+-    ;;
+-  esac
+-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 :
+-  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
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -2530,9 +2671,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+ 
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+@@ -2541,7 +2682,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 +2691,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 +2720,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)=
+@@ -2628,6 +2732,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -2645,7 +2750,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
+@@ -2655,11 +2760,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\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
+ lt_save_LD=$LD
+@@ -2670,18 +2779,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+-  unset lt_cv_prog_gnu_ld
++  $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+-  unset lt_cv_path_LD
++  $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ 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 +2808,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 +2835,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 +2865,23 @@
+       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 +2898,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`
+@@ -2793,8 +2917,12 @@
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	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 +2931,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 +2949,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 '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${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 '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_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
+@@ -2835,16 +2963,26 @@
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ 	_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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+     fi
+     ;;
++
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      _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
++    ;;
++
+   chorus*)
+     case $cc_basename in
+       *)
+@@ -2858,12 +2996,12 @@
+     # _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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $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 +3010,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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $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'
+-      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(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
+-    ;;
++    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
++          _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
++        ;;
+ 
+   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 +3095,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* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -2970,12 +3119,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 +3133,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,33 +3147,22 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      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, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++      case $host_cpu in
++      hppa*64*|ia64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-        ;;
+-      ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         ;;
+       *)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
+-    hppa*64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    ia64*)
++    case $host_cpu in
++    hppa*64*|ia64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+       ;;
+     *)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+@@ -3035,17 +3173,20 @@
+     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
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++      aCC*)
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _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 +3202,15 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	    case $host_cpu in
++	    hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    ia64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    *)
+-	      _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
+@@ -3077,11 +3221,25 @@
+ 	;;
+     esac
+     ;;
++  interix3*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
+   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 +3250,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
+@@ -3103,16 +3261,16 @@
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     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 +3288,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 +3353,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -3181,7 +3363,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-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 +3374,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 +3408,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 +3433,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 +3452,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 +3467,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 +3496,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)=:
+@@ -3319,27 +3517,14 @@
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+-  sco*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+   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 +3537,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 +3571,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 +3583,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 +3594,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
+@@ -3427,12 +3609,63 @@
+ 	;;
+     esac
+     ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
+     ;;
+   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
+@@ -3469,8 +3702,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -3488,7 +3719,7 @@
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+ 
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
++# ------------------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+@@ -3542,7 +3773,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 +3813,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,13 +3849,37 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix3*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_AC_TAGVAR(predep_objects,$1)=
++  _LT_AC_TAGVAR(postdep_objects,$1)=
++  _LT_AC_TAGVAR(postdeps,$1)=
++  ;;
++
++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
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+ 
+ # AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
++# --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3668,12 +3923,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 +3942,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 +3950,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])
+@@ -3702,8 +3963,6 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+@@ -3713,8 +3972,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -3743,20 +4000,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
+@@ -3768,8 +4032,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+@@ -3779,7 +4041,7 @@
+ 
+ 
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
++# -------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3803,11 +4065,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 +4100,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 LTCFLAGS 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 +4155,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 +4221,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 +4256,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
+@@ -3999,6 +4273,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+@@ -4018,7 +4295,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 +4326,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4341,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 +4570,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 +4615,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,14 +4636,30 @@
+   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* | k*bsd*-gnu)
++  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]]'
+   ;;
+ osf*)
+   symcode='[[BCDEGQRST]]'
+   ;;
+-solaris* | sysv5*)
+-  symcode='[[BDT]]'
++solaris*)
++  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[[ABDT]]'
+   ;;
+ sysv4)
+   symcode='[[DFNSTU]]'
+@@ -4384,14 +4677,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
+@@ -4547,6 +4843,10 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -4555,7 +4855,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 +4880,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 +4909,22 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | 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"
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${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
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -4627,9 +4937,13 @@
+ 	    ;;
+ 	esac
+ 	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
+       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.
+@@ -4638,20 +4952,26 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	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 +4988,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-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
+@@ -4700,24 +5020,15 @@
+ 	;;
+       psos*)
+ 	;;
+-      sco*)
+-	case $cc_basename in
+-	  CC)
+-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-	    ;;
+-	  *)
+-	    ;;
+-	esac
+-	;;
+       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 +5038,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 +5053,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -4750,7 +5061,14 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      unixware*)
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    _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'
++	    ;;
++	esac
+ 	;;
+       vxworks*)
+ 	;;
+@@ -4797,6 +5115,11 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
++    interix3*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -4813,7 +5136,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 +5162,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 +5183,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
+ 	;;
+@@ -4873,13 +5206,20 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    linux*)
+-      case $CC in
++    linux* | k*bsd*-gnu)
++      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.
+@@ -4894,15 +5234,15 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+-      ;;
+-
+     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*)
+@@ -4911,7 +5251,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++    sysv4 | sysv4.2uw2* | sysv4.3*)
+       _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'
+@@ -4924,6 +5264,17 @@
+       fi
+       ;;
+ 
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      _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'
++      ;;
++
++    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 +5302,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)=
+@@ -4960,6 +5311,16 @@
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+     ;;
+ esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++  $lt_tmp_static_flag,
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
+ 
+ 
+@@ -4984,7 +5345,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* | k*bsd*-gnu)
++    _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 +5374,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 +5391,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
+@@ -5037,6 +5402,10 @@
+       with_gnu_ld=no
+     fi
+     ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+@@ -5047,6 +5416,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 +5474,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@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 +5484,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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $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,23 +5499,70 @@
+ 	  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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    interix3*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    linux* | k*bsd*-gnu)
++      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)
+       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
+       ;;
+ 
+-    solaris* | sysv5*)
++    solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<EOF 1>&2
+@@ -5139,13 +5576,40 @@
+ 
+ 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
+       ;;
+ 
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	  fi
++	;;
++      esac
++      ;;
++
+     sunos4*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -5155,24 +5619,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)
+@@ -5184,7 +5643,7 @@
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5206,9 +5665,21 @@
+ 	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 +5696,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`
+@@ -5244,8 +5715,12 @@
+   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	  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
+@@ -5253,30 +5728,30 @@
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='-qmkshrobj ${wl}-G'
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
+ 	  else
+-	    shared_flag='-qmkshrobj'
+-  	fi
++	    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 '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${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 '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_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
+@@ -5285,13 +5760,11 @@
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ 	  _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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+@@ -5304,7 +5777,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -5314,69 +5787,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 +5882,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* | 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 +5891,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
+@@ -5432,47 +5905,62 @@
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
+ 
+-    hpux10* | hpux11*)
++    hpux10*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	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 -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      fi
++      ;;
++
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -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
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	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, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	case $host_cpu in
++	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+ 	*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 
+@@ -5486,7 +5974,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 +5984,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-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 +6007,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 +6018,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 +6029,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 +6048,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'
+@@ -5573,21 +6062,15 @@
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
+-
+     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 +6079,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 +6099,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
+@@ -5654,36 +6147,45 @@
+       fi
+       ;;
+ 
+-    sysv4.2uw2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++      runpath_var='LD_RUN_PATH'
+ 
+-   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,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$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,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    sysv5*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      _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'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+       runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
+       ;;
+ 
+     uts4*)
+@@ -5701,11 +6203,6 @@
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -5726,13 +6223,14 @@
+       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
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -5860,7 +6358,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	2007-05-14 12:58:18.000000000 +0200
++++ b/admin/ltmain.sh	2007-05-14 23:36:38.000000000 +0200
+@@ -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@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.22 Debian 1.5.22-4"
++TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++
++# 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.
+@@ -111,6 +132,8 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ 
+@@ -118,10 +141,51 @@
+ # Shell function definitions:
+ # This seems to be the best place for them
+ 
++# func_mktempdir [string]
++# Make a temporary directory that won't clash with other running
++# libtool processes, and avoids race conditions if possible.  If
++# given, STRING is the basename for that directory.
++func_mktempdir ()
++{
++    my_template="${TMPDIR-/tmp}/${1-$progname}"
++
++    if test "$run" = ":"; then
++      # Return a directory name, but don't create it in dry-run mode
++      my_tmpdir="${my_template}-$$"
++    else
++
++      # If mktemp works, use that first and foremost
++      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++
++      if test ! -d "$my_tmpdir"; then
++	# Failing that, at least try and use $RANDOM to avoid a race
++	my_tmpdir="${my_template}-${RANDOM-0}$$"
++
++	save_mktempdir_umask=`umask`
++	umask 0077
++	$mkdir "$my_tmpdir"
++	umask $save_mktempdir_umask
++      fi
++
++      # If we're not in dry-run mode, bomb out on failure
++      test -d "$my_tmpdir" || {
++        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++	exit $EXIT_FAILURE
++      }
++    fi
++
++    $echo "X$my_tmpdir" | $Xsed
++}
++
++
++# 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,17 +194,16 @@
+     ;;
+   *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
+-        win32_libid_type="x86 archive import"
+-      else
+-        win32_libid_type="x86 archive static"
+-      fi
++	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++      case $win32_nmres in
++      import*)  win32_libid_type="x86 archive import";;
++      *)        win32_libid_type="x86 archive static";;
++      esac
+     fi
+     ;;
+-  *DLL*) 
++  *DLL*)
+     win32_libid_type="x86 DLL"
+     ;;
+   *executable*) # but shell scripts are "executable" too...
+@@ -154,9 +217,181 @@
+   $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"
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++	exit $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\"
++
++disable_libs=no
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -176,12 +411,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 +427,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 +456,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 +493,7 @@
+     else
+       $echo "disable static libraries"
+     fi
+-    exit 0
++    exit $?
+     ;;
+ 
+   --finish) mode="finish" ;;
+@@ -268,13 +505,19 @@
+ 
+   --quiet | --silent)
+     show=:
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+-  --tag) prevopt="--tag" prev=tag ;;
++  --tag)
++    prevopt="--tag"
++    prev=tag
++    preserve_args="$preserve_args --tag"
++    ;;
+   --tag=*)
+     set tag "$optarg" ${1+"$@"}
+     shift
+     prev=tag
++    preserve_args="$preserve_args --tag"
+     ;;
+ 
+   -dlopen)
+@@ -285,7 +528,7 @@
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+ 
+   *)
+@@ -298,9 +541,21 @@
+ if test -n "$prevopt"; then
+   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
++case $disable_libs in
++no) 
++  ;;
++shared)
++  build_libtool_libs=no
++  build_old_libs=yes
++  ;;
++static)
++  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++  ;;
++esac
++
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+@@ -311,7 +566,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 +609,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 +624,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 +651,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 +676,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 +714,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 +729,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 +766,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 +811,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 +822,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 +841,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 +851,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 +869,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,18 +903,18 @@
+       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
+ 	$show "$mkdir ${xdir}$objdir"
+ 	$run $mkdir ${xdir}$objdir
+-	status=$?
+-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+-	  exit $status
++	exit_status=$?
++	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++	  exit $exit_status
+ 	fi
+       fi
+ 
+@@ -681,7 +929,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 +949,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 +970,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 +986,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 +1001,7 @@
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -771,7 +1021,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed
+@@ -809,7 +1059,7 @@
+       $run $rm "$lockfile"
+     fi
+ 
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool link mode
+@@ -835,7 +1085,7 @@
+       ;;
+     esac
+     libtool_args="$nonopt"
+-    base_compile="$nonopt"
++    base_compile="$nonopt $@"
+     compile_command="$nonopt"
+     finalize_command="$nonopt"
+ 
+@@ -847,7 +1097,6 @@
+     old_convenience=
+     deplibs=
+     old_deplibs=
+-    add_flags=
+     compiler_flags=
+     linker_flags=
+     dllsearchpath=
+@@ -868,6 +1117,8 @@
+     no_install=no
+     objs=
+     non_pic_objects=
++    notinst_path= # paths that contain not-installed libtool libraries
++    precious_files_regex=
+     prefer_static_libs=no
+     preload=no
+     prev=
+@@ -881,6 +1132,8 @@
+     vinfo=
+     vinfo_number=no
+ 
++    func_infer_tag $base_compile
++
+     # We need to know -static, to get the right output filenames.
+     for arg
+     do
+@@ -893,14 +1146,15 @@
+ 	  if test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=yes
+ 	else
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
++	  prefer_static_libs=built
+ 	fi
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+-	prefer_static_libs=yes
+ 	break
+ 	;;
+       esac
+@@ -912,7 +1166,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 +1229,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 +1244,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	precious_regex)
++	  precious_files_regex="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -1023,7 +1281,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.
+@@ -1071,12 +1329,17 @@
+ 		  if test -z "$pic_object" || test "$pic_object" = none ; then
+ 		    arg="$non_pic_object"
+ 		  fi
++		else
++		  # If the PIC object exists, use it instead.
++		  # $xdir was prepended to $pic_object above.
++		  non_pic_object="$pic_object"
++		  non_pic_objects="$non_pic_objects $non_pic_object"
+ 		fi
+ 	      else
+ 		# 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 +1360,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 +1372,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 +1412,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|darwin_framework_skip)
++	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+@@ -1210,7 +1472,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 +1482,18 @@
+ 	continue
+ 	;;
+ 
++      -framework|-arch|-isysroot)
++	case " $CC " in
++	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
++		prev=darwin_framework_skip ;;
++	  *) compiler_flags="$compiler_flags $arg"
++	     prev=darwin_framework ;;
++	esac
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
++	continue
++	;;
++
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
+@@ -1246,7 +1520,8 @@
+ 	  absdir=`cd "$dir" && pwd`
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+-	    exit 1
++	    absdir="$dir"
++	    notinst_path="$notinst_path $dir"
+ 	  fi
+ 	  dir="$absdir"
+ 	  ;;
+@@ -1260,10 +1535,15 @@
+ 	esac
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$dir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$dir";;
+ 	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
+ 	  ;;
+ 	esac
+ 	continue
+@@ -1272,26 +1552,35 @@
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
++	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+-	  *-*-mingw* | *-*-os2*)
++	  *-*-os2*)
+ 	    # 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
++	    ;;
++	  *-*-sco3.2v5* | *-*-sco5v6*)
++	    # Causes problems with __ctype
++	    test "X$arg" = "X-lc" && continue
++	    ;;
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	    # Compiler inserts libc in the correct place for threads to work
++	    test "X$arg" = "X-lc" && 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 +1590,41 @@
+ 	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
++      # -m*, -t[45]*, -txscale* pass through architecture-specific
++      # compiler args for GCC
++      # -pg pass through profiling flag for GCC
++      # @file GCC response files
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
++      -t[45]*|-txscale*|@*)
++
+ 	# 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"`
+@@ -1323,9 +1635,7 @@
+ 	esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+-        if test "$with_gcc" = "yes" ; then
+-          compiler_flags="$compiler_flags $arg"
+-        fi
++        compiler_flags="$compiler_flags $arg"
+         continue
+         ;;
+ 
+@@ -1365,6 +1675,11 @@
+ 
+       -o) prev=output ;;
+ 
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
++
+       -release)
+ 	prev=release
+ 	continue
+@@ -1387,7 +1702,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 +1788,6 @@
+ 	continue
+ 	;;
+ 
+-      -framework)
+-        prev=framework
+-	continue
+-	;;
+-
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1798,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+ 
+       *.$objext)
+@@ -1516,7 +1825,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.
+@@ -1564,12 +1873,17 @@
+ 	    if test -z "$pic_object" || test "$pic_object" = none ; then
+ 	      arg="$non_pic_object"
+ 	    fi
++	  else
++	    # If the PIC object exists, use it instead.
++	    # $xdir was prepended to $pic_object above.
++	    non_pic_object="$pic_object"
++	    non_pic_objects="$non_pic_objects $non_pic_object"
+ 	  fi
+ 	else
+ 	  # 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 +1937,6 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-	add_flags="$add_flags $arg"
+ 	;;
+       esac # arg
+ 
+@@ -1637,48 +1950,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
+@@ -1711,9 +1983,9 @@
+     if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+-      status=$?
+-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+-	exit $status
++      exit_status=$?
++      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++	exit $exit_status
+       fi
+     fi
+ 
+@@ -1722,7 +1994,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 +2004,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
+       ;;
+     *)
+@@ -1776,7 +2048,6 @@
+     newlib_search_path=
+     need_relink=no # whether we're linking any uninstalled libtool libraries
+     notinst_deplibs= # not-installed libtool libraries
+-    notinst_path= # paths that contain not-installed libtool libraries
+     case $linkmode in
+     lib)
+ 	passes="conv link"
+@@ -1785,7 +2056,7 @@
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	done
+@@ -1811,7 +2082,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 +2097,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 +2174,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 +2189,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 +2221,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"
+@@ -2004,15 +2286,15 @@
+ 	esac # case $deplib
+ 	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+-	  exit 1
++	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
++	  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 +2310,8 @@
+ 	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
+ 	shouldnotlink=no
++	avoidtemprpath=
++
+ 
+ 	# Read the .la file
+ 	case $lib in
+@@ -2035,13 +2319,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 +2329,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 +2362,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 +2410,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 +2430,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 +2457,7 @@
+ 	  continue
+ 	fi
+ 
+-    
++
+ 	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+@@ -2209,12 +2495,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
+ 
+@@ -2251,24 +2537,29 @@
+ 	fi
+ 
+ 	link_static=no # Whether the deplib will be linked statically
++	use_static_libs=$prefer_static_libs
++	if test "$use_static_libs" = built && test "$installed" = yes ; then
++	  use_static_libs=no
++	fi
+ 	if test -n "$library_names" &&
+-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+ 	    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 +2617,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 +2631,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
+@@ -2362,11 +2655,15 @@
+ 	      if test "$hardcode_direct" = no; then
+ 		add="$dir/$linklib"
+ 		case $host in
+-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
++		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++		    *-*-unixware7*) 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 +2671,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 +2694,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 +2713,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 +2756,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 +2767,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 +2828,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 +2851,7 @@
+ 	      esac
+ 	    done
+ 	    dependency_libs="$temp_deplibs"
+-	  #fi
++	  fi
+ 
+ 	  newlib_search_path="$newlib_search_path $absdir"
+ 	  # Link against this library
+@@ -2596,20 +2893,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 +2912,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 +3037,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 +3098,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 +3121,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 +3169,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 +3204,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 +3220,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 +3266,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 +3338,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 +3389,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"
+ 	       ;;
+ 	    *) ;;
+@@ -3122,9 +3419,9 @@
+ 
+       # Eliminate all temporary directories.
+       for path in $notinst_path; do
+-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
++	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+       done
+ 
+       if test -n "$xrpath"; then
+@@ -3137,7 +3434,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,14 +3467,19 @@
+ 	    ;;
+ 	  *-*-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
++	    ;;
++	  *-*-sco3.2v5* | *-*-sco5v6*)
++	    # Causes problems with __ctype
++	    ;;
++	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++	    # Compiler inserts libc in the correct place for threads to work
+ 	    ;;
+  	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+@@ -3221,11 +3523,11 @@
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+-	  $LTCC -o conftest conftest.c $deplibs
++	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+ 	  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,11 +3564,11 @@
+ 	    # 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
+-		$LTCC -o conftest conftest.c $i
++		$LTCC $LTCFLAGS -o conftest conftest.c $i
+ 		# Did it work?
+ 		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+@@ -3314,7 +3616,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 +3685,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 +3765,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,17 +3811,39 @@
+ 	    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
+ 
++
++      # move library search paths that coincide with paths to not yet
++      # installed libraries to the beginning of the library search list
++      new_libs=
++      for path in $notinst_path; do
++	case " $new_libs " in
++	*" -L$path/$objdir "*) ;;
++	*)
++	  case " $deplibs " in
++	  *" -L$path/$objdir "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
++	  esac
++	  ;;
++	esac
++      done
++      for deplib in $deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
++	  esac
++	  ;;
++	*) new_libs="$new_libs $deplib" ;;
++	esac
++      done
++      deplibs="$new_libs"
++
++
+       # All the library-specific variables (install_libdir is set above).
+       library_names=
+       old_library=
+@@ -3532,7 +3856,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 +3911,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"
+@@ -3603,6 +3927,7 @@
+ 	fi
+ 
+ 	lib="$output_objdir/$realname"
++	linknames=
+ 	for link
+ 	do
+ 	  linknames="$linknames $link"
+@@ -3617,10 +3942,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 +3956,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 +3979,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 +3992,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 +4009,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 +4048,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 +4058,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 +4078,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 +4100,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 +4131,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 +4226,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 +4255,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 +4266,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 +4283,7 @@
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+@@ -4051,17 +4296,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 +4319,7 @@
+ 	$run ${rm}r $gentop
+       fi
+ 
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+ 
+     prog)
+@@ -4098,24 +4344,50 @@
+       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
+ 
++
++      # move library search paths that coincide with paths to not yet
++      # installed libraries to the beginning of the library search list
++      new_libs=
++      for path in $notinst_path; do
++	case " $new_libs " in
++	*" -L$path/$objdir "*) ;;
++	*)
++	  case " $compile_deplibs " in
++	  *" -L$path/$objdir "*)
++	    new_libs="$new_libs -L$path/$objdir" ;;
++	  esac
++	  ;;
++	esac
++      done
++      for deplib in $compile_deplibs; do
++	case $deplib in
++	-L*)
++	  case " $new_libs " in
++	  *" $deplib "*) ;;
++	  *) new_libs="$new_libs $deplib" ;;
++	  esac
++	  ;;
++	*) new_libs="$new_libs $deplib" ;;
++	esac
++      done
++      compile_deplibs="$new_libs"
++
++
+       compile_command="$compile_command $compile_deplibs"
+       finalize_command="$finalize_command $finalize_deplibs"
+ 
+@@ -4160,10 +4432,15 @@
+ 	fi
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$libdir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$libdir";;
+ 	  esac
++	  case :$dllsearchpath: in
++	  *":$testbindir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$testbindir";;
++	  esac
+ 	  ;;
+ 	esac
+       done
+@@ -4277,13 +4554,25 @@
+ 
+ 	    # 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"'
++              case $host in
++              *cygwin* | *mingw* )
++	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++                ;;
++              esac
+ 	    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"'
++              case $host in
++              *cygwin* | *mingw* )
++	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++                ;;
++              esac
+ 	    fi
+ 	  fi
+ 
+@@ -4334,7 +4623,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;
+ }
+@@ -4381,20 +4689,33 @@
+ 	  esac
+ 
+ 	  # Now compile the dynamic symbol file.
+-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ 
+ 	  # Clean up the generated files.
+ 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+ 
+ 	  # Transform the symbol file into the correct name.
+-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++          case $host in
++          *cygwin* | *mingw* )
++            if test -f "$output_objdir/${outputname}.def" ; then
++              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++            else
++              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++             fi
++            ;;
++          * )
++            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            ;;
++          esac
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       else
+@@ -4407,17 +4728,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'`
+@@ -4426,7 +4736,7 @@
+ 	# We have no uninstalled library dependencies, so finalize right now.
+ 	$show "$link_command"
+ 	$run eval "$link_command"
+-	status=$?
++	exit_status=$?
+ 
+ 	# Delete the generated files.
+ 	if test -n "$dlsyms"; then
+@@ -4434,7 +4744,7 @@
+ 	  $run $rm "$output_objdir/${outputname}S.${objext}"
+ 	fi
+ 
+-	exit $status
++	exit $exit_status
+       fi
+ 
+       if test -n "$shlibpath_var"; then
+@@ -4493,7 +4803,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 +4858,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 +4883,13 @@
+ 	  *) exeext= ;;
+ 	esac
+ 	case $host in
+-	  *mingw* )
+-	    cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
+-	    cwrapper=`$echo ${output}.exe`
+-	    $rm $cwrappersource $cwrapper
+-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++	  *cygwin* | *mingw* )
++            output_name=`basename $output`
++            output_path=`dirname $output`
++            cwrappersource="$output_path/$objdir/lt-$output_name.c"
++            cwrapper="$output_path/$output_name.exe"
++            $rm $cwrappersource $cwrapper
++            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	    cat > $cwrappersource <<EOF
+ 
+@@ -4586,7 +4898,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.
+ 
+@@ -4602,6 +4914,9 @@
+ #include <malloc.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <sys/stat.h>
+ 
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+@@ -4612,15 +4927,19 @@
+ #endif
+ 
+ #ifndef DIR_SEPARATOR
+-#define DIR_SEPARATOR '/'
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
+ #endif
+ 
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+   defined (__OS2__)
+-#define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2 
+-#define DIR_SEPARATOR_2 '\\'
+-#endif
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# ifndef DIR_SEPARATOR_2
++#  define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++#  define PATH_SEPARATOR_2 ';'
++# endif
+ #endif
+ 
+ #ifndef DIR_SEPARATOR_2
+@@ -4630,17 +4949,32 @@
+         (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+ 
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
++
+ #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+   if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+ 
++/* -DDEBUG is fairly common in CFLAGS.  */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
++
+ const char *program_name = NULL;
+ 
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+-char * basename (const char *name);
+-char * fnqualify(const char *path);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int    check_executable(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+ 
+@@ -4649,30 +4983,52 @@
+ {
+   char **newargz;
+   int i;
+-  
+-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
++
++  program_name = (char *) xstrdup (base_name (argv[0]));
++  DEBUG("(main) argv[0]      : %s\n",argv[0]);
++  DEBUG("(main) program_name : %s\n",program_name);
+   newargz = XMALLOC(char *, argc+2);
+ EOF
+ 
+-	    cat >> $cwrappersource <<EOF
+-  newargz[0] = "$SHELL";
++            cat >> $cwrappersource <<EOF
++  newargz[0] = (char *) xstrdup("$SHELL");
+ EOF
+ 
+-	    cat >> $cwrappersource <<"EOF"
+-  newargz[1] = fnqualify(argv[0]);
++            cat >> $cwrappersource <<"EOF"
++  newargz[1] = find_executable(argv[0]);
++  if (newargz[1] == NULL)
++    lt_fatal("Couldn't find %s", argv[0]);
++  DEBUG("(main) found exe at : %s\n",newargz[1]);
+   /* 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;
++
++  for (i=0; i<argc+1; i++)
++  {
++    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
++    ;
++  }
++
+ EOF
+ 
+-	    cat >> $cwrappersource <<EOF
++            case $host_os in
++              mingw*)
++                cat >> $cwrappersource <<EOF
++  execv("$SHELL",(char const **)newargz);
++EOF
++              ;;
++              *)
++                cat >> $cwrappersource <<EOF
+   execv("$SHELL",newargz);
+ EOF
++              ;;
++            esac
+ 
+-	    cat >> $cwrappersource <<"EOF"
++            cat >> $cwrappersource <<"EOF"
++  return 127;
+ }
+ 
+ void *
+@@ -4685,59 +5041,159 @@
+   return p;
+ }
+ 
+-char * 
++char *
+ xstrdup (const char *string)
+ {
+   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+ ;
+ }
+ 
+-char *
+-basename (const char *name)
++const char *
++base_name (const char *name)
+ {
+   const char *base;
+ 
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   /* Skip over the disk name in MSDOS pathnames. */
+-  if (isalpha (name[0]) && name[1] == ':') 
++  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+     name += 2;
+ #endif
+ 
+   for (base = name; *name; name++)
+     if (IS_DIR_SEPARATOR (*name))
+       base = name + 1;
+-  return (char *) base;
++  return base;
+ }
+ 
+-char * 
+-fnqualify(const char *path)
++int
++check_executable(const char * path)
++{
++  struct stat st;
++
++  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
++  if ((!path) || (!*path))
++    return 0;
++
++  if ((stat (path, &st) >= 0) &&
++      (
++        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
++#if defined (S_IXOTH)
++       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
++#endif
++#if defined (S_IXGRP)
++       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
++#endif
++       ((st.st_mode & S_IXUSR) == S_IXUSR))
++      )
++    return 1;
++  else
++    return 0;
++}
++
++/* Searches for the full path of the wrapper.  Returns
++   newly allocated full path name if found, NULL otherwise */
++char *
++find_executable (const char* wrapper)
+ {
+-  size_t size;
+-  char *p;
++  int has_slash = 0;
++  const char* p;
++  const char* p_next;
++  /* static buffer for getcwd */
+   char tmp[LT_PATHMAX + 1];
++  int tmp_len;
++  char* concat_name;
++
++  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+ 
+-  assert(path != NULL);
++  if ((wrapper == NULL) || (*wrapper == '\0'))
++    return NULL;
+ 
+-  /* Is it qualified already? */
++  /* Absolute path? */
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
++  {
++    concat_name = xstrdup (wrapper);
++    if (check_executable(concat_name))
++      return concat_name;
++    XFREE(concat_name);
++  }
++  else
++  {
++#endif
++    if (IS_DIR_SEPARATOR (wrapper[0]))
++    {
++      concat_name = xstrdup (wrapper);
++      if (check_executable(concat_name))
++        return concat_name;
++      XFREE(concat_name);
++    }
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  if (isalpha (path[0]) && path[1] == ':')
+-    return xstrdup (path);
++  }
+ #endif
+-  if (IS_DIR_SEPARATOR (path[0]))
+-    return xstrdup (path);
+ 
+-  /* prepend the current directory */
+-  /* doesn't handle '~' */
++  for (p = wrapper; *p; p++)
++    if (*p == '/')
++    {
++      has_slash = 1;
++      break;
++    }
++  if (!has_slash)
++  {
++    /* no slashes; search PATH */
++    const char* path = getenv ("PATH");
++    if (path != NULL)
++    {
++      for (p = path; *p; p = p_next)
++      {
++        const char* q;
++        size_t p_len;
++        for (q = p; *q; q++)
++          if (IS_PATH_SEPARATOR(*q))
++            break;
++        p_len = q - p;
++        p_next = (*q == '\0' ? q : q + 1);
++        if (p_len == 0)
++        {
++          /* empty path: current directory */
++          if (getcwd (tmp, LT_PATHMAX) == NULL)
++            lt_fatal ("getcwd failed");
++          tmp_len = strlen(tmp);
++          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++          memcpy (concat_name, tmp, tmp_len);
++          concat_name[tmp_len] = '/';
++          strcpy (concat_name + tmp_len + 1, wrapper);
++        }
++        else
++        {
++          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
++          memcpy (concat_name, p, p_len);
++          concat_name[p_len] = '/';
++          strcpy (concat_name + p_len + 1, wrapper);
++        }
++        if (check_executable(concat_name))
++          return concat_name;
++        XFREE(concat_name);
++      }
++    }
++    /* not found in PATH; assume curdir */
++  }
++  /* Relative path | not found in path: prepend cwd */
+   if (getcwd (tmp, LT_PATHMAX) == NULL)
+     lt_fatal ("getcwd failed");
+-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+-  p = XMALLOC(char, size);
+-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+-  return p;
++  tmp_len = strlen(tmp);
++  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++  memcpy (concat_name, tmp, tmp_len);
++  concat_name[tmp_len] = '/';
++  strcpy (concat_name + tmp_len + 1, wrapper);
++
++  if (check_executable(concat_name))
++    return concat_name;
++  XFREE(concat_name);
++  return NULL;
+ }
+ 
+ char *
+-strendzap(char *str, const char *pat) 
++strendzap(char *str, const char *pat)
+ {
+   size_t len, patlen;
+ 
+@@ -4757,7 +5213,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);
+@@ -4777,16 +5233,16 @@
+   va_end (ap);
+ }
+ EOF
+-	  # we should really use a build-platform specific compiler
+-	  # here, but OTOH, the wrappers (shell script and this C one)
+-	  # are only useful if you want to execute the "real" binary.
+-	  # Since the "real" binary is built for $host, then this
+-	  # wrapper might as well be built for $host, too.
+-	  $run $LTCC -s -o $cwrapper $cwrappersource
+-	  ;;
+-	esac
+-	$rm $output
+-	trap "$rm $output; exit 1" 1 2 15
++          # we should really use a build-platform specific compiler
++          # here, but OTOH, the wrappers (shell script and this C one)
++          # are only useful if you want to execute the "real" binary.
++          # Since the "real" binary is built for $host, then this
++          # wrapper might as well be built for $host, too.
++          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
++          ;;
++        esac
++        $rm $output
++        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	$echo > $output "\
+ #! $SHELL
+@@ -4807,7 +5263,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 +5342,7 @@
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+ 
+@@ -4936,34 +5392,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 +5440,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"
++	    exit_status=$?
++	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++	      exit $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 +5520,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 +5539,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 +5550,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 +5588,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 +5612,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 +5626,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 +5637,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 +5704,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 +5717,7 @@
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool install mode
+@@ -5265,11 +5728,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 +5741,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 +5766,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 +5799,7 @@
+       # Aesthetically quote the argument.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	arg="\"$arg\""
+ 	;;
+       esac
+@@ -5343,13 +5809,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 +5825,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 +5846,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 +5858,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 +5887,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 +5929,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 +5944,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 +5968,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 +6035,7 @@
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -5574,7 +6053,7 @@
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+-	exit 0
++	exit $EXIT_SUCCESS
+ 	;;
+ 
+       *)
+@@ -5612,23 +6091,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,30 +6127,21 @@
+ 	  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=
+ 	  if test "$fast_install" = no && test -n "$relink_command"; then
+ 	    if test "$finalize" = yes && test -z "$run"; then
+-	      tmpdir="/tmp"
+-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+-	      tmpdir="$tmpdir/libtool-$$"
+-	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
+-	      else
+-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+-		continue
+-	      fi
++	      tmpdir=`func_mktempdir`
+ 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ 	      outputname="$tmpdir/$file"
+ 	      # Replace the output file specification.
+@@ -5697,7 +6165,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 +6197,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 +6221,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 +6242,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,9 +6263,9 @@
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    exit 0
++    test "$show" = : && exit $EXIT_SUCCESS
+ 
+-    $echo "----------------------------------------------------------------------"
++    $echo "X----------------------------------------------------------------------" | $Xsed
+     $echo "Libraries have been installed in:"
+     for libdir in $libdirs; do
+       $echo "   $libdir"
+@@ -5828,8 +6298,8 @@
+     $echo
+     $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
++    $echo "X----------------------------------------------------------------------" | $Xsed
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool execute mode
+@@ -5841,7 +6311,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 +6319,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 +6330,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 +6357,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 +6437,7 @@
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5995,7 +6465,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=
+@@ -6045,15 +6515,24 @@
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+-	  if test "$mode" = uninstall; then
++	  case "$mode" in
++	  clean)
++	    case "  $library_names " in
++	    # "  " in the beginning catches empty $dlname
++	    *" $dlname "*) ;;
++	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
++	    esac
++	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	    ;;
++	  uninstall)
+ 	    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 +6544,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
+@@ -6078,7 +6558,8 @@
+ 	      IFS="$save_ifs"
+ 	    fi
+ 	    # FIXME: should reinstall the best remaining shared library.
+-	  fi
++	    ;;
++	  esac
+ 	fi
+ 	;;
+ 
+@@ -6107,7 +6588,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 +6633,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 +6682,7 @@
+ a more detailed description of MODE.
+ 
+ Report bugs to <bug-libtool@gnu.org>."
+-  exit 0
++  exit $EXIT_SUCCESS
+   ;;
+ 
+ clean)
+@@ -6313,6 +6794,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 +6837,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
+@@ -6375,12 +6858,11 @@
+ # configuration.  But we'll never go from static-only to shared-only.
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
++disable_libs=shared
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
++disable_libs=static
+ # ### END LIBTOOL TAG CONFIG: disable-static
+ 
+ # Local Variables:
--- kdebase-3.5.7.orig/debian/patches/common/05_pedantic-errors.diff
+++ kdebase-3.5.7/debian/patches/common/05_pedantic-errors.diff
@@ -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
+ ],
--- kdebase-3.5.7.orig/debian/patches/common/04_am_maintainer_mode.diff
+++ kdebase-3.5.7/debian/patches/common/04_am_maintainer_mode.diff
@@ -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
--- kdebase-3.5.7.orig/debian/patches/common/06_disable_no_undefined.diff
+++ kdebase-3.5.7/debian/patches/common/06_disable_no_undefined.diff
@@ -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)
--- kdebase-3.5.7.orig/debian/patches/common/README
+++ kdebase-3.5.7/debian/patches/common/README
@@ -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
--- kdebase-3.5.7.orig/debian/patches/common/update.sh
+++ kdebase-3.5.7/debian/patches/common/update.sh
@@ -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
--- kdebase-3.5.7.orig/debian/patches/38_furry_frosted_animals_support.diff
+++ kdebase-3.5.7/debian/patches/38_furry_frosted_animals_support.diff
@@ -0,0 +1,13 @@
+Index: kdebase/nsplugins/pluginscan.cpp
+===================================================================
+--- kdebase/nsplugins/pluginscan.cpp	(revision 629110)
++++ kdebase/nsplugins/pluginscan.cpp	(working copy)
+@@ -456,6 +456,8 @@
+         QStringList paths;
+         paths.append("$HOME/.mozilla/plugins");
+         paths.append("$HOME/.netscape/plugins");
++	paths.append("/usr/lib/iceweasel/plugins");
++	paths.append("/usr/lib/iceape/plugins");
+         paths.append("/usr/lib/firefox/plugins");
+         paths.append("/usr/lib64/browser-plugins");
+         paths.append("/usr/lib/browser-plugins");
--- kdebase-3.5.7.orig/debian/patches/98_buildprep.diff
+++ kdebase-3.5.7/debian/patches/98_buildprep.diff
@@ -0,0 +1,298327 @@
+#DPATCHLEVEL=0
+# vi: ft=diff
+--- acinclude.m4
++++ acinclude.m4
+@@ -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)
+@@ -2144,9 +2135,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
+ ],
+@@ -5971,30 +5959,15 @@
+   fi
+ ])
+ # 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@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 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -6054,7 +6027,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
+@@ -6104,7 +6077,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.
+@@ -6124,7 +6097,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"
+@@ -6144,6 +6117,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -6163,15 +6137,17 @@
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+     ;;
+   *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
+   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*)
+@@ -6212,11 +6188,56 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _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; /^ *+/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; /^ *+/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
+@@ -6289,15 +6310,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
+@@ -6466,14 +6487,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*)
+@@ -6485,7 +6505,6 @@
+       esac
+       ;;
+     *64-bit*)
+-      LINUX_64_MODE="64"
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+@@ -6519,6 +6538,22 @@
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
++sparc*-*solaris*)
++  # 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
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)    LD="${LD-ld} -64" ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -6550,7 +6585,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)
+@@ -6560,8 +6595,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 -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+      fi
+    fi
+@@ -6587,11 +6624,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 -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
+      else
+        $2=yes
+      fi
+@@ -6615,7 +6657,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*)
+@@ -6644,20 +6686,70 @@
+     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`
++    ;;
++
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
++
++  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
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    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.
+@@ -6674,7 +6766,7 @@
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -6682,7 +6774,7 @@
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -6748,17 +6840,19 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
+ }]
+ 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 ;;
+       x$lt_dlneed_uscore) $2 ;;
+-      x$lt_unknown|x*) $3 ;;
++      x$lt_dlunknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+@@ -6770,7 +6864,7 @@
+ 
+ 
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -6807,7 +6901,7 @@
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+-    
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+@@ -6841,7 +6935,7 @@
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -6854,7 +6948,7 @@
+     ])
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+     	  lt_cv_dlopen_self_static, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+@@ -6896,20 +6990,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)
+@@ -6921,13 +7008,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 -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || 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*
+@@ -6986,8 +7078,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 &&
+@@ -7044,7 +7136,7 @@
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+-  esac  
++  esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+@@ -7057,7 +7149,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -7067,7 +7159,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
+ 
+@@ -7132,7 +7237,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*)
+@@ -7141,7 +7246,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}'
+@@ -7157,7 +7262,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -7169,7 +7274,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'
+@@ -7199,7 +7305,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
+     ;;
+@@ -7222,7 +7328,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"`
+@@ -7245,20 +7351,17 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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'
+-  ;;
+-
+-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*)
+@@ -7276,14 +7379,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 3.2 on
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -7303,9 +7411,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
+@@ -7320,7 +7428,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
+@@ -7331,7 +7439,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
+@@ -7343,6 +7451,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix3*)
++  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'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -7386,29 +7506,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-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'
+   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 -a ! -h /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,
+@@ -7418,6 +7535,18 @@
+   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'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -7427,7 +7556,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
+@@ -7455,8 +7584,13 @@
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   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
+@@ -7476,7 +7610,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'
+@@ -7494,13 +7628,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -7526,7 +7653,7 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -7559,6 +7686,29 @@
+   fi
+   ;;
+ 
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7572,6 +7722,11 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+ 
+@@ -7596,6 +7751,9 @@
+       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+   fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+@@ -7622,7 +7780,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=""
+@@ -7684,7 +7844,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
+@@ -7722,7 +7882,7 @@
+ 
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -7858,7 +8018,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
+@@ -7968,7 +8128,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'*)
+@@ -8000,7 +8160,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
+@@ -8027,6 +8187,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='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+@@ -8060,44 +8229,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* | 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.*`
+       ;;
+@@ -8113,7 +8274,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
+@@ -8129,43 +8290,27 @@
+   esac
+   ;;
+ 
++interix3*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
++
+ 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`
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-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
+@@ -8184,32 +8329,22 @@
+   ;;
+ 
+ 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
+-  ;;
+-
+-sco3.2v5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   case $host_vendor in
+   motorola)
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+@@ -8230,10 +8365,13 @@
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+@@ -8253,36 +8391,43 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
+ 	  break
+ 	  ;;
+ 	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
+ 	  ;;
+ 	esac
+-      esac
+-    fi
++      fi
++    done
++    IFS="$lt_save_ifs"
+   done
+-  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -8314,13 +8459,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
+@@ -8339,13 +8484,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
+@@ -8383,10 +8528,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
+ # --------------
+@@ -8426,7 +8582,7 @@
+ 
+ 
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -8459,36 +8615,9 @@
+ 
+ _LT_AC_SYS_COMPILER
+ 
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+-  case $host_os in
+-  sco3.2v5*)
+-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+-    ;;
+-  esac
+-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 :
+-  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
+-  fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -8502,9 +8631,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+ 
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+@@ -8513,7 +8642,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
+@@ -8522,48 +8651,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])
+ 
+@@ -8588,7 +8680,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)=
+@@ -8600,6 +8692,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -8617,7 +8710,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
+@@ -8627,11 +8720,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\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
+ lt_save_LD=$LD
+@@ -8642,18 +8739,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+-  unset lt_cv_prog_gnu_ld
++  $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+-  unset lt_cv_path_LD
++  $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ 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
+@@ -8671,8 +8768,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'
+@@ -8698,7 +8795,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
+@@ -8728,8 +8825,23 @@
+       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
+@@ -8746,7 +8858,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`
+@@ -8765,8 +8877,12 @@
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	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
+@@ -8775,15 +8891,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.
+@@ -8792,13 +8909,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 '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${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 '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_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
+@@ -8807,22 +8923,32 @@
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ 	_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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+     fi
+     ;;
+-  chorus*)
+-    case $cc_basename in
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
++
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      _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
++    ;;
++
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
+     esac
+     ;;
+ 
+@@ -8830,12 +8956,12 @@
+     # _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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $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
+@@ -8844,70 +8970,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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $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'
+-      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
++    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
+-      ;;
+-    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
+-    ;;
++      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
++          _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
++        ;;
+ 
+   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
+@@ -8918,14 +9055,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* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -8942,12 +9079,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.
+@@ -8956,11 +9093,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
+@@ -8970,34 +9107,23 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      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, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++      case $host_cpu in
++      hppa*64*|ia64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-        ;;
+-      ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         ;;
+       *)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
+-    hppa*64*)
++    case $host_cpu in
++    hppa*64*|ia64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+-    ia64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+-      ;;
+     *)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+@@ -9007,17 +9133,20 @@
+     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
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++      aCC*)
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	*)
+-	  _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
+@@ -9033,12 +9162,15 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	    case $host_cpu in
++	    hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    ia64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    *)
+-	      _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
+@@ -9049,11 +9181,25 @@
+ 	;;
+     esac
+     ;;
++  interix3*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
+   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
+@@ -9064,9 +9210,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
+@@ -9075,16 +9221,16 @@
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     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.
+@@ -9102,20 +9248,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'
+@@ -9143,7 +9313,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -9153,7 +9323,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-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=
+@@ -9164,15 +9334,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)=:
+@@ -9182,14 +9368,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)=:
+@@ -9207,7 +9393,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)=:
+@@ -9226,13 +9412,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)=:
+@@ -9241,17 +9427,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'
+@@ -9270,7 +9456,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)=:
+@@ -9291,27 +9477,14 @@
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+-  sco*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+   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
+@@ -9324,36 +9497,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
+@@ -9361,9 +9531,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'
+@@ -9373,9 +9543,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
+@@ -9384,9 +9554,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 | $S