[Pkg-kde-commits] rev 2225 - in people/jriddell/KDE/3.5: . kdenetwork kdenetwork/debian kdenetwork/debian/cdbs kdenetwork/debian/icons kdenetwork/debian/man kdenetwork/debian/patches kdenetwork/debian/patches/common

Jonathan Riddell jriddell-guest at costa.debian.org
Sat Nov 12 20:32:29 UTC 2005


Author: jriddell-guest
Date: 2005-11-12 20:32:22 +0000 (Sat, 12 Nov 2005)
New Revision: 2225

Added:
   people/jriddell/KDE/3.5/kdenetwork/
   people/jriddell/KDE/3.5/kdenetwork/debian/
   people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/
   people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/debian-qt-kde.mk
   people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/kde.mk
   people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/simple-patchsys.mk
   people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/versions.pl
   people/jriddell/KDE/3.5/kdenetwork/debian/changelog
   people/jriddell/KDE/3.5/kdenetwork/debian/compat
   people/jriddell/KDE/3.5/kdenetwork/debian/control
   people/jriddell/KDE/3.5/kdenetwork/debian/copyright
   people/jriddell/KDE/3.5/kdenetwork/debian/dcoprss.install
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kdict-16.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kdict.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kget-16.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kget.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/knewsticker-16.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/knewsticker.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kopete-16.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kopete.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kppp-16.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kppp.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/krdc-16.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/krdc.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/krfb-16.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/krfb.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/ksirc-16.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/ksirc.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kwifimanager-16.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/icons/kwifimanager.xpm
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-dev.install
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-filesharing.install
   people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-kfile-plugins.install
   people/jriddell/KDE/3.5/kdenetwork/debian/kdict.install
   people/jriddell/KDE/3.5/kdenetwork/debian/kdict.menu
   people/jriddell/KDE/3.5/kdenetwork/debian/kget.install
   people/jriddell/KDE/3.5/kdenetwork/debian/kget.menu
   people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.install
   people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.lintian
   people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.menu
   people/jriddell/KDE/3.5/kdenetwork/debian/kopete.install
   people/jriddell/KDE/3.5/kdenetwork/debian/kopete.manpages
   people/jriddell/KDE/3.5/kdenetwork/debian/kopete.menu
   people/jriddell/KDE/3.5/kdenetwork/debian/kopete.postinst
   people/jriddell/KDE/3.5/kdenetwork/debian/kopete.prerm
   people/jriddell/KDE/3.5/kdenetwork/debian/kpf.install
   people/jriddell/KDE/3.5/kdenetwork/debian/kppp-options
   people/jriddell/KDE/3.5/kdenetwork/debian/kppp.README.Debian
   people/jriddell/KDE/3.5/kdenetwork/debian/kppp.install
   people/jriddell/KDE/3.5/kdenetwork/debian/kppp.lintian
   people/jriddell/KDE/3.5/kdenetwork/debian/kppp.menu
   people/jriddell/KDE/3.5/kdenetwork/debian/krdc.install
   people/jriddell/KDE/3.5/kdenetwork/debian/krdc.menu
   people/jriddell/KDE/3.5/kdenetwork/debian/krfb.install
   people/jriddell/KDE/3.5/kdenetwork/debian/krfb.menu
   people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.install
   people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.lintian
   people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.menu
   people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.install
   people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.postinst
   people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.postrm
   people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.install
   people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.lintian
   people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.menu
   people/jriddell/KDE/3.5/kdenetwork/debian/librss1.install
   people/jriddell/KDE/3.5/kdenetwork/debian/lisa.docs
   people/jriddell/KDE/3.5/kdenetwork/debian/lisa.init
   people/jriddell/KDE/3.5/kdenetwork/debian/lisa.install
   people/jriddell/KDE/3.5/kdenetwork/debian/lisarc
   people/jriddell/KDE/3.5/kdenetwork/debian/man/
   people/jriddell/KDE/3.5/kdenetwork/debian/man/kopete.sgml
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/10_kppp_options.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/11_dlopen-xmms.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/13_improve-libgadu-detection.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/14_kppp_doc_pointer.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/16_kopete_green_folder.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/17_kppp_devices.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/02_autotools_update.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/03_libtool_update.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/05_pedantic-errors.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/06_disable_no_undefined.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/README
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/update.sh
   people/jriddell/KDE/3.5/kdenetwork/debian/patches/kubuntu_01_kmenu_changes.diff
   people/jriddell/KDE/3.5/kdenetwork/debian/rules
Log:
kdenetwork for kde 3.5 rc 1


Added: people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/debian-qt-kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/debian-qt-kde.mk	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/debian-qt-kde.mk	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,99 @@
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+	if test -n "$(DEB_KDE_CVS_MAKE)" -a ! -f configure; then \
+		$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; \
+	fi
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.sgml'); do \
+		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+	done
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+	touch debian/stamp-man-pages
+
+common-binary-indep::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_INDEP_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+common-binary-arch::
+	( set -e; \
+	tmpf=`mktemp debian/versions.XXXXXX`; \
+	perl debian/cdbs/versions.pl >$$tmpf; \
+	for p in $(DEB_ARCH_PACKAGES); do \
+	    cat $$tmpf >>debian/$$p.substvars; \
+	done; \
+	rm -f $$tmpf )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+	if test -e debian/$(cdbs_curpkg).lintian; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+	fi
+	if test -e debian/$(cdbs_curpkg).presubj; then \
+		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+	fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+	rm -f debian/stamp-cvs-make
+
+endif

Added: people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/kde.mk
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/kde.mk	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/kde.mk	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,88 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney at debian.org>
+# Description: A class for KDE packages; sets KDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_kde
+_cdbs_class_kde := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+endif
+
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = 
+	cdbs_kde_enable_debug = --enable-debug=yes
+else
+	cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_COMPRESS_EXCLUDE := .bz2 .css .dcl .docbook -license .tag .sty .el
+
+cleanbuilddir::
+	-if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi
+
+common-build-arch common-build-indep:: debian/stamp-apidox
+debian/stamp-apidox:
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) apidox; \
+	fi
+	touch debian/stamp-apidox
+
+common-install-arch common-install-indep:: install-apidox
+install-apidox::
+	if test -n "$(DEB_KDE_APIDOX)"; then \
+		$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR); \
+	fi
+
+clean::
+	rm -f debian/stamp-apidox
+
+buildprep: clean apply-patches
+	make -f admin/Makefile.common dist
+	debian/rules clean
+
+endif

Added: people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/simple-patchsys.mk
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/simple-patchsys.mk	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/simple-patchsys.mk	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,153 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters at debian.org>
+# Description: A sample patch system which uses separate files in debian/patches
+#  Patch suffix is specified by DEB_PATCH_SUFFIX. Defaults to .patch.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_rules_patchsys
+_cdbs_rules_patchsys := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifeq ($(_cdbs_included_patchsys),)
+_cdbs_included_patchsys := 1
+
+_cdbs_patch_system_apply_rule := apply-patches
+_cdbs_patch_system_unapply_rule := reverse-patches
+
+# uu-encoded patches allowed - Bug ##305857
+DEB_PATCH_SUFFIX ?= .diff .diff.gz .diff.bz2 .diff.uu .patch .patch.gz .patch.bz2 .patch.uu
+DEB_PATCHDIRS ?= debian/patches
+close_parenthesis ?= )
+DEB_PATCHES := $(shell\
+for dir in $(DEB_PATCHDIRS) ; do \
+	for file in $$dir/* ; do \
+		for suffix in $(DEB_PATCH_SUFFIX) ; do \
+			case $$file in *$$suffix$(close_parenthesis) echo $$file ;; esac ; \
+		done ; \
+	done ; \
+done)
+
+# if we have any patches, check if some are patching config.{guess,sub,rpath}
+# and print a warning
+ifneq (, $(DEB_PATCHES))
+CDBS_BUILD_DEPENDS    := $(CDBS_BUILD_DEPENDS), patchutils
+evil_patches_that_do_nasty_things := $(shell\
+if lsdiff=`which lsdiff` ; then \
+  $$lsdiff -H $(DEB_PATCHES) \
+  | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
+fi)
+ifneq (, $(evil_patches_that_do_nasty_things))
+$(warning ** WARNING **:  The following patches are modifiing auto-updated files.   Please exclude the following files from your patch:  $(evil_patches_that_do_nasty_things))
+endif
+endif
+
+post-patches:: apply-patches
+
+# clean up log files in all patch directories - Bug ##296984
+clean:: reverse-patches
+	for dir in $(DEB_PATCHDIRS) ; do \
+	  rm -f $$dir/*.log ; \
+	done
+
+# The patch subsystem 
+apply-patches: pre-build debian/stamp-patched
+debian/stamp-patched: $(DEB_PATCHES)
+debian/stamp-patched reverse-patches:
+	$(MAKE) -f debian/rules reverse-config
+	@echo "patches: $(DEB_PATCHES)"
+	@set -e ; reverse=""; patches="$(DEB_PATCHES)"; \
+	  if [ "$@" = "reverse-patches" ]; then \
+	    if [ ! -e debian/stamp-patched ]; then \
+	      echo "Not reversing not applied patches."; \
+	      exit 0; \
+	    fi; \
+	    reverse="-R"; \
+	    for patch in $$patches; do reversepatches="$$patch $$reversepatches"; done; \
+	    patches="$$reversepatches"; \
+	  fi; \
+	  for patch in $$patches; do \
+          case $$patch in \
+            *.gz) cat=zcat ;; \
+            *.bz2) cat=bzcat ;; \
+            *.uu) cat="uudecode -o -" ;; \
+            *) cat=cat ;; \
+          esac; \
+	  level=$$(head $$patch | egrep '^#DPATCHLEVEL=' | cut -f 2 -d '='); \
+	  reverse=""; \
+	  if [ "$@" = "reverse-patches" ]; then reverse="-R"; fi; \
+	  success=""; \
+	  if [ -z "$$level" ]; then \
+	    echo -n "Trying "; if test -n "$$reverse"; then echo -n "reversed "; fi; echo -n "patch $$patch at level "; \
+	    for level in 0 1 2; do \
+	      if test -z "$$success"; then \
+	        echo -n "$$level..."; \
+		if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+		  logfile="/dev/null" ; \
+		else \
+		  logfile="$$patch.level-$$level.log" ; \
+		fi ; \
+	        if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --dry-run -p$$level 1>$$logfile 2>&1; then \
+	          if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+	            success=yes; \
+	            touch debian/stamp-patch-$$(basename $$patch); \
+	            echo "success."; \
+                  fi; \
+	        fi; \
+	      fi; \
+            done; \
+	    if test -z "$$success"; then \
+	      if test -z "$$reverse"; then \
+	        echo "failure."; \
+	        exit 1; \
+	       else \
+	         echo "failure (ignored)."; \
+               fi \
+	    fi; \
+	  else \
+	    echo -n "Trying patch $$patch at level $$level..."; \
+	        echo -n "$$level..."; \
+	    if [ "$(DEB_PATCHDIRS_READONLY)" = "yes" ] ; then \
+	      logfile="/dev/null" ; \
+	    else \
+	      logfile="$$patch.log" ; \
+	    fi ; \
+	    if $$cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$logfile 2>&1; then \
+              touch debian/stamp-patch-$$(basename $$patch); \
+	      echo "success."; \
+	    else \
+	      echo "failure:"; \
+	      cat $$logfile; \
+	      if test -z "$$reverse"; then exit 1; fi; \
+            fi; \
+	  fi; \
+	done
+	if [ "$@" = "debian/stamp-patched" ] ; then touch debian/stamp-patched ; \
+	elif [ "$@" = "reverse-patches" ] ; then rm -f debian/stamp-patch* ; \
+	fi
+	# eliminate update-config when reversing patches - Bug ##299010
+	if [ "$@" != "reverse-patches" ] ; then $(MAKE) -f debian/rules update-config ; fi
+
+endif
+
+endif

Added: people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/versions.pl
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/versions.pl	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/cdbs/versions.pl	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/-[^-]+$//;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";

Added: people/jriddell/KDE/3.5/kdenetwork/debian/changelog
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/changelog	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/changelog	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,1345 @@
+kdenetwork (4:3.5-rc1-0ubuntu1) dapper; urgency=low
+
+  * New upstream pre-release
+  * Update 11_dlopen-xmms.diff
+  * Update 17_kppp_devices.diff
+  * Remove 18_kopete_icq_fix.diff, merged upstream
+  * Remove kubuntu_02_new_iwlib.diff, merged upstream
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 12 Nov 2005 19:25:52 +0000
+
+kdenetwork (4:3.4.3-2) experimental; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Clean up the old comments in lisa's init script from its original
+    template. (Closes: #334844)
+
+  * Steal a fix from KDE_3_5_BRANCH that fixes crashes in Kopete with ICQ.
+    Thanks to Josh Metzler for isolating the problem. (Closes: #334889)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Oct 2005 08:38:26 -0400
+
+kdenetwork (4:3.4.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch which expands the device nodes that KPPP accepts by default.
+    This should reduce the number of symlinks to /dev/modem which users need
+    to create.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Oct 2005 13:30:52 -0400
+
+kdenetwork (4:3.4.2-3) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch which ensures that KPPP users who encounter connection errors
+    are pointed to the package's README.Debian, if KPPP has no other
+    suggestions. (Closes: #324867)
+
+  * Improve and expand the kppp.README.Debian.
+
+  +++ Changes by Adeodato Simó:
+
+  * This upload triggers a kwifimanager recompilation that copes with libiw28
+    having dropped _GLOBAL_OFFSET_TABLE_; kwifimanager applet no longer
+    crashes, thus this upload closes: #327843, #329708.
+
+  +++ Changes by Luk Claes:
+  
+  * Add patch to add missing entry for Hungarian to fix menu (Closes: #291009)
+
+  * Add patch to use user's color for budy groups icon (Closes: #293035).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Sep 2005 17:45:23 +0200
+
+kdenetwork (4:3.4.2-2) unstable; urgency=low
+
+  +++ Changes by Luk Claes:
+
+  * Updated FSF address.
+   
+  * Build with g++-3.4 on arm, m68k and hppa; kdenetwork also makes gcc 4.0 ICE
+    as described in #323133.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  1 Sep 2005 10:46:08 +0200
+
+kdenetwork (4:3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * This upload:
+
+    - happily builds with gcc4. (Closes: #300536)
+    - has a kwifimanager from the 3.4 series does not depend on removed
+      libiw27. (Closes: #318180)
+
+  +++ Changes by Christopher Martin:
+
+  * Remove 07_xlibs-static-pic.diff and the xlibs-static-pic build-dependency,
+    and add a build-dependency on libxxf86vm-dev, for the X.Org transition.
+
+  * Add a dependency on perl-suid for kdenetwork-filesharing, since it really
+    does need it to be useful, and kdelibs had its perl-suid dependency
+    weakened for reasons of security. Similarly, change the kdenetwork
+    metapackage's dependency on kdenetwork-filesharing to a Recommends,
+    where it joins lisa and ktald, languishing in ignominious obscurity.
+    (Closes: #323064)
+
+  * Remove lisa's unnecessary dependency on debconf.
+
+  * kdenetwork-dev: Add a Conflicts with librss1-dev (in addition to the
+    Replaces) to eliminate potential problems.
+
+  * kdict: Add a missing Replaces for kdebase-data.
+  
+  +++ Changes by Luk Claes:
+  
+  * Added me to uploaders
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Aug 2005 16:40:41 +0200
+
+kdenetwork (4:3.4.91-0ubuntu1) breezy; urgency=low
+
+  * KDE 3.5 beta1
+
+ -- Bart Verwilst <bart at verwilst.be>  Sun,  9 Oct 2005 13:18:37 +0000
+
+kdenetwork (4:3.4.3-0ubuntu1) breezy; urgency=low
+
+  * New upstream release
+  * Build with GCC 3.4 on hppa
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri,  7 Oct 2005 18:14:17 +0000
+
+kdenetwork (4:3.4.2-0ubuntu3) breezy; urgency=low
+
+  * Add kubuntu_03_gadu_offline.diff fixes http://bugs.kde.org/105131
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Sep 2005 16:32:56 +0100
+
+kdenetwork (4:3.4.2-0ubuntu2) breezy; urgency=low
+
+  * Add missing build-depend on unsermake
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 26 Jul 2005 23:19:33 +0000
+
+kdenetwork (4:3.4.2-0ubuntu1) breezy; urgency=low
+
+  * New upstream release.
+  * Build using unsermake
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 26 Jul 2005 13:19:02 +0000
+
+kdenetwork (4:3.4.1-0ubuntu4) breezy; urgency=low
+
+  * Add build-depends on libxfixes-dev
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 21 Jul 2005 12:55:05 +0000
+
+kdenetwork (4:3.4.1-0ubuntu3) breezy; urgency=low
+
+  * Rebuild for new libiw
+  * Add explicit include to /usr/X11R6/include for Xmu
+  * Add kubuntu_02_new_iwlib.diff for updated iwlib
+  * Not affected by CAN-2005-1852 because we use an external libgadu3
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 20 Jul 2005 23:31:50 +0000
+
+kdenetwork (4:3.4.1-0ubuntu2) breezy; urgency=low
+
+  * Remove build-dep on xmms
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu,  2 Jun 2005 02:35:10 +0000
+
+kdenetwork (4:3.4.1-0ubuntu1) breezy; urgency=low
+
+  * Update version number following KDE 3.4.1 release
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed,  1 Jun 2005 00:47:48 +0000
+
+kdenetwork (4:3.4.1-0pre1ubuntu1) breezy; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jr at jriddell.org>  Sat, 28 May 2005 23:23:38 +0000
+
+kdenetwork (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release 
+
+  +++ Changes by Christopher Martin:
+
+  * Merge librss1-dev and currently unused kopete headers into a general
+    kdenetwork-dev package.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 May 2005 15:43:52 -0400
+
+kdenetwork (4:3.4.0-0ubuntu2) hoary; urgency=low
+
+  * Fix kubuntu_01_kmenu_changes.diff
+
+ -- Jonathan Riddell <jr at jriddell.org>  Thu, 17 Mar 2005 02:49:27 +0000
+
+kdenetwork (4:3.4.0-0ubuntu1) hoary; urgency=low
+
+  * Remove kdict, ksirc from kdenetwork meta-package depends.
+  * Add kubuntu_01_kmenu_changes.diff patch to tidy up menus.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Wed, 16 Mar 2005 22:45:45 +0000
+
+kdenetwork (4:3.4.0-0pre1ubuntu2) hoary; urgency=low
+
+  * Add dependency on kdenetwork-kfile-plugins to kdenetwork meta-package.
+
+ -- Jonathan Riddell <jr at jriddell.org>  Tue,  8 Mar 2005 13:09:19 +0000
+
+kdenetwork (4:3.4.0-0pre1ubuntu1) hoary; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jr at jriddell.org>  Mon,  7 Mar 2005 00:17:04 +0000
+
+kdenetwork (4:3.4.0-0pre2) alioth; urgency=low
+
+  * New upstream release.
+
+  * Bugs reported in the Debian BTS fixed by this release:
+    - kopete does not crash upon ignoring a /query. (Closes: #285906)
+    - kwifimanager properly saves its settings now. (Closes: #296428)
+    - kopete does not crash when using the /help command. (Closes: #297721)
+
+  +++ Changes by Isaac Clerencia:
+
+  * Switch to CDBS for packaging.
+
+  * Added new package kdenetwork-kfile-plugins.
+
+  * ksirc now recommends libio-socket-ssl-perl, needed for SSL IRC servers
+   (Closes: #294331)
+
+  +++ Changes by Christopher Martin:
+
+  * Change kopete's section to kde. (Closes: #292398)
+
+  * New kdenetwork-doc-html package, containing doc-base registered HTML
+    versions of application handbooks, for users without Konqueror or
+    KHelpCenter.
+
+  +++ Changes by Adeodato Simó:
+
+  * Created XPM icons for packages having a menu file. Install them in
+    /usr/share/pixmaps and update the menu entries to use them.
+
+  +++ Changes by Riku Voipio:
+
+  * Provide better descriptions for applications (Closes: #287185)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 22 May 2005 18:45:20 +0200
+
+kdenetwork (4:3.3.2-6) unstable; urgency=high
+
+  +++ Changes by Adeodato Simó:
+
+  * Do not depend on the disappeared libjack0.80.0-0. Achieve so by updating
+    the libtool used to build, so that it prunes unnecessary dependencies. The
+    Depends lines are incredibly shorter now.
+
+  * The above libtool update removes the kwifimanager dependency on libmad0,
+    so closes: #311712 ("does not have a versioned dependency on libmad0").
+
+  * This upload will get built against the latest libiw-dev, so the dependency
+    on the disappeared libiw27 will get updated to libiw28. Closes: #315892,
+    thanks to Noèl Köthe for the heads-up.
+
+    Also, libiw28 renames iw_pr_ether() to iw_saether_ntop(), so added a patch
+    from upstream SVN to cope with the change. Bump build-dependency on libiw-dev
+    to (>> 27+28pre8), more for documentation purposes than for real need.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 Jul 2005 21:34:40 +0200
+
+kdenetwork (4:3.3.2-5) unstable; urgency=high
+
+  * High-urgency upload for sarge targetted RC bugfix.
+
+  +++ Changes by Adeodato Simó:
+
+  * Make kopete not link against a local copy of libgadu3 (closes: #310279).
+    Teached kopete/protocols/configure.in.in to behave well if the format used
+    by gg_libgadu_version() is "YYYYMMDD" instead of "MAJOR.MINOR.YYYYMMDD".
+    See Bug#310276 for reference.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 24 May 2005 02:25:01 +0200
+
+kdenetwork (4:3.3.2-4) unstable; urgency=high
+
+  * Urgency high for sarge targetted fixes of bugs at severity important.
+
+  +++ Changes by Adeodato Simó:
+
+  * Kopete is now able again to log into MSN Messenger accounts, after the
+    latest change in the Microsoft servers yesterday. (Closes: #309745)
+    Backported patch from upstream 3.4 SVN branch that introduces a new login
+    handler stolen from KMess. Enabled nofinal for kopete/protocols/msn, since
+    otherwise it won't compile.
+
+  * As a result of the above new login handler, Kopete is now able to log into
+    MSN Messenger accounts with Hotmail or MSN addresses that have a non-.com
+    TLD (e.g., hotmail.co.uk), which closes: #306845. (The patch at upstream
+    bug #96304 is now obsolete.)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 May 2005 00:55:54 +0200
+
+kdenetwork (4:3.3.2-3) unstable; urgency=high
+
+  * Urgency high because we fix a recently discovered FTBFS that prevents the
+    previous medium-urgency upload to migrate to testing. Only debian/control
+    is changed in this upload.
+
+  +++ Changes by Adeodato Simó:
+
+  * xmms-dev has recently moved from depending on xlibs-dev to specifying the
+    exact list of development libraries needed (see Bug#302059), which makes
+    kdenetwork fail to build from source now, Add libxtst-dev to Build-Depends.
+    (Closes: #305942)
+
+  * Make ksirc recommend libio-socket-ssl-perl, so that SSL connections work.
+    Mention this in the package description. (Closes: #294331)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Apr 2005 04:51:30 +0200
+
+kdenetwork (4:3.3.2-2) unstable; urgency=medium
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update. Kopete loses rich-text support in ICQ, but works
+    around an exploitable crash when contacted by icq5 clients. Bump urgency
+    to medium since these fixes are RC. (Closes: #295265, #297861)
+
+  * Change kopete's section to kde. (Closes: #292398)
+
+  * Include the GFDL in debian/copyright, since the Handbooks are licensed
+    under it.
+
+  * Daniel Stone has kindly relicensed man pages written by him from
+    GDFL to GPL, update copyright notice in kopete.1.
+
+  +++ Changes by Adeodato Simó:
+
+  * kopete no longer depends on XMMS, which it did simply because the Now
+    Listening plugin was linked against libxmms. Added a patch to dlopen
+    libxmms at runtime and use it if present, so that the plugin remains
+    functional even if XMMS is not installed.
+    (Closes: #238368, #276586, #292963, #293191)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Mar 2005 11:49:58 +0200
+
+kdenetwork (4:3.3.2-1ubuntu1) hoary; urgency=low
+
+  * New upstream release.
+  * Remove patches: 02_autotools_update, 05_pedantic-errors,
+    06_xlibs-static-pic
+
+ -- Chris Halls <chris.halls at credativ.co.uk>  Sun, 12 Dec 2004 21:04:59 +0000
+	
+kdenetwork (4:3.3.2-1) unstable; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * KDE_3_3_BRANCH update.
+
+  * Fix kopete's irc.protocol alternative to only be removed when
+    the package is removed - should avoid unnecessary resets of
+    the sysadmin's preferences.
+
+  * Fix debian/copyright to refer to License rather than to Copyright
+    when discussing KDE's licenses.
+
+  +++ Changes by Isaac Clerencia:
+
+  * Added myself to uploaders
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 26 Jan 2005 14:18:56 +0100
+
+kdenetwork (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_3_BRANCH update.
+
+  * debian/control:
+    - removed build-dependency on automake1.9.
+
+  * debian/patches:
+    - dropped 11_kget.diff, fix included upstream.
+    - added 11_kpf-non-ascii-too.diff, to make kpf produce valid links to
+      files with non-ascii chars. (Trivial) Patch backported from CVS HEAD.
+      (Closes: #285883)
+
+  +++ Changes by Christopher Martin:
+
+  * kppp overhaul: replace utterly broken 10_pppdargs.diff patch
+    with 10_kppp_options.diff. kppp now SUID. To connect with kppp,
+    users must now uncomment #noauth in /etc/ppp/peers/kppp-options,
+    and be part of the dip group. No editing of ppp config files,
+    pap/chap-secrets, etc. required. Updated the kppp
+    README.Debian to explain these changes and their security
+    implications. (Closes: #126406, #203318)
+
+ -- Adeodato Simó <asp16 at alu.ua.es>  Tue, 21 Dec 2004 00:13:56 +0100
+
+kdenetwork (4:3.3.1-2) unstable; urgency=low
+
+  * reapply kget patch, Closes: #280616
+
+ -- Riku Voipio <riku.voipio at iki.fi>  Fri, 12 Nov 2004 19:41:32 +0000
+
+kdenetwork (4:3.3.1-1) unstable; urgency=low
+
+  * New upstream version
+  * krdc now recommends rdesktop. Closes: #271889
+
+ -- Riku Voipio <riku.voipio at iki.fi>  Sat,  6 Nov 2004 09:47:50 +0000
+
+kdenetwork (4:3.3.0-2) unstable; urgency=low
+
+  * New kdenetwork Release Manager
+  * krdc: Conflict with older rdesktop (Closes: #267434)
+  * kget: Apply patch from upstream to prevent crashing (Closes: #266553)
+  * kopete: Recommend qca-tls (Closes: #266597)
+  * kopete: Manage /usr/share/services/irc.protocol with update-alternatives
+    (Closes: #266600) (Thanks, Nathan)
+
+ -- Riku Voipio <riku.voipio at iki.fi>  Sat, 28 Aug 2004 17:21:30 +0000
+
+kdenetwork (4:3.3.0-1) unstable; urgency=high
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat, 14 Aug 2004 18:00:00 -0500
+
+kdenetwork (4:3.2.3-1) unstable; urgency=high
+
+  * New upstream release.
+  * Build-Depends: xlibs-static-pic. (Closes: #260748)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue,  3 Aug 2004 21:00:00 -0500
+
+kdenetwork (4:3.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/*.menu: remove the obsolete kderemove tag.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Fri, 16 Apr 2004 04:00:00 -0500
+
+kdenetwork (4:3.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat,  6 Mar 2004 14:00:00 -0600
+
+kdenetwork (4:3.2.0-0pre1v1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Thu, 19 Feb 2004 20:00:00 -0600
+
+kdenetwork (4:3.1.95-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-Conflict with libiw-dev since kwifimanager fails to compile.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 27 Jan 2004 20:00:00 -0600
+
+kdenetwork (4:3.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added libtool arm patch.
+  * Added patch to enable noauth in kppp automatically.
+  * Added periods to package descriptions. (Closes: #129219)
+  * kdict Provides dict-client. (Closes: #139712)
+  * Updated ksirc Description. (Closes: #157758)
+  * Updated kdict Description. (Closes: #172061)
+  * Corrected lisa init.d script. (Closes: #178554, #215573)
+  * Moved lisarc config file to /etc. (Closes: #201401)
+  * knewsticker Depends kicker. (Closes: #226281)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 13 Jan 2004 21:00:00 -0600
+
+kdenetwork (4:3.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added patch to update autotools files.
+  * Added patch to remove pedantic-errors from KDE_CHECK_FUNC_EXT since it
+    causes configure checks to fail due to #line numbers being > 32767.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat, 18 Oct 2003 01:00:00 -0500
+
+kdenetwork (4:3.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sat,  2 Aug 2003 20:00:00 -0500
+
+kdenetwork (4:3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Change ktalkd user to run as nobody. (Closes: #147762)
+
+ -- Christopher L Cheney <ccheney at debian.org>  Sun, 25 May 2003 23:00:00 -0500
+
+kdenetwork (4:3.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Wed, 12 Mar 2003 15:00:00 -0600
+
+kdenetwork (4:3.1.0-1) unstable; urgency=low
+
+  * New upstream.
+  * Redo debian dir.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Tue, 04 Feb 2003 12:00:00 -0600
+
+kdenetwork (4:2.2.2-14.6) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied upstream patches to fix several potential vulnerabilities.
+    http://www.kde.org/info/security/advisory-20021220-1.txt
+
+ -- Martin Schulze <joey at infodrom.org>  Mon,  6 Jan 2003 09:11:27 +0100
+
+kdenetwork (4:2.2.2-14.5) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Rebuilt since the buildd network decided to not build the packages
+    after satie burnt down.
+
+ -- Martin Schulze <joey at infodrom.org>  Thu, 12 Dec 2002 09:32:49 +0100
+
+kdenetwork (4:2.2.2-14.4) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied a snipped from upstream's securty patch that wasn't covered
+    by iDEFENSE and our patch, to fix another potential overflow
+
+ -- Martin Schulze <joey at infodrom.org>  Sun, 10 Nov 2002 22:15:17 +0100
+
+kdenetwork (4:2.2.2-14.3) unstable; urgency=high
+
+  * Rebuilt for sid
+
+ -- Martin Schulze <joey at infodrom.org>  Mon,  4 Nov 2002 22:13:08 +0100
+
+kdenetwork (4:2.2.2-14.2) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Applied patch from Alexander Neundorf to fix a local root
+    vulnerability in reslisa.  Thanks to iDEFENSE for the information.
+  * Add special detection routine for big/little endianess on MIPS since
+    the line "byteorder  : {big|little} endian" from /proc/cpuinfo was
+    removed as of Linux 2.4.20, resulting in the mipsel buildd being
+    unable to build this package.
+  * Unfortunately the reslisa program needs to stay setuid since it needs
+    to send PING packets
+
+ -- Martin Schulze <joey at infodrom.org>  Fri,  1 Nov 2002 18:06:11 +0100
+
+kdenetwork (4:2.2.2-14.1) testing-security; urgency=high
+
+  * Non-maintainer upload by security team
+  * Upload to unstable as well
+
+ -- Wichert Akkerman <wakkerma at debian.org>  Fri, 12 Jul 2002 22:45:24 +0200
+
+kdenetwork (4:2.2.2-14.0woody1) testing-security; urgency=high
+
+  * NMU by the security team.
+    - Fix format string bug (Closes: #147762).
+
+ -- Daniel Jacobowitz <dan at debian.org>  Sun,  7 Jul 2002 14:12:03 -0400
+
+kdenetwork (4:2.2.2-14) unstable; urgency=HIGH
+
+  * My last upload as Maintainer. *sniff*
+  * Urgency high since this fixes an RC.
+  * Changing Maintainer over to Chris, adding myself to Uploaders as
+    previously agreed between us.
+  * Fix signed char stupidness on gcc3. (closes: #127869)
+  * Fix PowerPC b0rkage.
+
+ -- Daniel Stone <daniel at sfarc.net>  Wed, 27 Feb 2002 17:02:50 +1100
+
+kdenetwork (4:2.2.2-13) unstable; urgency=low
+
+  * debian/control:
+    - Build with libpng2. (closes: #127592, #127902)
+
+ -- Daniel Stone <daniel at sfarc.net>  Thu, 10 Jan 2002 21:04:59 +1100
+
+kdenetwork (4:2.2.2-12) unstable; urgency=low
+
+  * debian/control:
+    - Build with libpng3. 
+
+ -- Daniel Stone <daniel at sfarc.net>  Wed,  2 Jan 2002 21:22:22 -0500
+
+kdenetwork (4:2.2.2-11) unstable; urgency=low
+
+  * Another version! Yay! Thanks to Chris "danish" Danis for lending me his
+    machine to do a great number of builds on.
+  * debian/control:
+    - Make klisa Replaces: and Conflicts: keystone. (closes: a potential bug)
+  * debian/mail.local.sgml:
+    - Remove spurious </var>.
+
+ -- Daniel Stone <daniel at sfarc.net>  Sun, 30 Dec 2001 07:52:43 -0500
+
+kdenetwork (4:2.2.2-10) unstable; urgency=low
+
+  * kmail/kmmsgbase.cpp, knode/knmime.cpp:
+    - Change 'char' to 'signed char' to keep gcc on platforms where char is
+      unsigned by default. (closes: #126860)
+
+ -- Daniel Stone <daniel at sfarc.net>  Sat, 29 Dec 2001 05:07:56 -0500
+
+kdenetwork (4:2.2.2-9) unstable; urgency=low
+
+  * debian/control:
+    - Fix build dependencies. (closes: #126100)
+  * debian/rules:
+    - Build with a separate builddir, just to bring it into sync with
+      kdegraphics; according to Eray, it's happier this way, anyway.
+
+ -- Daniel Stone <daniel at sfarc.net>  Sun, 23 Dec 2001 11:09:58 -0500
+
+kdenetwork (4:2.2.2-8) unstable; urgency=low
+
+  * Apologies, *really* install the manpages now. I just pushed -7 then
+    because SIGILLs are really, really, important, and manpages are trivial. 
+
+ -- Daniel Stone <daniel at sfarc.net>  Thu, 20 Dec 2001 15:44:04 +1100
+
+kdenetwork (4:2.2.2-7) unstable; urgency=medium
+
+  * Build on a different machine. (closes: #123337)
+  * Medium severity because this badly broke every package in kdenetwork.
+  * debian/control:
+    - Fix spelling, etc. (closes: #124842, #124846)
+  * debian/rules:
+    - Add "-rm -f *-stamp" to debian-clean, as it was annoying the crap out of
+      me. Also, clean up some other crap in debian-clean.
+    - Change dh_installman -a to dh_installman.
+
+ -- Daniel Stone <daniel at sfarc.net>  Tue, 18 Dec 2001 12:29:50 +1100
+
+kdenetwork (4:2.2.2-6) unstable; urgency=medium
+
+  * debian/klisa.postinst:
+    - Fix problem where it wouldn't work if klisa wasn't started.
+      I really need to get out^W^Wtest more; get out less ;)
+      (closes: #123385, #123386)
+  * Medium severity because those bugs should've been of a much higher
+    severity themselves, and this will break for a great deal of people.
+
+ -- Daniel Stone <daniel at sfarc.net>  Wed, 12 Dec 2001 15:34:30 +1100
+
+kdenetwork (4:2.2.2-5) unstable; urgency=low
+
+  * debian/control:
+    - Conflicts:, Replaces: keystone as it is no longer in the archive,
+      and just causes conflicts. (closes: #122120)
+  * debian/klisa.{postinst,prerm}:
+    - Kill debconf initscript crap, use invoke-rc.d. (closes: #113277)
+      This means overriding debhelper's automatically installed stuff. Ugh.
+  * debian/control:
+    - Declare versioned depend on sysvinit for klisa.
+  * korn/kornbutt.cpp:
+    - Applied patch from KDE bug #28071. (closes: #103071)
+  * debian/*.menu:
+    - Change command=/foo/bar/baz, to, command="/foo/bar/baz", thanks Chris
+      Danis.
+
+ -- Daniel Stone <daniel at sfarc.net>  Sun,  9 Dec 2001 01:02:42 +1100
+
+kdenetwork (4:2.2.2-4) unstable; urgency=low
+
+  * New maintainer. (closes: #114103)
+  * debian/control:
+    - Make kmail depend on procmail for /usr/sbin/lockfile. (closes: #118946)
+  * debian/klisa.postinst, debian/ksirc.postinst:
+    - Explicitly call ldconfig, because debhelper is on crack and doesn't
+      pick it up its own damn self. ksirc's postinst is just a cheap rip-off
+      of klisa's, because I'm doing this over lagged SSH.
+  * debian/{kotalkd,ktalkd,ktalkdlg,mail.local,dsirc,ksirc,ksticker,kppp,
+    kppplogview,knode,kmail,kmailcvt,klisa,reslisa,kit,kdict}.sgml:
+    - New manpages. You'd think I'd get sick of writing them, but no.
+    - Obviously this affects a lot of .manpages files, but oh well.
+  * Yes, I know kppp{,logview} is in section 1, I go by the method of
+    "/usr/bin maketh section 1, /usr/sbin maketh section 8"; hopefully I'll
+    never maintain anything as important as to expand that into /bin and
+    /sbin. ;)
+  * debian/control:
+    - Build-Dep on docbook-to-man.
+  * debian/rules:
+    - Build and install said new manpages.
+
+ -- Daniel Stone <daniel at sfarc.net>  Fri, 30 Nov 2001 21:41:29 +1100
+
+kdenetwork (4:2.2.2-3) unstable; urgency=low
+
+  * Fix klisa again and properly
+  * Add -ffunction-sections to CXXFLAGS for hppa builds
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 30 Nov 2001 01:01:00 -0700
+
+kdenetwork (4:2.2.2-2) unstable; urgency=low
+
+  * Sync with upstream
+  * Fix build bits, deps, etc for freeze
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 29 Nov 2001 04:06:00 -0700
+
+kdenetwork (4:2.2.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 07 Nov 2001 23:00:00 -0700
+
+kdenetwork (4:2.2.1-1.6) unstable; urgency=low
+
+  * More upstream fixes
+  * Build with newer binutils
+  * fix klisa init.d script
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 31 Oct 2001 23:00:00 -0700
+
+kdenetwork (4:2.2.1-1.5) unstable; urgency=low
+
+  * More upstream fixes
+  * remove automake hacks
+  * Remove bs overrides
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 26 Oct 2001 13:15:00 -0700
+
+kdenetwork (4:2.2.1-1.4) unstable; urgency=low
+
+  * Dont' check for auto* as it hoses things
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 08 Oct 2001 19:34:00 -0700
+
+kdenetwork (4:2.2.1-1.3) unstable; urgency=low
+
+  * Fix configure
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 05 Oct 2001 09:42:00 -0700
+
+kdenetwork (4:2.2.1-1.2) unstable; urgency=low
+
+  * Don't worry about automake 1.5
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 03 Oct 2001 09:42:00 -0700
+
+kdenetwork (4:2.2.1-1.1) unstable; urgency=low
+
+  * Bunch of upstream fixes for kmail and klisa
+  * hardcode sendmail instead of mail.local (Closes: #113749)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 28 Sep 2001 04:55:00 -0700
+
+kdenetwork (4:2.2.1-1) unstable; urgency=low
+ 
+  * New upstream version 2.2.1
+  * Change maintainer
+  * Lintian cleanup
+  * SIGSEGV went away (Closes: #110001)
+  * Add undocumented link (Closes: #101927)
+  * Fixes /dev/console issues (Closes: #97643)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 07 Sep 2001 14:46:00 -0700
+
+kdenetwork (4:2.2.0-final-1) unstable; urgency=low
+ 
+  * New upstream version 2.2
+  * Add suggests for knewsticker-scripts
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 30 Jul 2001 00:01:00 -0700
+
+kdenetwork (4:2.2.0-0beta1-3) unstable; urgency=low
+ 
+  * Sync with upstream
+  * More alpha build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 07 Jul 2001 03:39:00 -0700
+
+kdenetwork (4:2.2.0-0beta1-2) unstable; urgency=low
+ 
+  * Sync with upstream
+  * Spanish Templates (Closes: #103231)
+  * Autobuild for alpha now
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 02 Jul 2001 01:43:00 -0700
+
+kdenetwork (4:2.2.0-0beta1-1) unstable; urgency=low
+ 
+  * Fix overwrites (Closes: #102858, #102860)
+  * sync with upstream
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 30 Jun 2001 01:43:00 -0700
+
+kdenetwork (4:2.2-cvs20010622-1) unstable; urgency=low
+ 
+  * New upstream CVS pull
+  * 2.2 beta1
+  * Adding in Enhances: tags
+  * Adding in new hint (Closes: #98042)
+  * set $HOME in init.d script so that /root/.kde/share/apps/config/lisarc
+    is read during bootup if it exists.
+  * 2 new packages kdict and libkdenetwork1
+  * Fixes these problems: 
+       korn run command (Closes: #77627)
+  * New translations for klisa (Closes: #101016)
+  * No more keystone...
+  * libmimelib is now here
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Jun 2001 14:39:00 -0700
+
+kdenetwork (4:2.1.1-5) unstable; urgency=low
+ 
+  * Update menu bits to include new kde menu removal tag
+  * more Upstream fixes
+  * Update build-depends to recognize real | virtual
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 08 Apr 2001 17:40:00 -0700
+
+kdenetwork (4:2.1.1-4) unstable; urgency=low
+ 
+  * Use tcpwrappers (Closes: #92761)
+  * Turn off nmblookup in lisarc by default..this way samba-client isn't
+    required out of the box and the nasty error messages won't show up.
+  * Change samba-common dep from recommend to suggest
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 03 Apr 2001 13:42:00 -0700
+
+kdenetwork (4:2.1.1-3) unstable; urgency=low
+ 
+  * Change user for ktalkd.tty to root instead of nobody.tty
+  * Fix talk problem when specifying tty (Closes: #92646)
+  * Add in a postrm to actually remove ktalk inetd lines during removal
+  * Add recommends for samba-common to klisa
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 03 Apr 2001 09:56:00 -0700
+
+kdenetwork (4:2.1.1-2) unstable; urgency=low
+ 
+  * Rebuild with older libc
+  * Adding in documentation about kppp and noauth
+  * Fixing suid bit for kppplogview
+  * Rename lisa binary and package to klisa to avoid conflict with lisa 
+    screensaver. 
+  * Fix klisa so it works out of the box which means:
+    mv klisa binary to /usr/sbin
+    add a init.d script for klisa to start/stop it properly
+    add a lisarc config file
+    add setuid bit to reslisa as it must be run as root (but drops privialges
+       immediatly)
+    adding debconf warning about this
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 26 Mar 2001 17:17:00 -0700
+
+kdenetwork (4:2.1.1-1) unstable; urgency=low
+ 
+  * New upstream version
+  * Add conflict for lisa with xscreensaver (Closes: #90781)
+  * Fix run command properly for korn (Closes #77627)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Mar 2001 05:27:00 -0700
+
+kdenetwork (4:2.1.0-1) unstable; urgency=low
+ 
+   * New upstream CVS pull
+   * Updating shlibs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 10 Mar 2001 05:27:00 -0700
+
+kdenetwork (4:2.1-final-1) unstable; urgency=low
+ 
+   * New upstream version
+   * Upping standards version
+   * Adding in conflicts for talkd - ktalkd
+   * Adding in update-inetd bits - ktalkd
+   * move ktalkd and kotalkd from /usr/bin to /usr/sbin - ktalkd
+   * Adding in provides for talkd - ktalkd
+   * Adding in depends for talk | ytalk - ktalkd
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Feb 2001 02:31:00 -0700
+
+kdenetwork (4:2.1-beta2-0128-1) unstable; urgency=low
+ 
+   * More upstream fixes
+     Fixes length issues with ksirc
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 28 Jan 2001 20:00:00 -0700
+
+kdenetwork (4:2.1-beta2-1) unstable; urgency=low
+ 
+   * New upstream beta
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 22 Jan 2001 01:45:00 -0700
+
+kdenetwork (4:2.1-20010118-1) unstable; urgency=low
+ 
+   * More upstream fixes
+   * Fixing knewsticker's section
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 19 Jan 2001 23:30:00 -0700
+
+kdenetwork (4:2.1-20010115-1) unstable; urgency=low
+ 
+   * More upstream fixes
+   * New knewsticker package
+   * Moving away from dh_suidregister
+   * Fixing typos in control file
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 15 Jan 2001 01:30:00 -0700
+
+kdenetwork (4:2.1-20010106-1) unstable; urgency=low
+ 
+   * More upstream fixes
+   * Upstream fix for kppp (Closes: #80484)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 06 Jan 2001 23:10:00 -0700
+
+kdenetwork (4:2.1-20010101-1) unstable; urgency=low
+ 
+   * More upstream fixes
+   * Lets actually set the proper perms for kppp (Closes: #80484)
+     kppp is now root.dip and 04754 to match pppd for Debian
+      
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 01 Jan 2001 04:01:00 -0700
+
+kdenetwork (4:2.1-20001219-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding new hints (Closes: #80031, #80071)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Dec 2000 23:30:00 -0700
+                                                                                
+kdenetwork (4:2.1-20001216-1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in missing conflicts for kdenetwork
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 16 Dec 2000 23:50:00 -0700
+
+kdenetwork (4:2.1-20001213-1) unstable; urgency=low
+ 
+  * New upstream CVS version
+  * Build with new libmimelib (Closes: #79595)
+  * Closes these old bugs and wishlist items (Closes: #78885, #76785, #78885, #79568)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 13 Dec 2000 15:00:00 -0700
+
+kdenetwork (4:2.0-final-8) unstable; urgency=low
+ 
+  * Fixing file conflicts (Closes: #77851)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 23 Nov 2000 16:04:00 -0700
+
+kdenetwork (4:2.0-final-7) unstable; urgency=low
+ 
+  * Documentation cleanup along with proper upstream changelogs
+  * Fixing up build-depends for non x4 ports
+  * Adding in lintian overrides
+  * Cleaning up build rules
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 21 Nov 2000 02:30:00 -0700
+
+kdenetwork (4:2.0-final-6) unstable; urgency=low
+ 
+  * More upstream kmail fixes (Closes: #77340)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 18 Nov 2000 08:45:00 -0700
+
+kdenetwork (4:2.0-final-5) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 15 Nov 2000 04:45:00 -0700
+
+kdenetwork (4:2.0-final-4.2) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in provides for mail and news readers and vnc viewers
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 10 Nov 2000 15:30:00 -0700
+
+kdenetwork (4:2.0-final-4.1) unstable; urgency=low
+ 
+  * More upstream fixes
+  * adding in menu hints
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 09 Nov 2000 22:45:00 -0700
+
+kdenetwork (4:2.0-final-4) unstable; urgency=low
+ 
+  * More i18n work
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 08 Nov 2000 17:30:00 -0700
+                                                                                
+kdenetwork (4:2.0-final-3.1) unstable; urgency=low
+ 
+  * Applying ksirc i18n patch
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 05 Nov 2000 23:00:00 -0700
+
+kdenetwork (4:2.0-final-3) unstable; urgency=low
+ 
+  * more upstream fixes
+  * build against new xlibs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 04 Nov 2000 23:00:00 -0700
+                                                                                
+kdenetwork (4:2.0-final-2) unstable; urgency=low
+
+  * more upstream fixes
+  * fixing up dependencies (adding depends for kdebase-libs)
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 02 Nov 2000 18:00:00 -0700
+
+kdenetwork (4:2.0-final-0) unstable; urgency=low
+ 
+  * KDE 2.0
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 23 Oct 2000 00:00:00 -0700
+                                                                                
+kdenetwork (4:2.0-20001016-2) unstable; urgency=low
+ 
+  * Applying i18n patch for knode
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 17 Oct 2000 21:00:00 -0700
+                                                                                
+kdenetwork (4:2.0-20001016-0) unstable; urgency=low
+
+  * more upstream fixes
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 16 Oct 2000 15:00:00 -0700
+
+kdenetwork (4:2.0-20001013-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Adding in dependency for kdebase-libs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 14 Oct 2000 02:00:00 -0700
+
+kdenetwork (4:2.0-20001011-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC2
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 12 Oct 2000 06:00:00 -0700
+                                                                                
+kdenetwork (4:2.0-20001006-2) unstable; urgency=low
+ 
+  * Fixing dependency on libmime1 for kmail (Closes: #74304)
+  * Applying kdenetwork-1.94-kmail-i18n-20000924.diff
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 08 Oct 2000 03:00:00 -0700
+                                                                                
+kdenetwork (4:2.0-20001006-0) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 06 Oct 2000 18:00:00 -0700
+                                                                                
+kdenetwork (4:2.0-20001005-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Compiling against non-versioned kdelibs once again
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Thu, 05 Oct 2000 15:00:00 -0700
+                                                                                
+kdenetwork (4:2.0-20001002-0) unstable; urgency=low
+ 
+  * KDE 2.0 RC1
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 02 Oct 2000 01:30:00 -0700
+                                                                                
+kdenetwork (4:2.0-20000925-2) unstable; urgency=low
+ 
+  * More upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 27 Sep 2000 22:00:00 -0700
+
+kdenetwork (4:2.0-20000925-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * Build-depends fixes
+  * Fixing kdenetwork-dev depends (Closes: #72328)
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 25 Sep 2000 15:30:00 -0700
+
+kdenetwork (4:2.0-20000920-0) unstable; urgency=low
+ 
+  * More upstream fixes
+  * compiling with a --without-ssl for US release
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 20 Sep 2000 20:30:00 -0700
+
+kdenetwork (4:2.0-20000918-0) unstable; urgency=low
+ 
+  * more upstream fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 18 Sep 2000 18:30:00 -0700      
+
+kdenetwork (4:2.0-20000912-0) unstable; urgency=low
+ 
+  * more upstream fixes
+  * breaking package into parts
+  * Fixing up menu items
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 12 Sep 2000 22:30:00 -0700
+
+kdenetwork (4:2.0-20000909-0) unstable; urgency=low
+
+  * more upstream fixes
+  * Fixing up sections a bit more
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sat, 09 Sep 2000 22:30:00 -0700
+
+kdenetwork (4:2.0-20000827-0) experimental; urgency=low
+ 
+  * Build fixes
+  * more upstream fixes
+  * merging package fixes with upstream cvs
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 27 Aug 2000 19:30:00 -0700     
+
+kdenetwork (4:2.0-20000825-0) experimental; urgency=low
+ 
+  * Build fixes
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 25 Aug 2000 22:30:00 -0700
+                                                                                
+kdenetwork (4:2.0-20000823-1.0) experimental; urgency=low
+ 
+  * KDE 2.0 beta 4
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 23 Aug 2000 16:30:00 -0700
+                                                                               
+kdenetwork (4:2.0-20000820-1.0) experimental; urgency=low
+ 
+  * New upstream beta version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 20 Aug 2000 09:45:00 -0700
+
+kdenetwork-cvs (4:2.0-20000521-1.0) experimental; urgency=low
+ 
+  * New upstream CVS version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 21 May 2000 02:15:00 -0700
+
+kdenetwork-cvs (4:2.0-20000512-1.2) experimental; urgency=low
+ 
+  * New upstream CVS version
+  * Turning on debugging
+  * Adding in man pages
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 12 May 2000 22:00:00 -0700
+
+kdenetwork-cvs (4:2.0-20000308-1.0) experimental; urgency=low
+ 
+  * New upstream CVS version
+ 
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 08 Mar 2000 22:00:00 -0700
+
+kdenetwork-cvs (4:2.0-20000302-1.0) experimental; urgency=low
+
+  * New upstream CVS version
+  * Adding in build-depends
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Tue, 29 Feb 2000 22:00:00 -0700
+
+kdenetwork-cvs (4:2.0-19991201-1.0) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Wed, 01 Dec 1999 00:10:48 -0400
+
+kdenetwork-cvs (4:2.0-19991004-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 04 Oct 1999 08:10:48 -0400
+
+kdenetwork-cvs (4:2.0-19991001-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Fri, 01 Oct 1999 08:10:48 -0400
+
+kdenetwork-cvs (4:2.0-19990822-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Sun, 22 Aug 1999 09:30:48 -0400
+
+kdenetwork-cvs (4:2.0-19990719-1) experimental; urgency=low
+
+  * New upstream CVS version
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 19 Jul 1999 20:30:48 -0400
+
+kdenetwork-cvs (4:2.0-19990626-2) experimental; urgency=low
+
+  * Seperating out the development files into a -dev pacakge
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 28 Jun 1999 20:30:48 -0400
+
+kdenetwork-cvs (4:2.0-19990626-1) experimental; urgency=low
+
+  * new version
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 27 Jun 1999 21:14:48 +0200
+
+kdenetwork-cvs (4:2.0-19990524-1) experimental; urgency=low
+
+  * new upstream CVS version 
+  * migrating out of /opt to /
+
+ -- Ivan E. Moore II <rkrusty at debian.org>  Mon, 24 May 1999 07:30:09 -0400
+
+kdenetwork (4:1.1-19990222-1) unstable; urgency=low
+
+  * new upstream version with fixed pws 
+
+ -- Patricia Jung <trish at freiburg.linux.de>  Mon, 22 Feb 1999 23:25:49 +0100 
+
+kdenetwork (4:1.1-19990217-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Stephan Kulow <coolo at kde.org>  Wed, 17 Feb 1999 19:09:42 +0100
+
+kdenetwork (4:1.1-19990211-2) unstable; urgency=low
+
+  * fixed line numbers in po/hr/kppp.po
+
+ -- Patricia Jung <trish at freiburg.linux.de>  Wed, 17 Feb 1999 22:53:57 +0100 
+
+kdenetwork (4:1.1-19990211) unstable; urgency=low
+
+  * adding ksirc back into the distribution after fixing some weired
+    things in it
+
+ -- Stephan Kulow <coolo at kde.org>  Thu, 11 Feb 1999 22:35:00 +0100
+
+kdenetwork (4:1.1-19990207-2) unstable; urgency=low
+
+  * fixed a bug with the wrong libjpeg version
+
+ -- Stephan Kulow <coolo at kde.org>  Tue,  9 Feb 1999 10:43:43 +0100
+
+kdenetwork (4:1.1-19990207-1) unstable; urgency=low
+
+  * new upstream version 1.1 and new epoche
+
+ -- Stephan Kulow <coolo at kde.org>  Sun,  7 Feb 1999 12:12:59 +0100
+
+kdenetwork (2:980710-1.0-1) unstable; urgency=low
+
+  * new upstream version 1.0
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 12 Jul 1998 10:12:19 +0200
+
+kdenetwork (2:980419-b4-1) unstable; urgency=low
+
+  * new upstream version Beta4
+
+ -- Stephan Kulow <coolo at kde.org>  Sun, 19 Apr 1998 17:43:01 +0200
+
+kdenetwork (2:980328-2) frozen; urgency=low
+
+  * added undocumented man page for all binaries
+  * new compile with fixed kdelibs (should be the last time)
+
+ -- Stephan Kulow <coolo at kde.org>  Sat, 28 Mar 1998 21:33:55 +0100    
+
+kdenetwork (2:980328-1) frozen; urgency=low 
+
+  * new upstream version with bug fixes
+
+ -- Stephan Kulow <coolo at kde.org>  Sat, 28 Mar 1998 21:33:55 +0100
+
+kdenetwork (2:980311-2) frozen; urgency=low
+
+  * new compile cycle with qt-1.33 and libstc++-2.8
+
+ -- Stephan Kulow <coolo at kde.org>  Tue, 24 Mar 1998 19:59:56 +0100
+
+kdenetwork (2:980311-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo at kde.org>  Thu, 12 Mar 1998 23:21:40 +0100
+
+kdenetwork (980228-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Stephan Kulow <coolo at kde.org>  Sat, 28 Feb 1998 22:17:39 +0100
+
+kdenetwork (980227-1) experimental; urgency=low
+
+  * changed maintainer field
+  * New upstream release
+
+ -- Stephan Kulow <coolo at kde.org>  Sat, 28 Feb 1998 02:28:33 +0100
+
+kdenetwork (1:Beta2-2.1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Fri,  5 Dec 1997 21:17:07 +0100
+
+kdenetwork (1:Beta2-2) unstable; urgency=low
+
+  * changed kmail to use umask(077) ! mailfolders should not be world
+    readable ...
+  * fixed debstd call in debian/rules
+  * removed virtual package names.
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun, 30 Nov 1997 17:08:07 +0100
+
+kdenetwork (1:Beta2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun, 23 Nov 1997 16:07:21 +0100
+
+kdenetwork (1:Beta1.2-2) unstable; urgency=low
+
+  * new compile cycle with bugfixes.
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun,  9 Nov 1997 19:42:58 +0100
+
+kdenetwork (1:Beta1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Mon, 27 Oct 1997 11:44:46 +0100
+
+kdenetwork (1:Beta1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Andreas Jellinghaus <aj at debian.org>  Mon, 20 Oct 1997 11:15:00 +0200
+
+kdenetwork (971019-1) unstable; urgency=low
+
+  * Initial Release (my old version disapeared from my hard disk ?)
+
+ -- Andreas Jellinghaus <aj at debian.org>  Sun, 19 Oct 1997 17:59:43 +0200

Added: people/jriddell/KDE/3.5/kdenetwork/debian/compat
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/compat	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/compat	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1 @@
+4

Added: people/jriddell/KDE/3.5/kdenetwork/debian/control
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/control	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/control	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,300 @@
+Source: kdenetwork
+Section: kde
+Priority: optional
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5-rc1-1ubuntu2), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
+Standards-Version: 3.6.2
+
+Package: kdenetwork
+Section: kde
+Architecture: all
+Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}), librss1 (>= ${Source-Version})
+Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
+Suggests: kdenetwork-doc-html (>= ${Source-Version})
+Description: network-related apps from the official KDE release
+ KDE (the K Desktop Environment) is a powerful Open Source graphical
+ desktop environment for Unix workstations. It combines ease of use,
+ contemporary functionality, and outstanding graphical design with the
+ technological superiority of the Unix operating system.
+ .
+ This metapackage includes a collection of network and networking related
+ applications provided with the official release of KDE.
+
+Package: dcoprss
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: RSS utilities for KDE
+ kdenetwork-dcoprss is a RSS to DCOP bridge, allowing all
+ DCOP aware applications to access RSS news feeds. There is also
+ a few sample utilities provided.
+ .
+ RSS is a standard for publishing news headlines.
+ DCOP is the KDE interprocess communication protocol.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kdenetwork-doc-html
+Architecture: all
+Section: doc
+Suggests: konqueror | www-browser, kdebase
+Description: KDE network 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 network 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/kdict/. Documentation is provided for most
+ KDE network packages.
+ .
+ This package is part of KDE, and a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kdenetwork-kfile-plugins
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Enhances: konqueror
+Description: torrent metainfo plugin for KDE
+ This package provides a metainformation plugin for bittorrent files.
+ .
+ Kde uses kfile-plugins to provide metainfo tab in the files properties
+ dialog in konqueror and other file-handling applications.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kdenetwork-filesharing
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, perl-suid
+Replaces: kcontrol (<< 4:3.3.0)
+Description: network filesharing configuration module for KDE
+ This package provides a KDE Control Center module to configure
+ NFS and Samba.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kdict
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Provides: dict-client
+Replaces: kdebase-data (<< 4:3.4.0)
+Description: dictionary client for KDE
+ KDict is an advanced KDE graphical client for the DICT Protocol, with full
+ Unicode support. It enables you to search through dictionary databases for a
+ word or phrase, then displays suitable definitions. KDict tries to ease
+ basic as well as advanced queries.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kget
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: download manager for KDE
+ KGET is a a download manager similar to GetRight or Go!zilla. It keeps
+ all your downloads in one dialog and you can add and remove transfers.
+ Transfers can be paused, resumed, queued or scheduled.
+ Dialogs display info about status of transfers - progress, size, speed
+ and remaining time. Program supports drag & drop from KDE
+ applications and Netscape.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: knewsticker
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}, kicker
+Suggests: khelpcenter, knewsticker-scripts
+Description: news ticker applet for KDE
+ This is a news ticker applet for the KDE panel. It can scroll news from
+ your favorite news sites, such as lwn.net, /. and freshmeat.net.
+ To achieve this, KNewsTicker requires the news sites to provide a
+ RSS feed to newsitems. KNewsTicker already comes with a selection of
+ good news sources which provide such files.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kopete
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: qca-tls
+Suggests: kdeartwork-emoticons, khelpcenter, imagemagick, gpg, gnomemeeting
+Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2)
+Description: instant messenger for KDE
+ Kopete is an instant messenger program which can communicate with a variety
+ of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber.
+ .
+ Kopete includes the "Now Listening" plug-in that can report what music you
+ are currently listening to, in a number of different players, including
+ xmms, noatun, kscd, juk, kaffeine and amarok.
+ .
+ Support for more IM protocols can be added through a plugin system.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+ .
+ Homepage: http://kopete.kde.org
+
+Package: kpf
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: public fileserver for KDE
+ kpf provides simple file sharing using HTTP. kpf is strictly a public
+ fileserver, which means that there are no access restrictions to shared
+ files. Whatever you select for sharing is available to anyone. kpf is
+ designed to be used for sharing files with friends.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kppp
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, ppp
+Suggests: khelpcenter
+Description: modem dialer and ppp frontend for KDE
+ KPPP is a dialer and front end for pppd. It allows for interactive
+ script generation and network setup. It will automate the dialing in
+ process to your ISP while letting you conveniently monitor the entire
+ process.
+ .
+ Once connected KPPP will provide a rich set of statistics and keep
+ track of the time spent online for you.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: krdc
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: rdesktop (<= 1.3.1-1 )
+Recommends: rdesktop
+Suggests: khelpcenter
+Description: Remote Desktop Connection for KDE
+ krdc is an KDE graphical client for the rfb protocol, used by VNC,
+ and if rdesktop is installed, krdc can connect to Windows Terminal
+ Servers using RDP.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: krfb
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: Desktop Sharing for KDE
+ Desktop Sharing (krfb) is a server application that allows you to share
+ your current session with a user on another machine, who can use a
+ VNC client like krdc to view or even control the desktop. It doesn't
+ require you to start a new X session - it can share the current session.
+ This makes it very useful when you want someone to help you perform a
+ task.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: ksirc
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, ${perl:Depends}
+Recommends: libio-socket-ssl-perl
+Suggests: khelpcenter
+Description: IRC client for KDE
+ KSirc is an IRC chat client for KDE. It supports scripting with Perl and has a
+ lot of compatibility with mIRC for general use.
+ .
+ If you want to connect to an IRC server via SSL, you will need to install the
+ recommended package libio-socket-ssl-perl.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: ktalkd
+Section: net
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, netbase
+Recommends: talk, ytalk
+Suggests: khelpcenter
+Conflicts: talkd
+Provides: talkd
+Replaces: talkd
+Description: talk daemon for KDE
+ KTalkd is an enhanced talk daemon - a program to handle incoming talk
+ requests, announce them and allow you to respond to it using a talk
+ client. Note that KTalkd is designed to run on a single-user workstation,
+ and shouldn't be run on a multi-user machine.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kwifimanager
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter
+Description: wireless lan manager for KDE
+ KWiFiManager suite is a set of tools which allows you to manage your
+ wireless LAN connection under the K Desktop Environment. It provides
+ information about your current connection. KWiFiManager supports every
+ wavelan card that uses the wireless extensions interface.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: librss1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: RSS library for KDE
+ This is the runtime package for programs that use the KDE RSS library.
+ End users should not need to install this, it should get installed
+ automatically when needed.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: kdenetwork-dev
+Section: devel
+Architecture: any
+Depends: kopete (= ${Source-Version}), librss1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.4.3)
+Replaces: librss1-dev
+Conflicts: librss1-dev
+Description: development files for the KDE network module
+ This is the development package which contains the headers for the KDE RSS
+ library as well as the Kopete chat client, as well as miscellaneous
+ development-related files for the KDE network module.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
+
+Package: lisa
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: khelpcenter, samba-common
+Replaces: konqueror (<< 4:3.3.0)
+Description: LAN information server for KDE
+ LISa is intended to provide KDE with a kind of "network neighborhood"
+ but relying only on the TCP/IP protocol.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.

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

Added: people/jriddell/KDE/3.5/kdenetwork/debian/dcoprss.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/dcoprss.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/dcoprss.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,4 @@
+debian/tmp/usr/bin/feedbrowser
+debian/tmp/usr/bin/rssclient
+debian/tmp/usr/bin/rssservice
+debian/tmp/usr/share/services/rssservice.desktop

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kdict-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kdict-16.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kdict-16.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,194 @@
+/* XPM */
+static char *kdict-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 172 2",
+"   c black",
+".  c #000005",
+"X  c #000006",
+"o  c #00000C",
+"O  c #00000D",
+"+  c #00091F",
+"@  c #060C1B",
+"#  c #1C0E00",
+"$  c #000D23",
+"%  c #09192F",
+"&  c #051C39",
+"*  c #091A33",
+"=  c #0E233D",
+"-  c #13243C",
+";  c #3A270D",
+":  c #3B260C",
+">  c #202020",
+",  c #272727",
+"<  c #2F2F3A",
+"1  c #0B2341",
+"2  c #0B2342",
+"3  c #0A2244",
+"4  c #0D2344",
+"5  c #0C2442",
+"6  c #0F2544",
+"7  c #0E2446",
+"8  c #122645",
+"9  c #132747",
+"0  c #172A4A",
+"q  c #13325A",
+"w  c #1F3A61",
+"e  c #2A476E",
+"r  c #2A4F7E",
+"t  c #324B6F",
+"y  c #37517B",
+"u  c #3E5576",
+"i  c #3B577E",
+"p  c #422C0C",
+"a  c #41382E",
+"s  c #705333",
+"d  c #4C4C4C",
+"f  c #6F6F6F",
+"g  c #66717D",
+"h  c gray48",
+"j  c #495D80",
+"k  c #5B718A",
+"l  c #5B779C",
+"z  c #67798E",
+"x  c #63789F",
+"c  c #6B7A9B",
+"v  c #78889C",
+"b  c #768FAD",
+"n  c #7D90B0",
+"m  c #7E95B1",
+"M  c #BA7B19",
+"N  c #8A765F",
+"B  c #C5913C",
+"V  c #E0A039",
+"C  c #E9C27F",
+"Z  c #E9C976",
+"A  c #FFD97B",
+"S  c #8F8E8E",
+"D  c #909292",
+"F  c #8D9BAD",
+"G  c #8395B5",
+"H  c #8A9EB3",
+"J  c #8F9BB2",
+"K  c #9C9FAB",
+"L  c #90A3BA",
+"P  c #9BAABD",
+"I  c #A5A5BA",
+"U  c #A2ACB7",
+"Y  c #A3AFBF",
+"T  c #A2B2CA",
+"R  c #ACB6C1",
+"E  c #9ED8FA",
+"W  c #BFC0C3",
+"Q  c #BFC2C8",
+"!  c #B8C2D0",
+"~  c #ADCBE7",
+"^  c #A1D4F7",
+"/  c #A4D0F2",
+"(  c #A5D7F7",
+")  c #A5DCFB",
+"_  c #AAD7F2",
+"`  c #A9DCFB",
+"'  c #B1C8E1",
+"]  c #B0D5F4",
+"[  c #B3DAF2",
+"{  c #A7E1FC",
+"}  c #BAE1F2",
+"|  c #BDE1F1",
+" . c #BCE2F0",
+".. c #BAE8FB",
+"X. c #BBEBFD",
+"o. c #BFE9FA",
+"O. c #E4CA80",
+"+. c #E8CD82",
+"@. c #FFDB82",
+"#. c #FFDE80",
+"$. c gray78",
+"%. c #C2C9D4",
+"&. c #C7CCD5",
+"*. c #C5CFDE",
+"=. c #CCD0D3",
+"-. c #C9D0DD",
+";. c #DEC7C9",
+":. c #DFD5C6",
+">. c #D8D1CE",
+",. c #D2D2D2",
+"<. c #D4D3D2",
+"1. c #D3D5DC",
+"2. c #C1D5EC",
+"3. c #CDD5E2",
+"4. c #CDDBE7",
+"5. c #CDDDE8",
+"6. c #D6D9E0",
+"7. c #D8DFE9",
+"8. c #C1EBFB",
+"9. c #C2EEFC",
+"0. c #CCEDF3",
+"q. c #CAF2FA",
+"w. c #D2EEF1",
+"e. c #DEEFF2",
+"r. c #DFF0EF",
+"t. c #D2F1F1",
+"y. c #D2F7FB",
+"u. c #D3F7FA",
+"i. c #D1F5FC",
+"p. c #D4F4FD",
+"a. c #D7FAFB",
+"s. c #D7FCFF",
+"d. c #D8F5F7",
+"f. c #DCFBFA",
+"g. c #DEF9F9",
+"h. c #E5CCC8",
+"j. c #EDDFDF",
+"k. c #F7CDCC",
+"l. c #FBD7D6",
+"z. c #E4E3E2",
+"x. c #E1E2E8",
+"c. c #E3E4E9",
+"v. c #E0E5EE",
+"b. c #EEE7E5",
+"n. c #E9EAEA",
+"m. c #EDEDEC",
+"M. c #E0EBF4",
+"N. c #E5EAF1",
+"B. c #E5EBF4",
+"V. c #E9EFF7",
+"C. c #EDEEF3",
+"Z. c #E1F0ED",
+"A. c #E4FEFE",
+"S. c #E9F9F9",
+"D. c #FBEFED",
+"F. c #FDEEEE",
+"G. c #F0F1EF",
+"H. c #F8F2EF",
+"J. c #FAF3EF",
+"K. c #F5F4F7",
+"L. c #F8F6F2",
+"P. c #FAF5F0",
+"I. c #F8F9FA",
+"U. c #F9F9FA",
+"Y. c #FBFDFD",
+"T. c #FBFEFE",
+"R. c #FCFAFB",
+"E. c #FFFCF8",
+"W. c #FFFDFA",
+"Q. c #FDFDFC",
+"!. c gray100",
+"~. c None",
+/* pixels */
+"~.  y Q <.,.$.D f S h d ,   ~.~.",
+"~.O n !.!.!.!.T.j.F.!.!.z.F % ~.",
+"~.$ T !.!.!.!.T.h.l.!.!.!.v.0 ~.",
+"~.7 *.!.!.I.V.M.;.k.!.!.!.7.9 ~.",
+"~.w N.!.B.] ^ ( [ 4.K.!.!.3.9 ~.",
+"  i I.C./ { X... . .5.!.!.! 7 ~.",
+"O l J.2.E 9.p.q.w.t.0.c.!.Y 4 ~.",
+"+ b J.~ ) 8.i.a.r.Z.d.1.W.F 2 ~.",
+"& L K.! ` o.y.f.n.b.e.1.J.v 2 ~.",
+"q R W.*._ 9.a.g.G.F.%.x.m.z 2 ~.",
+"r U ,.$.P } s.A.S.&.I >.:.k = ~.",
+"- e t u i x m H G c K C V g 3 ~.",
+"~.        X   X @ * a Z A B > ~.",
+"~.~.~.~.~.~.~.~.~.~.~.p +.#.M # ",
+"~.~.~.~.~.~.~.~.~.~.~.~.; O. at .s ",
+"~.~.~.~.~.~.~.~.~.~.~.~.~.; N < "
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kdict.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kdict.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kdict.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kdict[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #00020C",
+"X  c #010612",
+"o  c #000C18",
+"O  c #070A13",
+"+  c #120700",
+"@  c #140A02",
+"#  c #190C03",
+"$  c #1D1003",
+"%  c gray12",
+"&  c #151515",
+"*  c #041221",
+"=  c #09162A",
+"-  c #03122E",
+";  c #0B1B35",
+":  c #161620",
+">  c #211507",
+",  c #282828",
+"<  c #292B32",
+"1  c gray22",
+"2  c #071E40",
+"3  c #09244B",
+"4  c #0D2243",
+"5  c #0D2B58",
+"6  c #132646",
+"7  c #182F53",
+"8  c #122D53",
+"9  c #1D3356",
+"0  c #0B2C60",
+"q  c #133368",
+"w  c #113973",
+"e  c #133D7C",
+"r  c #3D3E4D",
+"t  c #213B64",
+"y  c #16407E",
+"u  c #1C437E",
+"i  c #2A446F",
+"p  c #294876",
+"a  c #20447E",
+"s  c #402918",
+"d  c #5C3A12",
+"f  c #593F22",
+"g  c #484A4A",
+"h  c gray34",
+"j  c #4F587B",
+"k  c #605F71",
+"l  c #636364",
+"z  c #6B6762",
+"x  c #6D747E",
+"c  c #77736E",
+"v  c #797C7E",
+"b  c #164482",
+"n  c #164588",
+"m  c #1B4381",
+"M  c #1A4886",
+"N  c #1B4A8A",
+"B  c #1E4688",
+"V  c #1B5197",
+"C  c #214780",
+"Z  c #214980",
+"A  c #2B4D88",
+"S  c #20579C",
+"D  c #265395",
+"F  c #335181",
+"G  c #3B5B8C",
+"H  c #305590",
+"J  c #2B5FA1",
+"K  c #37619C",
+"L  c #2A62A6",
+"P  c #3668A9",
+"I  c #3867A0",
+"U  c #3A6CAB",
+"Y  c #4A5B8C",
+"T  c #505F8C",
+"R  c #4B6B8E",
+"E  c #446499",
+"W  c #4D6D94",
+"Q  c #466798",
+"!  c #52608A",
+"~  c #557292",
+"^  c #5A7597",
+"/  c #4673AC",
+"(  c #4E77AE",
+")  c #4A72A3",
+"_  c #4274B4",
+"`  c #5777A3",
+"'  c #5479AA",
+"]  c #6D7B8D",
+"[  c #627897",
+"{  c #647C9B",
+"}  c #6A7B9A",
+"|  c #667FA6",
+" . c #6176AA",
+".. c #6C819A",
+"X. c #7D8185",
+"o. c #6983A7",
+"O. c #6884B7",
+"+. c #6F89B1",
+"@. c #7989A8",
+"#. c #7F90A6",
+"$. c #A57426",
+"%. c #A97F3E",
+"&. c #B27D27",
+"*. c #8F6F42",
+"=. c #C47E1A",
+"-. c #807E88",
+";. c #BA8328",
+":. c #85817C",
+">. c #AA8C73",
+",. c #DF8E0F",
+"<. c #DD8D14",
+"1. c #C08929",
+"2. c #DB9B36",
+"3. c #E08E10",
+"4. c #E79613",
+"5. c #F2AD32",
+"6. c #F7B337",
+"7. c #C6A87D",
+"8. c #DBAE62",
+"9. c #E4BA6B",
+"0. c #EAC17C",
+"q. c #F6CE79",
+"w. c gray51",
+"e. c gray56",
+"r. c #898587",
+"t. c #898997",
+"y. c #8F908F",
+"u. c #93908B",
+"i. c #9C9B9B",
+"p. c #9C9590",
+"a. c #8C8DA5",
+"s. c #8692A8",
+"d. c #899AB1",
+"f. c #9393AA",
+"g. c #969EA8",
+"h. c #97A4BA",
+"j. c #A19E9A",
+"k. c #A6A39F",
+"l. c #BEA89B",
+"z. c #A3A3A4",
+"x. c #AAACAF",
+"c. c #ABACBE",
+"v. c #A9B2BE",
+"b. c #B2AFAB",
+"n. c #B0B0BF",
+"m. c #BEBDBC",
+"M. c #BAB3B3",
+"N. c #A2A8C0",
+"B. c #AFAFC0",
+"V. c #AEB1C1",
+"C. c #A4B0C0",
+"Z. c #A0B4D0",
+"A. c #B3B5C5",
+"S. c #B4BDC9",
+"D. c #B9BBCB",
+"F. c #B9BCC4",
+"G. c #95CDF8",
+"H. c #9BCBF4",
+"J. c #96CBF6",
+"K. c #9CD4F9",
+"L. c #96D2FA",
+"P. c #ACC7D8",
+"I. c #B9C1C9",
+"U. c #BBC1D2",
+"Y. c #A0C6E8",
+"T. c #A6C7E7",
+"R. c #ACD5EF",
+"E. c #A3D6F9",
+"W. c #A4DBFA",
+"Q. c #ACDCF5",
+"!. c #ACDCF9",
+"~. c #BCD3EA",
+"^. c #B9DCEB",
+"/. c #B1DFF8",
+"(. c #B5D9F3",
+"). c #ADE2FA",
+"_. c #B4E3FA",
+"`. c #B5E8FC",
+"'. c #BAE5F8",
+"]. c #BBEAFB",
+"[. c #BCE4F7",
+"{. c #C3BDBA",
+"}. c #CCBDB3",
+"|. c #DEBEBF",
+" X c #F79C9C",
+".X c #EFA09F",
+"XX c #E5B8AF",
+"oX c #F8BCBC",
+"OX c #F6AAAA",
+"+X c #DFCEB8",
+"@X c #F6D182",
+"#X c #E8C5BE",
+"$X c #EBD0A8",
+"%X c #FFE68B",
+"&X c #FFE587",
+"*X c #C0C2CD",
+"=X c #C5C8CE",
+"-X c #CDCCC9",
+";X c #CEC9C5",
+":X c #C1C5D4",
+">X c #C1CCDB",
+",X c #CBCAD3",
+"<X c #CAD0D9",
+"1X c #D6D2CE",
+"2X c #D4D4DD",
+"3X c #DCDBDB",
+"4X c #D4D4D7",
+"5X c #C2D4E2",
+"6X c #C3DBE4",
+"7X c #CFDDEE",
+"8X c #C9D8E3",
+"9X c #D2DBE3",
+"0X c #D2DDEC",
+"qX c #DEDCE1",
+"wX c #C9E4E7",
+"eX c #C5EEF7",
+"rX c #C3EDFA",
+"tX c #CFEEF2",
+"yX c #CCF2FB",
+"uX c #C9F4FB",
+"iX c #DBE3E1",
+"pX c #DCEBEB",
+"aX c #D7E5E9",
+"sX c #D5F4F4",
+"dX c #D1F5FB",
+"fX c #D3FBFC",
+"gX c #DCF4F5",
+"hX c #DAF5FB",
+"jX c #DAFBFB",
+"kX c #EECEC9",
+"lX c #EED0CF",
+"zX c #F4C5C4",
+"xX c #F7DADA",
+"cX c #E8D9D7",
+"vX c #E1DFE5",
+"bX c #E0E0DE",
+"nX c #FDF5C3",
+"mX c #FFFAC3",
+"MX c #E3E3E4",
+"NX c #E5E5EA",
+"BX c #EBE3E2",
+"VX c #ECEBEC",
+"CX c #ECEAE7",
+"ZX c #E2FBFB",
+"AX c #EBF6F5",
+"SX c #EAFCFC",
+"DX c #F5E7E6",
+"FX c #F0EFEF",
+"GX c #F8E8E7",
+"HX c #F4F2EE",
+"JX c #F4F3F3",
+"KX c #F5FCFC",
+"LX c #FAF5F3",
+"PX c #FAF8F6",
+"IX c #FEFEFE",
+"UX c #F3F7FC",
+"YX c None",
+/* pixels */
+"YXYXYXYX5 e ] i.z.z.z.z.i.w.l ,   1 g g , % YXYXYXYXYXYXYXYXYXYX",
+"YXYXYX  e s.IXIXIXIXIXIXIXIXIX1Xe.M.{.-X*Xz.w.h 1 & YXYXYXYXYXYX",
+"YXYXYXo C I.IXIXIXIXIXIXIXIXIXPXvXLXGXIXIXIXIXIXCXm.x A ; YXYXYX",
+"YXYXYX- H 3XIXIXIXIXIXIXIXIXIXUXbXxXxXPXIXIXIXIXIXIXIXF.u   YXYX",
+"YXYXYX2 E JXIXIXIXIXIXIXIXIXIXJXbXkXoXPXIXIXIXIXIXIXIX<Xa   YXYX",
+"YXYXYX0 | IXIXIXIXIXIXIXIXIXIXJXMX#XOXIXIXIXIXIXIXIXIX=Xe   YXYX",
+"YXYX  w d.IXIXIXIXIXIXIXIXIXIXNXVXXX XPXIXIXIXIXIXIXIX*Xu   YXYX",
+"YXYX. n v.IXIXIXIXIXIXJXNX0X7X0XNX|..XPXIXIXIXIXIXIXIXD.m   YXYX",
+"YXYX* D =XIXIXIXIXJX0XR.H.K.E.E./.(.<XNXIXIXIXIXIXIXIXS.y   YXYX",
+"YXYX2 K bXIXIXIXVX~.G.K.W.W.).Q._._.(.5XqXIXIXIXIXIXPXv.e   YXYX",
+"YXYX5 ) FXIXIXVX~.G.W.).`.`.].(.(.~.^.].U.NXIXIXIXIXJXh.e   YXYX",
+"YXYXw | LXIXJX8XJ.W.).].rXrX].].rX7X^.uXuX:XJXIXIXIXCXd.y   YXYX",
+"YX  n #.PXIXMXT.G.)._.rXyXdXeXeXdXtXwXdXfX~.3XIXIXIX3X#.y   YXYX",
+"YXX V g.PXUX2XH.K.).].yXhXhXuXyXfXpXaXjXjXtXI.PXPXPX;X at .b   YXYX",
+"YX; J x.PXJX>XJ.W.!.].yXhXdXdXsXjXNXiXjXjXjXS.JXIXUX{...b   YXYX",
+"YX3 I m.PXJXU.H.W.)._.rXrXdXfXhXjXbX3XZXSXhXA.JXPXJXb.[ b   YXYX",
+"YXw Q ;XLXFXD.H.E._.].rXdXjXjXgXSXBXcXAXSXgXV.JXPXJXk.~ u   YXYX",
+"  N ~ 1XJXJX*XY.!./.[.rXdXjXsXgXSXBXlXAXKX9XV.JXUXVXu.~ M   YXYX",
+"  V ] 3XJXJX4XZ.W._.[.eXuXjXsXAXSXxXzXJXKXV.,XPXJXNX:.R M   YXYX",
+"= L X.MXVXVXVXc.Y._.].eXdXfXtXZXSXVXDXIX9Xa.MXHXJXbXc R N   YXYX",
+"4 U y.HXJXFXLXqXc.R.`.rXuXjXsXZXSXSXKXpXf.f.,XKXKX2Xz R u   YXYX",
+"8 / v z.j.g.i.k.w.t.P.].fXfXsXjXZXSX<Xf.B.A.>X#X$X3Xz W a   YXYX",
+"= P U ( ( ' ` ^ [ | #.h.P.6XwX8XI.f.k -.t.D.}.2.4.7.l W a   YXYX",
+"  X = 4 6 7 t p F G E E Y ! j T ' O.+.o.} p.0.q.5.,.*.' a   YXYX",
+"YXYXYX                  . O   O ; 6 9 p p %.&XnX at X5.,.X.q   YXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX        > 1.%XnX at X5.<.f   YXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX$ ;.%XnX at X5.<.d YXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX# &.%XnX at X6.<.d YX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX# $.%XnX at X6.=.> ",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX+ $.%XmX8.>.< ",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX+ $.9.l.s.O ",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX+ s g :   "
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kget-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kget-16.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kget-16.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,212 @@
+/* XPM */
+static char *kget-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 190 2",
+"   c black",
+".  c #000001",
+"X  c #010000",
+"o  c #010101",
+"O  c #000005",
+"+  c #000104",
+"@  c #000006",
+"#  c #000206",
+"$  c #000207",
+"%  c #010407",
+"&  c #010509",
+"*  c #000B1A",
+"=  c #000A1C",
+"-  c #000B1C",
+";  c #000E1F",
+":  c #1C1C1C",
+">  c #000C2A",
+",  c #00132D",
+"<  c #00193C",
+"1  c #011B3C",
+"2  c #1F2037",
+"3  c #000658",
+"4  c #000C5D",
+"5  c #001649",
+"6  c #00164F",
+"7  c #001F4E",
+"8  c #00105F",
+"9  c #001360",
+"0  c #071165",
+"q  c #071A6E",
+"w  c #08186C",
+"e  c #021A70",
+"r  c #02224F",
+"t  c #1C204C",
+"y  c #002360",
+"u  c #00226F",
+"i  c #052C63",
+"p  c #00207B",
+"a  c #093373",
+"s  c #1F256C",
+"d  c #444343",
+"f  c #444443",
+"g  c #444444",
+"h  c #454545",
+"j  c #444954",
+"k  c #5A5A59",
+"l  c #5A5A5A",
+"z  c #444E61",
+"x  c #444F6A",
+"c  c #44547A",
+"v  c #000D99",
+"b  c #00159D",
+"n  c #001DA1",
+"m  c #002385",
+"M  c #002B91",
+"N  c #0E3980",
+"B  c #00309D",
+"V  c #0E3F92",
+"C  c #1E289B",
+"Z  c #0024A5",
+"A  c #002CA8",
+"S  c #0030A9",
+"D  c #0031AA",
+"F  c #0032AB",
+"G  c #0034B8",
+"H  c #2B38AE",
+"J  c #003ACC",
+"K  c #134C93",
+"L  c #1355A8",
+"P  c #1B5CAE",
+"I  c #105ABA",
+"U  c #3946B9",
+"Y  c #3070BE",
+"T  c #0244D2",
+"R  c #0143D9",
+"E  c #0759C8",
+"W  c #0351D3",
+"Q  c #1A56C4",
+"!  c #0043EC",
+"~  c #0450EF",
+"^  c #0655F7",
+"/  c #0557F8",
+"(  c #065CF5",
+")  c #0761FA",
+"_  c #0867FC",
+"`  c #096EFD",
+"'  c #0A6DFD",
+"]  c #0B6FFC",
+"[  c #1177FE",
+"{  c #157AFE",
+"}  c #167AFE",
+"|  c #1C7FFF",
+" . c #326FD3",
+".. c #3D7ADE",
+"X. c #2073FB",
+"o. c #3769EF",
+"O. c #445E94",
+"+. c #43619B",
+"@. c #4462A5",
+"#. c #4856C2",
+"$. c #4957C2",
+"%. c #4A58C3",
+"&. c #446BC2",
+"*. c #456EC3",
+"=. c #457BDD",
+"-. c #497BDB",
+";. c #516ACF",
+":. c #507AD9",
+">. c #597AD7",
+",. c #2382FB",
+"<. c #2484FF",
+"1. c #2785FF",
+"2. c #328CFF",
+"3. c #368DFF",
+"4. c #368FFF",
+"5. c #3890FF",
+"6. c #3D91F8",
+"7. c #3D94FF",
+"8. c #4382CF",
+"9. c #508ED9",
+"0. c #4C92EE",
+"q. c #4598FF",
+"w. c #4799FF",
+"e. c #499BFF",
+"r. c #5694E2",
+"t. c #5396EB",
+"y. c #539DF4",
+"u. c #549BFE",
+"i. c #53A1FF",
+"p. c #55A1FF",
+"a. c #59A5FF",
+"s. c #5AA5FF",
+"d. c #5CA7FF",
+"f. c #5EA8FF",
+"g. c #6D9EFB",
+"h. c #60A4FF",
+"j. c #66ADFF",
+"k. c #69AFFF",
+"l. c #6DAFF9",
+"z. c #6CB1FF",
+"x. c #6FB3FF",
+"c. c #73AEFF",
+"v. c #76B1FF",
+"b. c #75B7FF",
+"n. c #7CBBFF",
+"m. c #7EBCFF",
+"M. c #999897",
+"N. c #989898",
+"B. c #999999",
+"V. c #99999A",
+"C. c #999CA0",
+"Z. c #989FA9",
+"A. c #98A6B9",
+"S. c #B4B4B4",
+"D. c #89AAF4",
+"F. c #82B7FF",
+"G. c #81BDFB",
+"H. c #8DBDFF",
+"J. c #8FBFFF",
+"K. c #93A7ED",
+"L. c #93BEFE",
+"P. c #99B3F3",
+"I. c #85C1FE",
+"U. c #8AC3FD",
+"Y. c #A1C8FF",
+"T. c #A2C9FF",
+"R. c #A3C9FE",
+"E. c #A3CBFF",
+"W. c #B6D4FF",
+"Q. c #B6D5FF",
+"!. c #B7D5FF",
+"~. c #B7D7FF",
+"^. c #BBD9FF",
+"/. c #DDDDDD",
+"(. c #DDDDDE",
+"). c #CBDCFC",
+"_. c #CCDDFD",
+"`. c #CFDFFD",
+"'. c #DDDEE4",
+"]. c #DADBEE",
+"[. c #DBDBEE",
+"{. c #DDDEEA",
+"}. c #DCDCEF",
+"|. c #DDDEED",
+" X c #DCDDF0",
+".X c #CBE1FF",
+"XX c #CDE4FF",
+"oX c #CFE4FF",
+"OX c #E6E6E6",
+"+X c None",
+/* pixels */
+"+X+X+X X].].].].].].].|.{.+X+X+X",
+"+X+XC H $.$.$.$.$.$.$.U s +X+X+X",
+"+X+Xv ;._._.)._.).).`.K.0   +X+X",
+"+X+Xb >..X.X.X_..X.XoXP.w   +X+X",
+"+X+Xn :.~.W.W.W.W.W.^.D.w   +X+X",
+"+X+XZ -.E.Y.Y.Y.Y.L.g.o.e   +X+X",
+"+X+XA =.J.J.J.F.u.X.^ ! p 5 +X+X",
+"&.D D ..v.c.d.3.{ ] ) ^ M B F @.",
+"&.Q  .0.d.i.w.4.1.{ ] ( T J G O.",
+"O.K t.b.x.j.s.e.5.,.[ _ / R u j ",
+"+X> a r.I.n.z.s.w.2.| ] W y O +X",
+"+X+X* a 9.U.m.k.i.7.,.E 7 O +X+X",
+"+X+X+X= i 8.G.b.f.6.I 1   +X+X+X",
+"+X+X+X+X* r Y x.y.L ,   +X+X+X+X",
+"+X+X+X+X+X& 1 P K ; o +X+X+X+X+X",
+"+X+X+X+X+X+XV.A.Z.+X+X+X+X+X+X+X"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kget.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kget.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kget.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,256 @@
+/* XPM */
+static char *kget[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 218 2",
+"   c #000000",
+".  c #00030B",
+"X  c #000514",
+"o  c #00011D",
+"O  c #000814",
+"+  c #000A1A",
+"@  c #171717",
+"#  c #171718",
+"$  c #00042C",
+"%  c #000C22",
+"&  c #000630",
+"*  c #000A33",
+"=  c #001027",
+"-  c #00122B",
+";  c #001335",
+":  c #001538",
+">  c #17192B",
+",  c #171A3D",
+"<  c #001443",
+"1  c #001A43",
+"2  c #171A41",
+"3  c #000975",
+"4  c #00087E",
+"5  c #001E63",
+"6  c #171D65",
+"7  c #00204B",
+"8  c #002254",
+"9  c #00265C",
+"0  c #00295F",
+"q  c #002565",
+"w  c #002B6D",
+"e  c #002573",
+"r  c #002A74",
+"t  c #002B7A",
+"y  c #00306F",
+"u  c #00337C",
+"i  c #595959",
+"p  c #595D63",
+"a  c #596779",
+"s  c #000D94",
+"d  c #001296",
+"f  c #001499",
+"g  c #001C9C",
+"h  c #171F89",
+"j  c #161D9C",
+"k  c #0415A2",
+"l  c #031AA4",
+"z  c #002781",
+"x  c #002B85",
+"c  c #002B8E",
+"v  c #00219E",
+"b  c #002B90",
+"n  c #002E9A",
+"m  c #003082",
+"M  c #00328D",
+"N  c #003882",
+"B  c #003B8C",
+"V  c #00349E",
+"C  c #04389F",
+"Z  c #17208C",
+"A  c #17219D",
+"S  c #0024A2",
+"D  c #0123A9",
+"F  c #002CA6",
+"G  c #002BAC",
+"H  c #0A20AD",
+"J  c #0D21B1",
+"K  c #0033AB",
+"L  c #0039AF",
+"P  c #0036B2",
+"I  c #003CBE",
+"U  c #0F3EBE",
+"Y  c #122DB7",
+"T  c #152DB9",
+"R  c #1033B9",
+"E  c #103ABC",
+"W  c #0036D9",
+"Q  c #013DE4",
+"!  c #023CE9",
+"~  c #00419B",
+"^  c #0042A5",
+"/  c #034BAD",
+"(  c #0043B2",
+")  c #0041BC",
+"_  c #0C41B4",
+"`  c #0652B8",
+"'  c #0D52BA",
+"]  c #1042BF",
+"[  c #0858C0",
+"{  c #095CCA",
+"}  c #0353DC",
+"|  c #065BD4",
+" . c #1246C1",
+".. c #154CC2",
+"X. c #115DC2",
+"o. c #1853C5",
+"O. c #1C5CC5",
+"+. c #0242E6",
+"@. c #0245EC",
+"#. c #0249E0",
+"$. c #034BEC",
+"%. c #0146F3",
+"&. c #034BF4",
+"*. c #0451EC",
+"=. c #0553F5",
+"-. c #065CF7",
+";. c #065BF8",
+":. c #114BF2",
+">. c #1966CA",
+",. c #0762FA",
+"<. c #0865FB",
+"1. c #096CFC",
+"2. c #0D74FE",
+"3. c #1364F8",
+"4. c #1074F6",
+"5. c #1474FE",
+"6. c #1479FF",
+"7. c #1E7BF3",
+"8. c #1A7DFF",
+"9. c #205FCB",
+"0. c #334CCE",
+"q. c #3952D0",
+"w. c #2564CD",
+"e. c #2A6BD1",
+"r. c #2671D0",
+"t. c #2E7CDB",
+"y. c #347BD5",
+"u. c #2B67F5",
+"i. c #277FEE",
+"p. c #596C86",
+"a. c #596E8A",
+"s. c #406DED",
+"d. c #1E80FF",
+"f. c #2F83EB",
+"g. c #2584FF",
+"h. c #2987FF",
+"j. c #2E8AFE",
+"k. c #3281E3",
+"l. c #338DFF",
+"z. c #3D86FB",
+"x. c #3B92FE",
+"c. c #4385DA",
+"v. c #508FDF",
+"b. c #478FE5",
+"n. c #4B92EB",
+"m. c #4195FF",
+"M. c #4698FF",
+"N. c #4B9CFE",
+"B. c #538CF9",
+"V. c #5399EF",
+"C. c #5D9AE3",
+"Z. c #509FFF",
+"A. c #589EF4",
+"S. c #54A1FE",
+"D. c #5AA5FE",
+"F. c #5EA9FF",
+"G. c #6782E7",
+"H. c #6A8EEF",
+"J. c #668DF0",
+"K. c #7392EF",
+"L. c #7E99EF",
+"P. c #63A2EB",
+"I. c #69A6EE",
+"U. c #65A9F6",
+"Y. c #63ABFE",
+"T. c #68A8F2",
+"R. c #6AACFE",
+"E. c #6CB1FF",
+"W. c #70AEF0",
+"Q. c #72ADFE",
+"!. c #73B5FF",
+"~. c #77B8FF",
+"^. c #7EB3FE",
+"/. c #7CBBFE",
+"(. c #9D9D9D",
+"). c #9D9FA3",
+"_. c #9DA0A7",
+"`. c #9DA1A9",
+"'. c #9DA4B4",
+"]. c #9DA7BF",
+"[. c #A6A6A6",
+"{. c #BFBFBF",
+"}. c #9DAAC8",
+"|. c #9DAFD2",
+" X c #9DB2DF",
+".X c #8FAAF2",
+"XX c #82B3FD",
+"oX c #81BBF5",
+"OX c #86BBFE",
+"+X c #8ABAFD",
+"@X c #9DB3E1",
+"#X c #92BFFE",
+"$X c #9DBEF9",
+"%X c #86C1FE",
+"&X c #8CC5FD",
+"*X c #93C2FE",
+"=X c #91C8FD",
+"-X c #9DC5FE",
+";X c #A7C3F9",
+":X c #A6CBFF",
+">X c #A9CDFE",
+",X c #B1D2FF",
+"<X c #BBD7FF",
+"1X c #BCDAFF",
+"2X c #C5DDFF",
+"3X c #CEE3FF",
+"4X c #D4E7FF",
+"5X c #D5E8FF",
+"6X c #DBE9FF",
+"7X c #E7E7E7",
+"8X c #E7E7ED",
+"9X c #E7E7F0",
+"0X c #E7E8F4",
+"qX c #E0EFFF",
+"wX c #E1F0FF",
+"eX c #F5F5F5",
+"rX c gray100",
+"tX c None",
+/* pixels */
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtX0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X9X0X0X9XtXtXtXtXtXtXtX",
+"tXtXtXtXtXA j j j j j j j j j j j j j j j j A Z h tXtXtXtXtXtXtX",
+"tXtXtXtXtXs s T q.q.q.q.q.q.q.q.q.q.q.q.q.q.q.T 4 o tXtXtXtXtXtX",
+"tXtXtXtXtXs l .X6X6X6X6X6X6X6X6X6X6X6X6X6X6X4Xs.s $ tXtXtXtXtXtX",
+"tXtXtXtXtXf T ;XqX6X6X6X6X6X6X6X6X6X6X6X6X6X6X.Xk &   tXtXtXtXtX",
+"tXtXtXtXtXf R -X4X3X3X3X3X3X3X3X3X3X3X3X3X3X6XK.l &   tXtXtXtXtX",
+"tXtXtXtXtXf R $X3X2X2X2X2X2X2X2X2X2X2X2X2X2X2XK.l &   tXtXtXtXtX",
+"tXtXtXtXtXg E #X2X<X<X<X<X<X<X<X<X<X<X<X<X<X2XH.l *   tXtXtXtXtX",
+"tXtXtXtXtXg U XX,X,X,X,X,X,X,X,X,X,X,X,X,X,X<XH.D *   tXtXtXtXtX",
+"tXtXtXtXtXv ] oX>X:X:X:X:X:X:X:X:X:X:X:X:X-XXXs.D *   tXtXtXtXtX",
+"tXtXtXtXtXS  .^.:X-X-X-X-X-X-X:X*X:X-XXXB.u.:.! D *   tXtXtXtXtX",
+"tXtXtXtXtXS ] ^.#X#X#X#X#X*X#X*X#XQ.z.3.=.&.%. at .G * X tXtXtXtXtX",
+"tXtXtXtXtXF ..Q.+XOX+XXX+X+XXXQ.z.5.<.,.;.=.&. at .G < z tXtXtXtXtX",
+"tXtXtXtXtXF o.R.^.^.^.^.^.Q.N.g.6.2.1.<.,.;.=.$.P < tXtXtXtXtXtX",
+" XK K K K F o.D.R.Q.Q.R.Z.m.h.g.d.6.2.2.<.,.;.&.P 5 V K K K c tX",
+"@XL _ _ _ L w.S.S.S.S.N.m.x.l.j.g.d.6.2.1.<.,.=.I K P P P K t '.",
+"@XL O.n.V.V.A.Y.F.D.D.S.Z.N.m.x.j.h.g.6.2.1.<.;.*.$.+.Q W W e _.",
+" Xt C e.T.~.!.E.E.Y.Y.F.D.Z.N.x.x.j.g.8.6.2.<.,.-.=.%.Q W x + (.",
+"tX< 1 C w.T././.~.!.E.E.F.D.Z.N.m.l.j.g.8.2.2.<.-.=.#.) w +   tX",
+"tXtX+ < M 9.I.&X%X/./.!.E.Y.F.Z.M.x.l.h.g.6.2.1.,.} ( q .   tXtX",
+"tXtXtXtX- m ' I.=X%X%X/.!.E.Y.D.S.M.x.j.g.6.2.1.} ( 8 .   tXtXtX",
+"tXtXtXtXtX- u ' C.=X=X%X/.!.E.F.S.N.x.j.h.d.4.| ^ 1 . tXtXtXtXtX",
+"tXtXtXtXtXtX+ w ` v.=X=X%X/.!.Y.F.S.M.x.j.7.| ~ :   tXtXtXtXtXtX",
+"tXtXtXtXtXtXtX- 9 / c.%X&XoX/.E.Y.S.Z.x.f.{ B =   tXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtX+ 8 / c./.&X/.E.Y.D.Z.f.{ N +   tXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtX- : ~ r.W.%X!.E.D.k.` r O   tXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtX= N >.P./.Y.k.` q .   tXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtX= u [ b.k./ 7   tXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXO u / ~ ;   tXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXa.p.a i tXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/knewsticker-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/knewsticker-16.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/knewsticker-16.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,171 @@
+/* XPM */
+static char *knewsticker-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 149 2",
+"   c black",
+".  c #020202",
+"X  c gray1",
+"o  c gray4",
+"O  c #0C0C0C",
+"+  c #0E0E0E",
+"@  c #111111",
+"#  c #131313",
+"$  c gray8",
+"%  c gray9",
+"&  c #181818",
+"*  c #191919",
+"=  c gray11",
+"-  c #1D1D1D",
+";  c #202020",
+":  c #232323",
+">  c gray15",
+",  c #282828",
+"<  c gray18",
+"1  c #2F2F2F",
+"2  c gray19",
+"3  c #323232",
+"4  c #343434",
+"5  c gray21",
+"6  c #434343",
+"7  c gray27",
+"8  c gray28",
+"9  c #484848",
+"0  c #4B4B4B",
+"q  c #515151",
+"w  c #525151",
+"e  c #535353",
+"r  c #555353",
+"t  c gray34",
+"y  c #5A5959",
+"u  c #5E5D5D",
+"i  c #5F5C5C",
+"p  c #5F5E5E",
+"a  c gray38",
+"s  c #626060",
+"d  c gray39",
+"f  c #656464",
+"g  c gray40",
+"h  c #696767",
+"j  c gray42",
+"k  c #6D6C6C",
+"l  c #6D6D6D",
+"z  c #716E6E",
+"x  c #717171",
+"c  c #737171",
+"v  c #737272",
+"b  c #747373",
+"n  c #747474",
+"m  c gray46",
+"M  c #777676",
+"N  c #797979",
+"B  c #818181",
+"V  c #838383",
+"C  c #848484",
+"Z  c #868585",
+"A  c #868686",
+"S  c gray53",
+"D  c #888888",
+"F  c gray54",
+"G  c #8B8A8A",
+"H  c gray55",
+"J  c #8C8D8D",
+"K  c #8D8D8D",
+"L  c gray56",
+"P  c #908F8F",
+"I  c #909090",
+"U  c gray57",
+"Y  c #929191",
+"T  c #929292",
+"R  c #939393",
+"E  c #949393",
+"W  c gray58",
+"Q  c #969595",
+"!  c gray59",
+"~  c #979797",
+"^  c #989898",
+"/  c #9B9B9B",
+"(  c gray61",
+")  c #9D9D9D",
+"_  c #9F9F9F",
+"`  c gray63",
+"'  c #A2A2A2",
+"]  c gray64",
+"[  c #A5A5A5",
+"{  c gray65",
+"}  c #A7A7A7",
+"|  c #A9A9A9",
+" . c #AAAAAA",
+".. c gray67",
+"X. c #AEAEAE",
+"o. c #AFAFAF",
+"O. c gray69",
+"+. c #B2B2B2",
+"@. c gray70",
+"#. c #B4B4B4",
+"$. c gray71",
+"%. c #B6B6B6",
+"&. c #B7B7B7",
+"*. c gray72",
+"=. c #B9B9B9",
+"-. c gray73",
+";. c #BBBBBB",
+":. c #C0C0C0",
+">. c #C0C1C1",
+",. c gray76",
+"<. c gray77",
+"1. c #C5C5C5",
+"2. c #C6C6C6",
+"3. c gray78",
+"4. c #CAC9C9",
+"5. c #CACACA",
+"6. c #CDCDCD",
+"7. c #CECECE",
+"8. c #CFD0D0",
+"9. c #D0D0D0",
+"0. c #D2D2D2",
+"q. c LightGray",
+"w. c gray83",
+"e. c #D5D5D5",
+"r. c gray84",
+"t. c #D7D7D7",
+"y. c gray85",
+"u. c #DADADA",
+"i. c gray86",
+"p. c gray87",
+"a. c gray89",
+"s. c #E4E4E4",
+"d. c #E6E6E6",
+"f. c #E7E7E7",
+"g. c #E9E9E9",
+"h. c gray92",
+"j. c #ECECEC",
+"k. c gray93",
+"l. c #EEEEEE",
+"z. c gray94",
+"x. c gray95",
+"c. c #F3F3F3",
+"v. c #F4F4F4",
+"b. c gray96",
+"n. c #F6F6F6",
+"m. c #F8F8F8",
+"M. c #FDFDFD",
+"N. c gray100",
+"B. c None",
+/* pixels */
+"B.B.B.B.B.  & 3 7 l A & 4 4 B.B.",
+"= W  .$.j.N.N.N.N.N.w._ N.,.*.  ",
+"6 N.5.z./ $.G G o.a &.H i.$.]   ",
+"+ 7.e A a *.` < N x g W $.*.]   ",
+"B.+.w.a n U w.a N ,.x U ` *.+.& ",
+"B.l s.j.7.+.h.N.N.a.w._ ` ;.+.; ",
+"B.< v.N.N.N.N.N.N.z.h.G +.*.o.; ",
+"B.# y.N.N.N.N.N.v.h.w.A ,.$. .; ",
+"B.< z.N.N.N.N.m.j.s.3.B 7.o._ = ",
+"B.j N.z.z.v.v.j.s.y.#.G 7. .^ $ ",
+"B.o.v.h.j.j.j.f.i.w.] H ,.` U o ",
+"  i.i.7.w.y.w.7.,.,.` U ;._ A   ",
+"4 5.Y U U Y U H A A ` H $./ n   ",
+"# G M b b x b z k g W _  .W 0 B.",
+"B.> e q r y i s s i h H B t   B.",
+"B.B.B.                      B.B."
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/knewsticker.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/knewsticker.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/knewsticker.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,77 @@
+/* XPM */
+static char *knewsticker[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 39 1",
+"  c #000000",
+". c #0A0A0A",
+"X c gray8",
+"o c #1A1A1A",
+"O c #232323",
+"+ c #2C2C2C",
+"@ c #333333",
+"# c #3C3C3C",
+"$ c #444444",
+"% c #4C4C4C",
+"& c #545353",
+"* c #5A5A5A",
+"= c #605E5E",
+"- c #646262",
+"; c #686666",
+": c #6B6A6A",
+"> c #706F6F",
+", c #737272",
+"< c #787777",
+"1 c #7C7C7C",
+"2 c #838383",
+"3 c #888787",
+"4 c #8B8B8B",
+"5 c #908F8F",
+"6 c #939393",
+"7 c #9C9C9C",
+"8 c #A3A3A3",
+"9 c #ABABAB",
+"0 c #B3B3B3",
+"q c #BCBCBC",
+"w c #C3C3C3",
+"e c #CBCBCB",
+"r c #D3D3D3",
+"t c #DBDBDB",
+"y c #E3E3E3",
+"u c #EBEBEB",
+"i c #F3F3F3",
+"p c #FDFDFD",
+"a c None",
+/* pixels */
+"aaaaaaaaaaaaaaaa   oO%OaaaX aaaa",
+"aaaaaaaaa.O+%&<260qrte*@-49@ +.a",
+"aOO@%%&:7qryupppppppp91eppq1q9oa",
+"a4yuippppppppuuuyyr9w917rt94e4.a",
+".6yiuprr087w1q:7r6462q32et0202 a",
+" ,qq at 97q>&79&34&t7&4ww619tq204.a",
+"a&0t*+0w0$quq$9O404.:r717rw196oa",
+"a+7t0%@9y@*yp**&O7u2.2q22ee297+ ",
+"aX4eqq$%u%<tpqo9O2re7&q42we280# ",
+"aa:qrqr at e,;e0p*w76r>72w41qe480% ",
+"aa%0e4u098;49pryuruw8ew42qe470& ",
+"aa+7rtupipiippppppuuytq22we570& ",
+"aaX4eipppppppppppiuutt024we660* ",
+"aa ,quppppppppppiiuytr917ee640& ",
+"aaa*0yipppppppppiiuttr719ew640* ",
+"aaa*qyipppppppppiuyyte710ew649& ",
+"aaa,ryiipppppppiiuytrw53qew639% ",
+"aa.6tyiiiippppiiuyttrq26qwq639$ ",
+"aao9tyuiiiipiiiuuytrr917wqq529$ ",
+"aa#wytyuuuuiiuuyytree918wq0627@ ",
+"aa*ttttyuyuuuyyytrrww719w00527+ ",
+"a 2trrttyyyyyyttrrewq729009426O ",
+"ao9terrttttttttreewwq619099214X ",
+"a#wrqwwwwwwewwwqq099q628098221.a",
+"a*r07777777777766654971898712: a",
+"a:9523333343432222117916977,4& a",
+"a%6<<<<<<<<<<<,,,>,:2922774:2@ a",
+"ao1:-;::;::::::;;;;;:771771,,. a",
+"aa@>:----;---------=-,7214:<+ aa",
+"aa o####$$%%%&&&&*&***:2,*%O  aa",
+"aaaa         ..  .....XXX.   aaa",
+"aaaaaaaaaaaaaaaaaaaa       aaaaa"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kopete-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kopete-16.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kopete-16.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,113 @@
+/* XPM */
+static char *kopete-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 91 1",
+"  c black",
+". c #090913",
+"X c #292952",
+"o c #292A56",
+"O c #2C2C59",
+"+ c #393A79",
+"@ c #2E4082",
+"# c #2F45BA",
+"$ c #2E56BB",
+"% c #3749B9",
+"& c #325EBE",
+"* c #126FF8",
+"= c #177BE3",
+"- c #1C78F8",
+"; c #2F5EC0",
+": c #3F6CC6",
+"> c #3366D0",
+", c #3F7DD9",
+"< c #2276F8",
+"1 c #2279F8",
+"2 c #327DEC",
+"3 c #474790",
+"4 c #444796",
+"5 c #434A95",
+"6 c #42499F",
+"7 c #444898",
+"8 c #464EB0",
+"9 c #5050A1",
+"0 c #575AB4",
+"q c #415DC0",
+"w c #1BD017",
+"e c #22D320",
+"r c #24D722",
+"t c #5EE065",
+"y c #198AFE",
+"u c #1991FE",
+"i c #2286F9",
+"p c #2F8CF8",
+"a c #3284F9",
+"s c #3A85F9",
+"d c #3E89F9",
+"f c #3F99F2",
+"g c #4F86D3",
+"h c #4F95DB",
+"j c #5087D3",
+"k c #5188D2",
+"l c #5388D3",
+"z c #528ED2",
+"x c #478EEF",
+"c c #428BFA",
+"v c #4889F4",
+"b c #488AF4",
+"n c #4192E5",
+"m c #4A91F9",
+"M c #539EF6",
+"N c #5D9DFA",
+"B c #67A3FB",
+"V c #68A3FA",
+"C c #6CA7FB",
+"Z c #6CA8FB",
+"A c #F96216",
+"S c #FD7732",
+"D c #FD7E3E",
+"F c #FABD0E",
+"G c #FDBD10",
+"H c #D1B969",
+"J c #FD9148",
+"K c #FDB97F",
+"L c #FDC837",
+"P c #FDCE70",
+"I c #89B2E6",
+"U c #8BBAFB",
+"Y c #9BED9A",
+"T c #A6F2A5",
+"R c #9DC1E8",
+"E c #97C3FB",
+"W c #95CFFD",
+"Q c #9AC4FC",
+"! c #A3C9FB",
+"~ c #A7CCFB",
+"^ c #AAD0FE",
+"/ c #B8D5FB",
+"( c #BAD7FB",
+") c #E9AE83",
+"_ c #EEB492",
+"` c #EEDA99",
+"' c #FDD488",
+"] c #CDF8CE",
+"[ c #CBE0F5",
+"{ c #FFFEFF",
+"} c None",
+/* pixels */
+":&&&@}}}}}}$&&&}",
+"&'PH&}}}}}}&)KJ&",
+"&GLF&}}}}}}&ASD&",
+"&H`G&}}}}}}&J_A&",
+"O&&&&&&&&&&&&&&}",
+"}}}&[/UB[Vmm&}}}",
+"}}}&/~{ZN{cs&}}}",
+"}}}&!QQZa{*-&}}}",
+"}}}&BB{1d{<2&}}}",
+"}}}&bb[i[x,&}}}}",
+"}}}&1111n&&}6}}}",
+"}&&&&&&&fR&}&&&;",
+"&YTt&}}+&&&&I^M&",
+"&erw&}}}}O4&pyu&",
+"&t]e&}}}}}}&=Wp&",
+"5&&&9}}}}}}X&&&0"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kopete.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kopete.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kopete.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kopete[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #050409",
+"X  c #08070D",
+"o  c #0C0C18",
+"O  c #100F1E",
+"+  c #151429",
+"@  c #1E1C37",
+"#  c #0C1E42",
+"$  c #00146F",
+"%  c #001A78",
+"&  c #1E265F",
+"*  c #1E2146",
+"=  c #062476",
+"-  c #252448",
+";  c #2C2B57",
+":  c #312D5C",
+">  c #31305F",
+",  c #2C346E",
+"<  c #322F63",
+"1  c #37356B",
+"2  c #3A3A76",
+"3  c #393570",
+"4  c #3F407F",
+"5  c #021B86",
+"6  c #092792",
+"7  c #132D96",
+"8  c #112F8B",
+"9  c #1230A9",
+"0  c #3E3F82",
+"q  c #2B3791",
+"w  c #1A3AC1",
+"e  c #1E43A2",
+"r  c #2B4589",
+"t  c #274897",
+"y  c #315093",
+"u  c #3C58A3",
+"i  c #3757BA",
+"p  c #2D4CB0",
+"a  c #3B7F9E",
+"s  c #3466BA",
+"d  c #367AB4",
+"f  c #366DAE",
+"g  c #1D73CD",
+"h  c #176DD0",
+"j  c #0C6CF8",
+"k  c #0567F8",
+"l  c #017DFE",
+"z  c #0676F6",
+"x  c #156DFA",
+"c  c #1A71F8",
+"v  c #1B7CFA",
+"b  c #1671F7",
+"n  c #067BE5",
+"m  c #2645CA",
+"M  c #2E5BC2",
+"N  c #374BCB",
+"B  c #385BC7",
+"V  c #3B56D3",
+"C  c #3257D4",
+"Z  c #2C67C8",
+"A  c #3366CD",
+"S  c #3565C6",
+"D  c #3567D5",
+"F  c #3A75CD",
+"G  c #3C77C7",
+"H  c #3976DF",
+"J  c #3674D3",
+"K  c #2E68DE",
+"L  c #2E65E5",
+"P  c #2375F6",
+"I  c #2478F5",
+"U  c #2C7BF5",
+"Y  c #2579F9",
+"T  c #3268E6",
+"R  c #3874E2",
+"E  c #3D7AE0",
+"W  c #357CF6",
+"Q  c #45458B",
+"!  c #424185",
+"~  c #4B4C99",
+"^  c #4C4DA4",
+"/  c #4E51A9",
+"(  c #4E53B4",
+")  c #4B54BC",
+"_  c #534EA6",
+"`  c #5351A6",
+"'  c #5958A6",
+"]  c #5858B2",
+"[  c #5B5EBD",
+"{  c #5259B7",
+"}  c #456799",
+"|  c #4E76B0",
+" . c #6C5C9B",
+".. c #747F8F",
+"X. c #706298",
+"o. c #6473B0",
+"O. c #444FC0",
+"+. c #4659C8",
+"@. c #545AC3",
+"#. c #4455D0",
+"$. c #446BC9",
+"%. c #4668CA",
+"&. c #4863DB",
+"*. c #4765D6",
+"=. c #4673D5",
+"-. c #5363C5",
+";. c #5365D4",
+":. c #5176C9",
+">. c #407EE7",
+",. c #6563D4",
+"<. c #6363C7",
+"1. c #30A168",
+"2. c #0CC909",
+"3. c #15D403",
+"4. c #18D317",
+"5. c #0CD008",
+"6. c #0FE108",
+"7. c #23D31C",
+"8. c #23CB13",
+"9. c #34CC31",
+"0. c #26C635",
+"q. c #2FE12A",
+"w. c #41B858",
+"e. c #65F265",
+"r. c #79EE77",
+"t. c #36898A",
+"y. c #0488FE",
+"u. c #1884FB",
+"i. c #1690FF",
+"p. c #0A8CF3",
+"a. c #2A88FC",
+"s. c #3786F9",
+"d. c #3B90FB",
+"f. c #318FED",
+"g. c #3CA6FE",
+"h. c #5E83AF",
+"j. c #4580AC",
+"k. c #5AB083",
+"l. c #79849A",
+"z. c #7788A7",
+"x. c #648CBA",
+"c. c #67BD8C",
+"v. c #4C80C7",
+"b. c #4785D7",
+"n. c #578CD1",
+"m. c #4E8CE2",
+"M. c #4181E1",
+"N. c #438CF9",
+"B. c #498FF7",
+"V. c #4E9FEC",
+"C. c #4394FD",
+"Z. c #4D92F9",
+"A. c #4899FA",
+"S. c #508DE2",
+"D. c #5692E3",
+"F. c #5498FA",
+"G. c #5B9CFA",
+"H. c #5794F5",
+"J. c #4AA7FE",
+"K. c #54A1FC",
+"L. c #5CA8FC",
+"P. c #57A4ED",
+"I. c #6394CF",
+"U. c #649FF9",
+"Y. c #72A4DB",
+"T. c #69A4E5",
+"R. c #63A1FA",
+"E. c #6CABFB",
+"W. c #65A8F8",
+"Q. c #65B1FB",
+"!. c #73AAE6",
+"~. c #75ABFA",
+"^. c #7AB2FA",
+"/. c #6DC2FF",
+"(. c #7BC3FE",
+"). c #8E5876",
+"_. c #9E6D78",
+"`. c #A56171",
+"'. c #CF5F2C",
+"]. c #DB532E",
+"[. c #FD4D00",
+"{. c #FE5003",
+"}. c #FD5708",
+"|. c #E65510",
+" X c #FE6817",
+".X c #FF6B0A",
+"XX c #EF752F",
+"oX c #8D8777",
+"OX c #B08F6C",
+"+X c #DFB01B",
+"@X c #D8AC2D",
+"#X c #FC873A",
+"$X c #FDAA00",
+"%X c #FDB200",
+"&X c #FEBC00",
+"*X c #FFB708",
+"=X c #FFB71E",
+"-X c #F1B435",
+";X c #C19D51",
+":X c #C3AB71",
+">X c #FF9C4A",
+",X c #FDAA4B",
+"<X c #FFBC7C",
+"1X c #FFC300",
+"2X c #FEC91B",
+"3X c #F7C92E",
+"4X c #FDC155",
+"5X c #FFCD6C",
+"6X c #FEDB7A",
+"7X c #FDDA64",
+"8X c #FFE050",
+"9X c #A49C84",
+"0X c #81ABDA",
+"qX c #82B4FA",
+"wX c #8CBAFB",
+"eX c #84BDF8",
+"rX c #93BAF8",
+"tX c #8FBDE9",
+"yX c #94F888",
+"uX c #8CEC86",
+"iX c #AFFCAC",
+"pX c #87CF94",
+"aX c #89C5FB",
+"sX c #96C2EB",
+"dX c #95C2FC",
+"fX c #9BC3FB",
+"gX c #9CCAFD",
+"hX c #97C6F7",
+"jX c #98D7FF",
+"kX c #ABCCFB",
+"lX c #A2CCFB",
+"zX c #AFD3FD",
+"xX c #B4D4FB",
+"cX c #B8D5FC",
+"vX c #BDDBFB",
+"bX c #B2D9FA",
+"nX c #B1CEFA",
+"mX c #C09081",
+"MX c #FDB789",
+"NX c #FDC98E",
+"BX c #FED9AB",
+"VX c #FEE8AB",
+"CX c #FEE4B7",
+"ZX c #C2DCFA",
+"AX c #C7DDF4",
+"SX c #D0FFCA",
+"DX c #C8E2F9",
+"FX c #D5E7F9",
+"GX c #D7EBF6",
+"HX c #E3FFDF",
+"JX c #FFEBC6",
+"KX c #FFF8D5",
+"LX c #FFF4CB",
+"PX c #EBFFE6",
+"IX c #FFFFFE",
+"UX c #F6FBFF",
+"YX c None",
+/* pixels */
+"YXYXZ | ..o.S t YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXM S ' X.{ i & YX",
+"YXA 9XCXKXVX:X:.r YXYXYXYXYXYXYXYXYXYXYXYXYXYXC ) mXJXJXNX_.D * ",
+"M oXVXLXCXVX6X;XT + YXYXYXYXYXYXYXYXYXYXYXYXYXT OXKXJXBXNX>X).i ",
+"$.-X5X4X,X=X=X$Xo.3 YXYXYXYXYXYXYXYXYXYXYXYXYX;.>XMX>X>X#X.X|. at .",
+":.$X*X%X&X%X&X&Xz.2 YXYXYXYXYXYXYXYXYXYXYXYX   ..X X}.[.[.{.}.-.",
+"s @X1X2X7X6X2X&X:.2 YXYXYXYXYXYXYXYXYXYXYXYX. ;.{.{. XMXBXXX].+.",
+"u l.1XKXIXUX8XOX*.< YXYXYXYXYXYXYXYXYXYXYXYXYXD `.{.JXUXIX#X .[ ",
+"* #.l. at X3X+XoX$._ YXYXYXYXYXYXYXYXYXYXYXYXYXYX< V ).XX#X'. .;.Q ",
+"YX> @.D *.*.+.s J J H H R R R H R E E E H >.f.=.F S *.&.&.;.~ YX",
+"YXYX+ 2 3 i sXDXZXDXvXbXlXaXaX^.E.Q.W.W.L.L.G.A.d.f > 1 2 ; YXYX",
+"YXYXYXYXYXS.GXGXGXDXvXxXfX^.R.G.Z.^.s.d.B.B.N.N.C.q O.X YXYXYXYX",
+"YXYXYXYXYXS.DXDXAXAXvXnXrXqX~.R.F.kXFXZ.Z.Z.Z.F.A.8 @.X YXYXYXYX",
+"YXYXYXYXYXS.DXvXAXcXxXlXrX^.E.R.F.Z.kXfXF.G.G.G.b.9 { YXYXYXYXYX",
+"YXYXYXYXYXm.vXcXcXxXkXdXIXGXE.R.U.U.^.FXU c c x s p ! YXYXYXYXYX",
+"YXYXYXYXYXm.xXzXnXkXfXwXcXfX^.^.W.s.U cXk j j u.t V < YXYXYXYXYX",
+"YXYXYXYXYXm.gXfXfXfXhXrXwXwXqXN.j j R.wXj b c d.7 +.+ YXYXYXYXYX",
+"YXYXYXYXYXS.fXrXfXlXlXrXcXwXc b c j DXU c c c B.8 { . YXYXYXYXYX",
+"YXYXYXYXYXD.lXkXnXrX~.B.IXrXc v Y kXU.P P P Y b.9 / YXYXYXYXYXYX",
+"YXYXYXYXYXV.B.U P P W P nXZ.v v ^.N.c W W s.C.f N 4 YXYXYXYXYXYX",
+"YXYXYXYXYXP.T.H.H.H.H.H.qXf.a.i.i.J.E.T.n.| r % #.- YXYXYXYXYXYX",
+"YXYXYXYXYXW.hXrXrXrXfXgXqXT.Q.y.i.| $ % 6 9 m C ( O YXYXYXYXYXYX",
+"YXYXYXYXYXb.tX0Xz.} r = $ 5 n.g.a.!.m O.) / Q 2 @ YXYXYXYXYXYXYX",
+"YXYXR L C e & 5 9 w m V #.) u Y.(.gXsXZ # YXYXYXYXW T T D s.YXYX",
+"YXT d k.pXc.f i ( ^ ! 1 @ o ; q } 0XDXDXD.H YXYXT Z I.Y.v.D A YX",
+"D d uXPXPXHXyXt.i YXYXYXYXYXYX! ) q 8 y h.s A K F DXUXGXbXf.F t ",
+"A w.yXuXr.r.e.9.=.3 YXYXYXYXYXYX; ^ @.#.p q , S Y.ZXdXE.A.a.h %.",
+"G 7.q.7.4.4.7.3.j.` YXYXYXYXYXYXYXYXO < Q ] ( S A.G.a.u.l y.n $.",
+"F 8.2.2.4.4.5.3.:.` YXYXYXYXYXYXYXYXYXYXYXYX  F z y.l y.g.i.n %.",
+"i 1.6.iXIXIXe.0.;./ YXYXYXYXYXYXYXYXYXYXYXYX. =.h y.J.IXIXjXg -.",
+", =.0.yXSXiX0.| ,.! YXYXYXYXYXYXYXYXYXYXYXYXYX( F p./.GXaXg %.{ ",
+"YX/ #.| 1.1.$.,.] + YXYXYXYXYXYXYXYXYXYXYXYXYX; [ %.Z h s ;.-.2 ",
+"YXYXQ @. at .[ [ ~ @ YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX> ` [ [ [ ] 2 YX"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kppp-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kppp-16.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kppp-16.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,203 @@
+/* XPM */
+static char *kppp-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 181 2",
+"   c black",
+".  c #000005",
+"X  c #060606",
+"o  c #00000A",
+"O  c #00081C",
+"+  c #030A1F",
+"@  c #0F0F17",
+"#  c #1B1B1E",
+"$  c #000024",
+"%  c #07112D",
+"&  c #0D1123",
+"*  c #09122F",
+"=  c #181E26",
+"-  c #1A1D27",
+";  c #121A35",
+":  c #19233E",
+">  c #2D2F35",
+",  c #282F3C",
+"<  c #2D343E",
+"1  c #042678",
+"2  c #062778",
+"3  c #08297A",
+"4  c #09297A",
+"5  c #0F2E7E",
+"6  c #112E74",
+"7  c #333B55",
+"8  c #273767",
+"9  c #273F7D",
+"0  c #394353",
+"q  c #27407E",
+"w  c #394670",
+"e  c #424752",
+"r  c #47515F",
+"t  c #50555E",
+"y  c #53555D",
+"u  c #52575E",
+"i  c #53565F",
+"p  c #55555D",
+"a  c #55575D",
+"s  c #50585D",
+"d  c #404E7E",
+"f  c #4C5563",
+"g  c #4D5868",
+"h  c #595961",
+"j  c #1B3780",
+"k  c #1E3B86",
+"l  c #1E3B87",
+"z  c #1F3C87",
+"x  c #1C3B89",
+"c  c #2A458D",
+"v  c #2C478F",
+"b  c #304582",
+"n  c #314784",
+"m  c #304A90",
+"M  c #344E93",
+"N  c #344F92",
+"B  c #39508B",
+"V  c #3C5595",
+"C  c #3F579B",
+"Z  c #435A89",
+"A  c #485683",
+"S  c #445B9D",
+"D  c #465D9D",
+"F  c #495E9E",
+"G  c #4F6199",
+"H  c #516094",
+"J  c #50659A",
+"K  c #53659B",
+"L  c #57679F",
+"P  c #56689C",
+"I  c #546C9F",
+"U  c #5A6A92",
+"Y  c #4E63A1",
+"T  c #5166A1",
+"R  c #556CA5",
+"E  c #5C6FA9",
+"W  c #5D70A9",
+"Q  c #5F74AA",
+"!  c #6C7485",
+"~  c #65749E",
+"^  c #6A7B91",
+"/  c #6376A7",
+"(  c #6174AB",
+")  c #6C7FA9",
+"_  c #6E7FAE",
+"`  c #6477B2",
+"'  c #6D7BB6",
+"]  c #728399",
+"[  c #6F81B3",
+"{  c #7088AC",
+"}  c #798EA9",
+"|  c #7D8EAF",
+" . c #7B88B8",
+".. c #7C89BA",
+"X. c #7C88BE",
+"o. c #7EB69A",
+"O. c #7CA2A1",
+"+. c #C27A86",
+"@. c #C37E8F",
+"#. c #C47E8A",
+"$. c #988B9F",
+"%. c #9A899C",
+"&. c #9D8B9E",
+"*. c #808CBD",
+"=. c #808FBD",
+"-. c #8195AD",
+";. c #8191B8",
+":. c #8995B4",
+">. c #8A95BE",
+",. c #9D8EA1",
+"<. c #9D99AE",
+"1. c #8DA0B2",
+"2. c #88A0BB",
+"3. c #8DA3BD",
+"4. c #8DA4BC",
+"5. c #8FA5BF",
+"6. c #8AB4A9",
+"7. c #90A2BA",
+"8. c #90A4B9",
+"9. c #93A4BC",
+"0. c #93A8BF",
+"q. c #99A9BF",
+"w. c #8E9EC4",
+"e. c #96A4C6",
+"r. c #92ABC6",
+"t. c #97AEC8",
+"y. c #9AA3D4",
+"u. c #9CA5D7",
+"i. c #9EB4CD",
+"p. c #A0A7CC",
+"a. c #A7AFD2",
+"s. c #A3B2C4",
+"d. c #A4B7CD",
+"f. c #A8B2CF",
+"g. c #ACB5CB",
+"h. c #AFBCCA",
+"j. c #A0B3D1",
+"k. c #A6B1D0",
+"l. c #A5BCD7",
+"z. c #AFB9D5",
+"x. c #B1BFCE",
+"c. c #B6BCDB",
+"v. c #ABC1D4",
+"b. c #AEC4D6",
+"n. c #B3C8D8",
+"m. c #B3C8DC",
+"M. c #B6CADA",
+"N. c #BCCAD9",
+"B. c #BECBDA",
+"V. c #BBC3E3",
+"C. c #C3818D",
+"Z. c #C68D9B",
+"A. c #C0C5D4",
+"S. c #C3CEDF",
+"D. c #C5D1DF",
+"F. c #C6CDE2",
+"G. c #C9CDE3",
+"H. c #C8CEE0",
+"J. c #C4D1E1",
+"K. c #CBD6E2",
+"L. c #CED3E3",
+"P. c #CFD3EE",
+"I. c #CFD5E9",
+"U. c #D3D7EA",
+"Y. c #D5D8E7",
+"T. c #D8DCE9",
+"R. c #DADDEC",
+"E. c #DCDFED",
+"W. c #DCE0EF",
+"Q. c #E1E3EF",
+"!. c #E1E3F2",
+"~. c #E1E3F3",
+"^. c #E1E5F3",
+"/. c #E8EAF7",
+"(. c #EAECF5",
+"). c #F3F2F9",
+"_. c #F5F5F8",
+"`. c #F6F7FA",
+"'. c #F9FAFF",
+"]. c gray100",
+"[. c None",
+/* pixels */
+"[.[.[.[.$ 9 [ e.w.U & [.[.[.[.[.",
+"[.[.[.o ~ Q._.`.].'.F.7 [.[.[.[.",
+"[.[.  A U.N.g.H.Q.R./.V.; [.[.[.",
+"[.[.* ` :.;.k.R.Y.L.U.U.H   [.[.",
+"[.[.8 D J R z.).(.W.G.k.' $ [.[.",
+"[.[.d y.>.B N / T.~.c.J S % [.[.",
+"[.[.w u.p.9 1 1 k.~.P n C O [.[.",
+"[.[.: X.n 3 5 3 ( =.6 G P X [.[.",
+"[.[.- I 9 k c m v k k x Z X [.[.",
+"[.[.< { M F E ( E Y N I -.@ [.[.",
+"[.[.0 >.} )  .=..._ | h.0.- [.[.",
+"[.[.g r.3.3.4.9.q.s.x.B.d., [.[.",
+"[.[.! m.v.b.n.M.B.D.D.K.J.e [.[.",
+"[.[.^ <.%.&.$.&.1.O.4.w.t.r [.[.",
+"[.[.] Z.+.C.#. at .6.o.i.i.l.f [.[.",
+"[.[.> h a y a i s s i i i # [.[."
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kppp.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kppp.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kppp.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kppp[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #00000B",
+"X  c #0C0C0E",
+"o  c #000017",
+"O  c #000618",
+"+  c #090C17",
+"@  c #121217",
+"#  c #12141A",
+"$  c #000023",
+"%  c #010A26",
+"&  c #00092D",
+"*  c #010D30",
+"=  c #03102E",
+"-  c #071437",
+";  c #091638",
+":  c #0A193F",
+">  c #07163C",
+",  c #1F1F2A",
+"<  c #1B1E24",
+"1  c #1F212C",
+"2  c #1D2539",
+"3  c #2A2D38",
+"4  c #2C313C",
+"5  c #051741",
+"6  c #00154B",
+"7  c #0B1941",
+"8  c #0A1D4B",
+"9  c #081D55",
+"0  c #001E66",
+"q  c #09215E",
+"w  c #13224E",
+"e  c #122556",
+"r  c #05226A",
+"t  c #0A256B",
+"y  c #022374",
+"u  c #052877",
+"i  c #07287A",
+"p  c #0C2D7C",
+"a  c #0F2B72",
+"s  c #122E74",
+"d  c #1C3064",
+"f  c #11317E",
+"g  c #1A3372",
+"h  c #1A367B",
+"j  c #373945",
+"k  c #25386B",
+"l  c #233B7B",
+"z  c #283D7A",
+"x  c #3A4252",
+"c  c #444C5C",
+"v  c #4B505E",
+"b  c #4A5364",
+"n  c #4C5769",
+"m  c #555A69",
+"M  c #5A6679",
+"N  c #0F2F80",
+"B  c #0F3186",
+"V  c #133280",
+"C  c #183784",
+"Z  c #1C3A85",
+"A  c #1E3E8A",
+"S  c #213E88",
+"D  c #283F80",
+"F  c #274287",
+"G  c #25418A",
+"H  c #2D4584",
+"J  c #29448C",
+"K  c #2E4A8F",
+"L  c #2E4990",
+"P  c #2A4693",
+"I  c #344B8D",
+"U  c #384F8D",
+"Y  c #3D4F85",
+"T  c #334D92",
+"R  c #375094",
+"E  c #3A5293",
+"W  c #3B5698",
+"Q  c #3D57A1",
+"!  c #465887",
+"~  c #415490",
+"^  c #405894",
+"/  c #455C9B",
+"(  c #485F9E",
+")  c #465DA1",
+"_  c #4B629D",
+"`  c #43629A",
+"'  c #576588",
+"]  c #53669A",
+"[  c #546997",
+"{  c #4D62A1",
+"}  c #4B62A8",
+"|  c #5066A2",
+" . c #596FA6",
+".. c #596DAA",
+"X. c #5468A7",
+"o. c #566AB0",
+"O. c #596EB2",
+"+. c #5C75A7",
+"@. c #66758C",
+"#. c #64719A",
+"$. c #7E7E96",
+"%. c #787F99",
+"&. c #6174A4",
+"*. c #6174AC",
+"=. c #657AAD",
+"-. c #6171B0",
+";. c #6B7CB1",
+":. c #36AB39",
+">. c #5B997B",
+",. c #629C74",
+"<. c #658D8C",
+"1. c #6E829D",
+"2. c #6E84A3",
+"3. c #6F81B4",
+"4. c #758BAB",
+"5. c #7883AF",
+"6. c #7C88A6",
+"7. c #7A8DAA",
+"8. c #7689A2",
+"9. c #7282B3",
+"0. c #7584BD",
+"q. c #7987B9",
+"w. c #7A8BB4",
+"e. c #7C89BC",
+"r. c #7C91AA",
+"t. c #7C96B3",
+"y. c #7F97B8",
+"u. c #7F9AB7",
+"i. c #7596B5",
+"p. c #77BE85",
+"a. c #7181C1",
+"s. c #7887C4",
+"d. c #7888C6",
+"f. c #7F8CC8",
+"g. c #7CC385",
+"h. c #BA434E",
+"j. c #BB5760",
+"k. c #BD5F66",
+"l. c #A66774",
+"z. c #AD6A76",
+"x. c #B86169",
+"c. c #DA2628",
+"v. c #DA2526",
+"b. c #C33D45",
+"n. c #C05159",
+"m. c #D57277",
+"M. c #DD7174",
+"N. c #E35F5F",
+"B. c #E36666",
+"V. c #9C7180",
+"C. c #957486",
+"Z. c #907F94",
+"A. c #88909F",
+"S. c #91879E",
+"D. c #94899B",
+"F. c #8E8EA3",
+"G. c #818EBE",
+"H. c #8094AA",
+"J. c #809AAD",
+"K. c #8C96AC",
+"L. c #8F9BAE",
+"P. c #8190BC",
+"I. c #829BB5",
+"U. c #849DBA",
+"Y. c #8A9DB3",
+"T. c #8C9CBA",
+"R. c #8692B8",
+"E. c #919CB7",
+"W. c #929FBE",
+"Q. c #8CA2BB",
+"!. c #86A1BD",
+"~. c #97A0AF",
+"^. c #93A1B5",
+"/. c #94A5BA",
+"(. c #94A8BD",
+"). c #9AA3B2",
+"_. c #99AABA",
+"`. c #A1A8B5",
+"'. c #A1A9BD",
+"]. c #A4B1BF",
+"[. c #BBAEBC",
+"{. c #8492C2",
+"}. c #8B95C9",
+"|. c #8E98CB",
+" X c #8B9BC1",
+".X c #919DC5",
+"XX c #939CCB",
+"oX c #8BA5C4",
+"OX c #8AA9C5",
+"+X c #92A2C3",
+"@X c #96A0CB",
+"#X c #94AAC2",
+"$X c #98A2CC",
+"%X c #9AAEC3",
+"&X c #9AA3D1",
+"*X c #9DAAD1",
+"=X c #9CB0C5",
+"-X c #9BB1C9",
+";X c #A3ADC7",
+":X c #A3ACCB",
+">X c #A4ACD4",
+",X c #A5B3C2",
+"<X c #A2B5CA",
+"1X c #A6B8CD",
+"2X c #ABB5CF",
+"3X c #AFBAC6",
+"4X c #AABACC",
+"5X c #A7B0D9",
+"6X c #AAB3D2",
+"7X c #ACB4D9",
+"8X c #ABBDD1",
+"9X c #B0B6CA",
+"0X c #B2BAD4",
+"qX c #B8BED2",
+"wX c #B8BFDF",
+"eX c #B2BFDB",
+"rX c #AEC3D7",
+"tX c #B3C3D3",
+"yX c #BAC3D3",
+"uX c #BDC2DF",
+"iX c #B9C8D6",
+"pX c #BCCAD8",
+"aX c #ACC9E0",
+"sX c #BFC6E2",
+"dX c #B1C4E0",
+"fX c #CE969E",
+"gX c #CE9CA5",
+"hX c #C5C9D7",
+"jX c #C5CCDC",
+"kX c #C8CDDF",
+"lX c #C5D2DE",
+"zX c #C1C6E1",
+"xX c #C4CAE1",
+"cX c #C8CDE4",
+"vX c #CACFEA",
+"bX c #C6D3E0",
+"nX c #CBD3E4",
+"mX c #CED2E8",
+"MX c #CEDAE5",
+"NX c #D0D5E5",
+"BX c #D2D6E9",
+"VX c #D4DBE6",
+"CX c #D6DAEB",
+"ZX c #DADDEC",
+"AX c #DCDFF1",
+"SX c #DCE1EC",
+"DX c #DEE1F0",
+"FX c #E0E3ED",
+"GX c #E3E5F1",
+"HX c #E6E8F3",
+"JX c #EAECF5",
+"KX c #E8ECFA",
+"LX c #EEF0F6",
+"PX c #F1F2F7",
+"IX c #F3F4FA",
+"UX c #FBFBFE",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYX0 u C F E K h 9 $ YXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYX6 s +.2XZXPXIXPXJXuXy.k o YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYX6 / cXUXUXIXLXPXIXUXUXUXKXe.- YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYX&  .HXIXJXHXFXFXJXLXJXJXJXLXIX*X7 YXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYX% ) AXHXNXhXyXqXyXFXJXGXHXGXFXGXKX{.* YXYXYXYXYXYXYX",
+"YXYXYXYXYX  h 5XnX9X'.'.;X:X2XZXVXZXZXNXCXCXCXvXE . YXYXYXYXYXYX",
+"YXYXYXYXYX5 ..*XE.K.T..XT..XcXZXjXkXqXkXCXBXvXcXs.8   YXYXYXYXYX",
+"YXYXYXYX  l X.&.6.w.e.w.+XNXHXGXHXFXZXZXBXmXcXhX}.I   YXYXYXYXYX",
+"YXYXYXYXO ) S g &.=.=.*.0XPXHXHXHXGXAXCXvXjXcX7X}...% YXYXYXYXYX",
+"YXYXYXYX* } ;.~ ~ | | _ =.CXUXUXLXHXDXCXvX0X6X5.{.a.: YXYXYXYXYX",
+"YXYXYXYX7 a.XX*X at X[ H W T  .W.T.HXLXDXCXmXhX.X] T O.w   YXYXYXYX",
+"YXYXYXYX7 d.}.$X5X:X' h S Z f h qXIXAXBXvXXXz Y -.Q 8   YXYXYXYX",
+"YXYXYXYX; 0.|.XX>XwX#.t p f f y R.IXCXvXzXU a U T V 5   YXYXYXYX",
+"YXYXYXYX+ O.XXXX7XR.q p p p p y ;.JXCXxX;.r d 9...P & YXYXYXYXYX",
+"YXYXYXYX  ~ |.XX#.H i p p p p u J cXCXXXF r e .X&XE . YXYXYXYXYX",
+"YXYXYXYXYXw f.0.9 u f p f f C C f ;.R.S r T D ;.s.g   YXYXYXYXYX",
+"YXYXYXYXYX2 X...g a V C S S J P S S C V p J J Z A ! . YXYXYXYXYX",
+"YXYXYXYXYXc +.{ L F J J T E E ~ E E L J S A S i ` 8.X YXYXYXYXYX",
+"YXYXYXYXYXn !.` Z T ( ( ) { | | { _ ( / / T f ^ Q.r.# YXYXYXYXYX",
+"YXYXYXYX  ' I.r.] T (  .=.;.;.;.;.;.*.../ J ] ,X_.u.1 YXYXYXYXYX",
+"YXYXYXYX  @.U.r.J.2.X.*.0.e.{.{.G.q.;.| _ 4.,X3X%XU.4 YXYXYXYXYX",
+"YXYXYXYXX %.!.t.r.J.H.w.w.w.e.e.e.q.9.7./.,X,XyX4XU.x   YXYXYXYX",
+"YXYXYXYX@ 7.oXU.Q.U.Y.L.Y.Y.Y.Y.E.^._.].,X4XtXpXtXoXb   YXYXYXYX",
+"YXYXYXYX, Q.(.(.#X#X%X(.(.=X(.].,X<X4XtXqXtXiXiXiX-XM   YXYXYXYX",
+"YXYXYXYX3 #X#X#X#X#X-X=X=X-X4X4X1XrX4XtXtXtXiXpXiX1X at .  YXYXYXYX",
+"YXYXYXYXj jXbXbXbXpXbXlXMXMXlXMXlXVXMXSXVXVXSXSXSXMXK.  YXYXYXYX",
+"YXYXYXYXb 1X-X(.(.-X^.=X(./.-X~.].=XQ.(.=X=X%X%X%X-XY.X YXYXYXYX",
+"YXYXYXYXc u.i.l.l.%.k.1.z.C.1.x.4.4.,.<.t.t.t.u.t.u.1.@ YXYXYXYX",
+"YXYXYXYXb OXS.v.D.h.n.D.v.F.b.j.OX>.:.u.U.U.U.U.U.Q.7.# YXYXYXYX",
+"YXYXYXYXm aXgXM.iXB.[.fXm.iXN.[.rXg.p.rX8X8X8X8X8XrX^.@ YXYXYXYX",
+"YXYXYXYX1 F.`.).).`.).).).).`.).).`.).).).).).).).).m   YXYXYXYX",
+"YXYXYXYX      .     .   .   .     .       .     .       YXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/krdc-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/krdc-16.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/krdc-16.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,196 @@
+/* XPM */
+static char *krdc-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 174 2",
+"   c #000000",
+".  c #000001",
+"X  c #010101",
+"o  c #000002",
+"O  c #010002",
+"+  c #020203",
+"@  c #020204",
+"#  c #030304",
+"$  c #050506",
+"%  c #070607",
+"&  c #060609",
+"*  c #070708",
+"=  c #07070D",
+"-  c #09090D",
+";  c #08080F",
+":  c #09090E",
+">  c #0A0A0D",
+",  c #090910",
+"<  c #0D0D10",
+"1  c #0E0D11",
+"2  c #0C0C16",
+"3  c #0F0F15",
+"4  c #0E0E1A",
+"5  c #101013",
+"6  c #101015",
+"7  c #121215",
+"8  c #17171D",
+"9  c #18161C",
+"0  c #1A1A1F",
+"q  c #161520",
+"w  c #232328",
+"e  c #22222D",
+"r  c #26252E",
+"t  c #222335",
+"y  c #2A2A36",
+"u  c #2F2F37",
+"i  c #2F2F42",
+"p  c #343440",
+"a  c #393943",
+"s  c #353550",
+"d  c #373750",
+"f  c #393A5C",
+"g  c #3D3E64",
+"h  c #43434D",
+"j  c #414155",
+"k  c #4A4A58",
+"l  c #55556F",
+"z  c #57586E",
+"x  c #545578",
+"c  c #68677E",
+"v  c #1A6FEC",
+"b  c #1572EE",
+"n  c #1972EC",
+"m  c #1C7AEE",
+"M  c #257CED",
+"N  c #6A6B82",
+"B  c #6E6E94",
+"V  c #6B6F9D",
+"C  c #777788",
+"Z  c #75758D",
+"A  c #7F7F90",
+"S  c #7A7BA0",
+"D  c #787BA7",
+"F  c #7F7FA0",
+"G  c #1F80F3",
+"H  c #1F81F7",
+"J  c #2282EF",
+"K  c #2688F3",
+"L  c #278CF7",
+"P  c #258BFC",
+"I  c #2880F3",
+"U  c #288AFB",
+"Y  c #2A91F7",
+"T  c #2D97FE",
+"R  c #2F97FC",
+"E  c #3488EF",
+"W  c #348BF9",
+"Q  c #3198F8",
+"!  c #309CFD",
+"~  c #339FFF",
+"^  c #3DA9FE",
+"/  c #3DAAFF",
+"(  c #3FADFF",
+")  c #7D829B",
+"_  c #7B80B3",
+"`  c #4597F5",
+"'  c #5192F2",
+"]  c #40ABFD",
+"[  c #42AEFD",
+"{  c #4AB2FE",
+"}  c #4AB8FF",
+"|  c #4CBCFF",
+" . c #4FBEFE",
+".. c #4FBEFF",
+"X. c #5AA8FB",
+"o. c #799CDA",
+"O. c #679FF4",
+"+. c #61B6F5",
+"@. c #6CB0F6",
+"#. c #56C6FF",
+"$. c #5FC5FA",
+"%. c #59CBFE",
+"&. c #5ACBFF",
+"*. c #60C2FD",
+"=. c #63D3FF",
+"-. c #65D2FC",
+";. c #6AD8FE",
+":. c #7ECFFA",
+">. c #75DAFD",
+",. c #838393",
+"<. c #888BB7",
+"1. c #8891AD",
+"2. c #8E94B4",
+"3. c #8997BA",
+"4. c #9696B0",
+"5. c #999AB2",
+"6. c #9B9BB4",
+"7. c #989EBC",
+"8. c #9A9CBD",
+"9. c #819ACB",
+"0. c #89ABE7",
+"q. c #8EAFED",
+"w. c #83AEF1",
+"e. c #85ADF3",
+"r. c #96AFE3",
+"t. c #A1A0C0",
+"y. c #A4A5C0",
+"u. c #ABACCA",
+"i. c #AEAFCC",
+"p. c #AFAFCF",
+"a. c #A1A8DA",
+"s. c #A4ADDD",
+"d. c #A5ADDF",
+"f. c #B5B6C5",
+"g. c #B3B7D3",
+"h. c #B3B7DF",
+"j. c #B5BADE",
+"k. c #A8B1E1",
+"l. c #AEB5E4",
+"z. c #AABCED",
+"x. c #B1B6E2",
+"c. c #B0BFEF",
+"v. c #B9BCE1",
+"b. c #87DFFD",
+"n. c #9ECBF0",
+"m. c #98C9FB",
+"M. c #99D6F8",
+"N. c #BEC1DD",
+"B. c #A4C9F2",
+"V. c #A6D2F2",
+"C. c #AED0F9",
+"Z. c #BEC6E4",
+"A. c #B9C0E8",
+"S. c #BCC7EE",
+"D. c #B2C9F3",
+"F. c #BECCF0",
+"G. c #B0D5F5",
+"H. c #B6D3F6",
+"J. c #C0C2E3",
+"K. c #C1C5E6",
+"L. c #C6C8E5",
+"P. c #C4C8E8",
+"I. c #C4CBF3",
+"U. c #C0D0EF",
+"Y. c #CED3F1",
+"T. c #CCD3F6",
+"R. c #CED4F5",
+"E. c #D7D8E6",
+"W. c #D7DBF4",
+"Q. c #E4E6F6",
+"!. c #E3E7FA",
+"~. c #E5E8F6",
+"^. c #F2F5FF",
+"/. c None",
+/* pixels */
+"/./././.5 7 u k Z t.p.u.j /././.",
+"/./.w C 5.y.g.Z.U.H.m.C.N # /./.",
+"/./.,.R.F.G.M.:.*.{ ~ X.) * /./.",
+"/./.A R.V.b.;.%...( ! ` 1.> /./.",
+"/./.h K.n.>.=.#.} / Y E 3.< /./.",
+"/./.0 i.B.-.&. .] Q J M 9.9 /./.",
+"/./.< 4.D.$...] Q K m n o.t /./.",
+"/././.c S.+./ R U J n n 0.a /./.",
+"/././.p j. at .! P H I ' q.7.e /./.",
+"/././.6 8.e.P W O.r.2.l 8   /./.",
+"/././.> F z.e.z.A.<.x t , /././.",
+"/./././.z v.J.W.I.a.k.s.V 4 /./.",
+"/././.9 f.~.L.P.l.l.k.D g = /./.",
+"/././.y E.^.!.Y.h.D g 4 # /././.",
+"/././.6 6.Q.N.S s =   /././././.",
+"/./././.i B d ,   /././././././."
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/krdc.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/krdc.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/krdc.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,284 @@
+/* XPM */
+static char *krdc[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 246 2",
+"   c #000000",
+".  c #07070D",
+"X  c #08080E",
+"o  c #0B0B14",
+"O  c #0F0F1D",
+"+  c #111116",
+"@  c #11111B",
+"#  c #141423",
+"$  c #18172F",
+"%  c #1A1A23",
+"&  c #19192C",
+"*  c #1D1D36",
+"=  c #1F1F38",
+"-  c #23232B",
+";  c #28282D",
+":  c #26263C",
+">  c #232346",
+",  c #2E2E40",
+"<  c #2D2D4B",
+"1  c #353543",
+"2  c #36364E",
+"3  c #353652",
+"4  c #36365F",
+"5  c #3A3A5B",
+"6  c #3F3E73",
+"7  c #414050",
+"8  c #43435D",
+"9  c #494954",
+"0  c #4B4B58",
+"q  c #51515C",
+"w  c #474766",
+"e  c #41416B",
+"r  c #4A4A63",
+"t  c #4A4A68",
+"y  c #454572",
+"u  c #48497F",
+"i  c #5D5D6A",
+"p  c #565673",
+"a  c #595974",
+"s  c #626270",
+"d  c #67677B",
+"f  c #0660E9",
+"g  c #0E66E9",
+"h  c #0E6AE9",
+"j  c #136CEB",
+"k  c #116EF0",
+"l  c #1672EB",
+"z  c #1A76EC",
+"x  c #1C79EB",
+"c  c #1576F5",
+"v  c #1875F1",
+"b  c #1C7CF3",
+"n  c #1B7EFC",
+"m  c #227DEC",
+"M  c #3B7FEC",
+"N  c #474685",
+"B  c #555789",
+"V  c #585889",
+"C  c #5C5B93",
+"Z  c #5B5C9C",
+"A  c #5F6089",
+"S  c #606083",
+"D  c #6B6B8A",
+"F  c #666692",
+"G  c #61629B",
+"H  c #6C6C98",
+"J  c #727281",
+"K  c #70708A",
+"L  c #757490",
+"P  c #71719C",
+"I  c #797995",
+"U  c #7F7E9F",
+"Y  c #6668A8",
+"T  c #767AAE",
+"R  c #7D7CA6",
+"E  c #7C7EB5",
+"W  c #1D82FD",
+"Q  c #2280EE",
+"!  c #2283F2",
+"~  c #2184FA",
+"^  c #2689F6",
+"/  c #238AFC",
+"(  c #298CF5",
+")  c #288DFB",
+"_  c #2490FE",
+"`  c #2D92F7",
+"'  c #2D94FB",
+"]  c #3788EC",
+"[  c #3E83ED",
+"{  c #3284F5",
+"}  c #388AF5",
+"|  c #3096F7",
+" . c #329CFD",
+".. c #36A2FF",
+"X. c #3BA5FC",
+"o. c #3DAAFE",
+"O. c #4B8AEE",
+"+. c #4592EF",
+"@. c #4498F2",
+"#. c #4D94F7",
+"$. c #5894E8",
+"%. c #41AFFE",
+"&. c #4BA6FE",
+"*. c #44B2FF",
+"=. c #48B6FF",
+"-. c #4BBAFF",
+";. c #5FA6F7",
+":. c #50BEFF",
+">. c #609AF0",
+",. c #6AAAE7",
+"<. c #61B2EC",
+"1. c #6AB8FD",
+"2. c #70A3F2",
+"3. c #7DA9F1",
+"4. c #7DBCFE",
+"5. c #53C2FF",
+"6. c #5AC3FB",
+"7. c #59CAFF",
+"8. c #5ED0FF",
+"9. c #62D4FF",
+"0. c #67D8FF",
+"q. c #6CD7FC",
+"w. c #6AD9FF",
+"e. c #73DBFF",
+"r. c #7CDBFC",
+"t. c #86869C",
+"y. c #88889C",
+"u. c #8181A5",
+"i. c #8585A9",
+"p. c #8988AB",
+"a. c #8585B4",
+"s. c #8C8CB4",
+"d. c #9393B5",
+"f. c #9696BD",
+"g. c #9A99B0",
+"h. c #9B9BBD",
+"j. c #8387C9",
+"k. c #8B8FC7",
+"l. c #8D91CA",
+"z. c #9395C5",
+"x. c #9195CB",
+"c. c #9798CB",
+"v. c #9E9EC5",
+"b. c #9D9ECC",
+"n. c #969BD4",
+"m. c #989CD4",
+"M. c #9EA1D3",
+"N. c #9CA2D9",
+"B. c #80AFEA",
+"V. c #80AAF1",
+"C. c #8ABDE8",
+"Z. c #88B4F4",
+"A. c #94A7E0",
+"S. c #95B4EB",
+"D. c #9DBCEA",
+"F. c #96B8F3",
+"G. c #A09FC9",
+"H. c #A4A3C4",
+"J. c #A9A8C4",
+"K. c #ABABCC",
+"L. c #A1A7D7",
+"P. c #A4AADA",
+"I. c #ACADD4",
+"U. c #A9AEDC",
+"Y. c #A5B5DF",
+"T. c #ABB1DD",
+"R. c #B0B0C8",
+"E. c #B4B4D5",
+"W. c #B3B5DA",
+"Q. c #B7B9DD",
+"!. c #BABAD4",
+"~. c #BCBEDD",
+"^. c #A0A8E2",
+"/. c #ACB5E3",
+"(. c #AEBAE7",
+"). c #AEBBEB",
+"_. c #A6BDF0",
+"`. c #B2B7E4",
+"'. c #B3BAE3",
+"]. c #B8BEE5",
+"[. c #84C0E9",
+"{. c #83CCF3",
+"}. c #81DFFF",
+"|. c #8FDAF7",
+" X c #9BCDF0",
+".X c #9FCFF9",
+"XX c #91D8F7",
+"oX c #8BE1FF",
+"OX c #92E4FF",
+"+X c #9FE5FE",
+"@X c #A6C3E6",
+"#X c #AAC0E3",
+"$X c #A8C7F6",
+"%X c #A2D0EF",
+"&X c #B1CEED",
+"*X c #BFC0E1",
+"=X c #BDC3EC",
+"-X c #B7C1F3",
+";X c #BBC5F3",
+":X c #BCD1F2",
+">X c #BBD9F7",
+",X c #A9EAFE",
+"<X c #C7C3D7",
+"1X c #C2C2DB",
+"2X c #CACADD",
+"3X c #C2C3E3",
+"4X c #C4C6E9",
+"5X c #C7C8E6",
+"6X c #C4C8EA",
+"7X c #C9CAE3",
+"8X c #C9CCEB",
+"9X c #C4CBF3",
+"0X c #C5CDF9",
+"qX c #CACEF3",
+"wX c #CFD1EE",
+"eX c #C4D2F5",
+"rX c #C6D1FF",
+"tX c #CBD2F5",
+"yX c #CBD4FA",
+"uX c #CFDCF7",
+"iX c #CED8FE",
+"pX c #D6D4E1",
+"aX c #D2D4ED",
+"sX c #DCDCEB",
+"dX c #D2D6F3",
+"fX c #D0D7F9",
+"gX c #D5DAF5",
+"hX c #D3DBFC",
+"jX c #D9DBF2",
+"kX c #DBDEF9",
+"lX c #CCE6FF",
+"zX c #DFE1EF",
+"xX c #D0E0F7",
+"cX c #DBE2F5",
+"vX c #DBE0F9",
+"bX c #DCEDFE",
+"nX c #E2E2F3",
+"mX c #E2E6FA",
+"MX c #E6E8F4",
+"NX c #E4E9FC",
+"BX c #EAEDFC",
+"VX c #EDF0FD",
+"CX c #F3F6FD",
+"ZX c #F5F8FE",
+"AX c #F9FAFE",
+"SX c None",
+/* pixels */
+"SXSXSXSXSXSXSXSXSXSXSXSXSXSXSXSXSXK I u.s.s.i.u.r SXSXSXSXSXSXSX",
+"SXSXSXSXSXSXSXSXSXSXSXSXSXI d L d.v.K.I.W.*XjX*XR % SXSXSXSXSXSX",
+"SXSXSXSXSXSXSXJ t.g.J.J.R.E.~.3X8XgXNXBXVXbXbXZXf.: SXSXSXSXSXSX",
+"SXSXSXSXSXq R.!.1X*X3X8XfXkXkXvXvXuX>X%X1.&.&.lXK.2 SXSXSXSXSXSX",
+"SXSXSXSXi 7XjXtXtXyXqXtX:X&X Xr.6.-.%.o... ./ 4.<Xt SXSXSXSXSXSX",
+"SXSXSXSXs 2XhXyX].#X%XXXr.q.6.7.5.-.*.o... .) <.pXa SXSXSXSXSXSX",
+"SXSXSXSXi 1XhX0X at X,XOX}.e.0.9.7.5.-.%.o... .W @.zXD SXSXSXSXSXSX",
+"SXSXSXSX9 !.kXyX at X+X|.}.q.9.7.7.5.=.*.o... .W ] zXK SXSXSXSXSXSX",
+"SXSXSXSXSXt.aXiXY.XX}.e.0.9.7.5.5.=.o.o...` x m cXU SXSXSXSXSXSX",
+"SXSXSXSXSX0 5XhX/.{.e.w.9.9.6.5.-.=.o.o.| Q x l uXp.  SXSXSXSXSX",
+"SXSXSXSXSX; E.tX=X[.w.0.9.7.5.:.=.%.o.| Q Q x h $XJ.. SXSXSXSXSX",
+"SXSXSXSXSXSXH.gX9XC.9.8.7.5.5.-.%.o.| ( Q Q z h Z.E.o SXSXSXSXSX",
+"SXSXSXSXSXSXd.7XiXD.7.7.5.5.-.%...` ( ( W x l h >.8X& SXSXSXSXSX",
+"SXSXSXSXSXSXI E.hX(.6.5.5.-.o. .` ` ( Q b x l h O.jX: SXSXSXSXSX",
+"SXSXSXSXSXSX7 H.tX=X<.-.=.o. .| ` ( ! W x l j g [ NX8   SXSXSXSX",
+"SXSXSXSXSXSX- f.tXqX,.=.o...' ' ) ^ ! x v j g f O.VXa   SXSXSXSX",
+"SXSXSXSXSXSXSXK 6XgX3.%. . .) ) ~ Q b z k j [ 3.VXzXw   SXSXSXSX",
+"SXSXSXSXSXSXSX: E.gXS.X.' ) ) / W W c v O.F.NXmXE.H #   SXSXSXSX",
+"SXSXSXSXSXSXSXSXs.qX). at .) / ~ W b { 2.eXBXaXz.G *   SXSXSXSXSXSX",
+"SXSXSXSXSXSXSXSXu.=X;X$./ W n { 3.eXcX8Xa.S < O   SXSXSXSXSXSXSX",
+"SXSXSXSXSXSXSXSXR W.fXA.} #._.gXdX].E 5 @ X SXSXSXSXSXSXSXSXSXSX",
+"SXSXSXSXSXSXSXSXS G.hXtX;XyX6XT.U.=Xl.l.l.T 3 # SXSXSXSXSXSXSXSX",
+"SXSXSXSXSXSXSXSX+ H P.=X].I.4XvXhXiXm.U./.(.-XN.T B o SXSXSXSXSX",
+"SXSXSXSXSXSXSXSX@ I 3XQ.b.jXVXNXhXiXm.P.^.U.;X0X;Xj.$ SXSXSXSXSX",
+"SXSXSXSXSXSXSXSXh.MXCXCX!.7XBXgX`.x.x./.`.;X;XA.Y N o SXSXSXSXSX",
+"SXSXSXSXSXSXSX% 2XCXBXBXwXb.W.c.M.`.=X0X;X^.Y u > o   SXSXSXSXSX",
+"SXSXSXSXSXSXSX5 MXAXVXVXBXNX6XgXkXhX=Xm.Z 6 o   SXSXSXSXSXSXSXSX",
+"SXSXSXSXSXSXSX3 jXAXCXCXBXBXNXNX9XM.G y = o SXSXSXSXSXSXSXSXSXSX",
+"SXSXSXSXSXSXSXX H.VXCXVXVXmX4Xz.C 4     SXSXSXSXSXSXSXSXSXSXSXSX",
+"SXSXSXSXSXSXSXSXF !.CXVX8Xz.C e & . SXSXSXSXSXSXSXSXSXSXSXSXSXSX",
+"SXSXSXSXSXSXSXSXo V z.a.C <   SXSXSXSXSXSXSXSXSXSXSXSXSXSXSXSXSX",
+"SXSXSXSXSXSXSXSXSX@ e 5 O   SXSXSXSXSXSXSXSXSXSXSXSXSXSXSXSXSXSX"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/krfb-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/krfb-16.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/krfb-16.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,241 @@
+/* XPM */
+static char *krfb-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 219 2",
+"   c #000000",
+".  c #000001",
+"X  c #000002",
+"o  c #010102",
+"O  c #010103",
+"+  c #020202",
+"@  c #020203",
+"#  c #050707",
+"$  c #07060A",
+"%  c #04090D",
+"&  c #0B0B0C",
+"*  c #090912",
+"=  c #0A0A11",
+"-  c #0A0A12",
+";  c #080D12",
+":  c #0C0B10",
+">  c #0C0C12",
+",  c #0F0F11",
+"<  c #0C0C16",
+"1  c #0F0E14",
+"2  c #0C151C",
+"3  c #101010",
+"4  c #111013",
+"5  c #111313",
+"6  c #131317",
+"7  c #141B1F",
+"8  c #161520",
+"9  c #171829",
+"0  c #191721",
+"q  c #1E1E24",
+"w  c #102338",
+"e  c #282734",
+"r  c #303037",
+"t  c #293642",
+"y  c #233550",
+"u  c #263C54",
+"i  c #302F40",
+"p  c #3E3E4A",
+"a  c #3F3F4D",
+"s  c #353751",
+"d  c #3D3D56",
+"f  c #383959",
+"g  c #3A3B58",
+"h  c #3D3F64",
+"j  c #374148",
+"k  c #234878",
+"l  c #254B7A",
+"z  c #494952",
+"x  c #555566",
+"c  c #56556C",
+"v  c #555570",
+"b  c #61626E",
+"n  c #2A6ADF",
+"m  c #3069DF",
+"M  c #3A6DD4",
+"N  c #306FE3",
+"B  c #337BE9",
+"V  c #446D9D",
+"C  c #5E6186",
+"Z  c #567C9B",
+"A  c #4F79A9",
+"S  c #6D6C85",
+"D  c #686C92",
+"F  c #657E86",
+"G  c #7579A9",
+"H  c #7C7FAB",
+"J  c #1C930C",
+"K  c #1B9803",
+"L  c #1B9C00",
+"P  c #24A600",
+"I  c #25A008",
+"U  c #26AB00",
+"Y  c #26AE00",
+"T  c #2AAE00",
+"R  c #2CA611",
+"E  c #30A911",
+"W  c #30B600",
+"Q  c #31BA00",
+"!  c #36BA00",
+"~  c #32AE37",
+"^  c #3DC300",
+"/  c #3DC700",
+"(  c #3EC705",
+")  c #42B61E",
+"_  c #54AE4B",
+"`  c #4BBA76",
+"'  c #68B863",
+"]  c #7CAB7F",
+"[  c #77B177",
+"{  c #40C500",
+"}  c #4BD000",
+"|  c #4FD400",
+" . c #51D700",
+".. c #56D709",
+"X. c #50D800",
+"o. c #53C02F",
+"O. c #5BE000",
+"+. c #5FE500",
+"@. c #61E600",
+"#. c #60E409",
+"$. c #6AEF00",
+"%. c #6FE61B",
+"&. c #6DF400",
+"*. c #6EF600",
+"=. c #78FC04",
+"-. c #7DF21D",
+";. c #6ED270",
+":. c #338F84",
+">. c #7E8290",
+",. c #788E9B",
+"<. c #658AA3",
+"1. c #628FBA",
+"2. c #7B80B2",
+"3. c #4096DF",
+"4. c #458CEE",
+"5. c #4B80E4",
+"6. c #4C95ED",
+"7. c #5899EE",
+"8. c #55A2F9",
+"9. c #58ACFE",
+"0. c #5AADFE",
+"q. c #6495E1",
+"w. c #639BEE",
+"e. c #67B6F1",
+"r. c #63B3FF",
+"t. c #76C1FF",
+"y. c #82FE10",
+"u. c #8BFA27",
+"i. c #87F037",
+"p. c #9CFA46",
+"a. c #A1EB6D",
+"s. c #899498",
+"d. c #8A9B98",
+"f. c #8283A6",
+"g. c #8B8CA2",
+"h. c #8F9AB9",
+"j. c #9098AB",
+"k. c #9291B1",
+"l. c #83A48C",
+"z. c #86BB89",
+"x. c #90BD98",
+"c. c #9CA4B1",
+"v. c #97BAA7",
+"b. c #9699C7",
+"n. c #80A9DB",
+"m. c #8CBCE7",
+"M. c #87B5F2",
+"N. c #81BDF6",
+"B. c #85BEF8",
+"V. c #8CB3F5",
+"C. c #8EB9F1",
+"Z. c #91B3ED",
+"A. c #92BFF5",
+"S. c #9DBFF1",
+"D. c #A3A4C0",
+"F. c #A8A8C6",
+"G. c #A5ABDE",
+"H. c #A6ADDF",
+"J. c #AAB0C6",
+"K. c #B5B5D3",
+"L. c #BDBDD9",
+"P. c #A0B6EA",
+"I. c #AAB3E2",
+"U. c #AFB5E3",
+"Y. c #ACB5E7",
+"T. c #B5B9E2",
+"R. c #B8BDE3",
+"E. c #99D982",
+"W. c #A4DA98",
+"Q. c #AFDBA4",
+"!. c #B3D6B6",
+"~. c #B3D5BA",
+"^. c #B7E0AB",
+"/. c #9EC3D6",
+"(. c #83C7FF",
+"). c #85C8FA",
+"_. c #90C5F1",
+"`. c #93D3FF",
+"'. c #95D3FF",
+"]. c #94D5FF",
+"[. c #B4CFCF",
+"{. c #BBC6D0",
+"}. c #A0C8EA",
+"|. c #A4CCE9",
+" X c #A1CCF2",
+".X c #A5CCFB",
+"XX c #A9CAF1",
+"oX c #A5D2F7",
+"OX c #A4D3FB",
+"+X c #BAC2E1",
+"@X c #BBC4E6",
+"#X c #BCC0E1",
+"$X c #B5D5F7",
+"%X c #B4DFFC",
+"&X c #ABE2FF",
+"*X c #B0E1F8",
+"=X c #BCE6FF",
+"-X c #BBECFF",
+";X c #C1D7CB",
+":X c #CCCFED",
+">X c #C2D1E2",
+",X c #CAD1F7",
+"<X c #CFD6F5",
+"1X c #C7EDFE",
+"2X c #C8ECFF",
+"3X c #CAECFE",
+"4X c #CBEEFE",
+"5X c #C4F1FE",
+"6X c #D0F0FE",
+"7X c #D5F2FF",
+"8X c #D7F3FF",
+"9X c #D6F8FF",
+"0X c #DCF5FF",
+"qX c #DDF7FF",
+"wX c #E6F8FF",
+"eX c #EBFAFF",
+"rX c #EAFEFF",
+"tX c #EFFAFE",
+"yX c None",
+/* pixels */
+"yXyXyXyXyXyX& 6 q z S k.K.L.v yX",
+"yXyXyXyX3 b g.D.F.{.;XQ.E.W.>.$ ",
+"yXyXyXyXz :X>X^.a.i.%...{ o.s.> ",
+"yXyXyXyXr #X!.p.=.*. at . .^ ) d.1 ",
+"yXyXyXyX5 F.~.u.=.&...} ! E l.0 ",
+"yXyX# 0 t h.[.-.*. at . .^ T I ,.e ",
+"yX3 F /.|. X_.;.#. .{ W P K ;.p ",
+"3 ,.*X9XrX5X`.e.` ( ! T K K z.x ",
+"j m.3XwXqX-X'.r.3.~ T R _ x.c.t ",
+"<.N.6X7X&X'.t.9.B :.' v.j.v 7 + ",
+"1.6.).4X=X(.9.8.N q. at Xb.D s : @ ",
+"A n 7.*X4XB.4.w.m V.,XG.I.Y.G 9 ",
+"u M A.3X0X$XC.M.5.P.T.U.H.H h < ",
+"; V oX7XtXeX6XOX.X<XR.H f < O yX",
+"yX2 Z n.Z.S.}.XX+Xf.g -   yXyXyX",
+"yXyX% w k l y C d - O yXyXyXyXyX"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/krfb.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/krfb.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/krfb.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *krfb[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #000000",
+".  c #05060C",
+"X  c #04090C",
+"o  c #08080E",
+"O  c #0C0D15",
+"+  c #0E100F",
+"@  c #10151B",
+"#  c #121422",
+"$  c #18182E",
+"%  c #191B25",
+"&  c #1D1D33",
+"*  c #212125",
+"=  c #242436",
+"-  c #323238",
+";  c #1D3D5C",
+":  c #29284E",
+">  c #2F3F46",
+",  c #353556",
+"<  c #353549",
+"1  c #3C3C69",
+"2  c #1C4A7B",
+"3  c #38494D",
+"4  c #2B4D68",
+"5  c #43443F",
+"6  c #444456",
+"7  c #475357",
+"8  c #52525D",
+"9  c #444477",
+"0  c #565669",
+"q  c #545376",
+"w  c #4E5C6D",
+"e  c #5A767F",
+"r  c #667675",
+"t  c #0D43D2",
+"y  c #1346D2",
+"u  c #1C58DA",
+"i  c #2257DC",
+"p  c #236ECE",
+"a  c #2F60DB",
+"s  c #366CDE",
+"d  c #397FCB",
+"f  c #296CE3",
+"g  c #2B71EF",
+"h  c #356CE1",
+"j  c #3676E4",
+"k  c #5E5E95",
+"l  c #5D7881",
+"z  c #4A7DAA",
+"x  c #666687",
+"c  c #63639A",
+"v  c #77779A",
+"b  c #637B80",
+"n  c #696BA7",
+"m  c #7575AA",
+"M  c #4679E2",
+"N  c #128E00",
+"B  c #1A9A00",
+"V  c #179402",
+"C  c #098600",
+"Z  c #1DA100",
+"A  c #209F00",
+"S  c #389C34",
+"D  c #259025",
+"F  c #23A400",
+"G  c #25A800",
+"H  c #28AD00",
+"J  c #2DB300",
+"K  c #31A910",
+"L  c #30B600",
+"P  c #32BA00",
+"I  c #3BBF00",
+"U  c #29AE19",
+"Y  c #30A620",
+"T  c #3CBE28",
+"R  c #3CA851",
+"E  c #3AAB77",
+"W  c #36C000",
+"Q  c #3CC300",
+"!  c #3EC800",
+"~  c #41BC1B",
+"^  c #4AB331",
+"/  c #469F45",
+"(  c #4EB14F",
+")  c #50BF7A",
+"_  c #6AB95D",
+"`  c #74B773",
+"'  c #44CB00",
+"]  c #49CE00",
+"[  c #41C500",
+"{  c #4DD200",
+"}  c #51D600",
+"|  c #53D900",
+" . c #59DE00",
+".. c #50D60F",
+"X. c #56C82A",
+"o. c #5CE200",
+"O. c #6AD139",
+"+. c #61E600",
+"@. c #64EA00",
+"#. c #69EE00",
+"$. c #6CF200",
+"%. c #74FA00",
+"&. c #7AFE04",
+"*. c #7FFF0A",
+"=. c #70F500",
+"-. c #73ED13",
+";. c #6BD35D",
+":. c #2B83B3",
+">. c #3F83C9",
+",. c #3C86EB",
+"<. c #3F92EC",
+"1. c #5887AF",
+"2. c #76949C",
+"3. c #478DDA",
+"4. c #5C96DA",
+"5. c #4488EA",
+"6. c #408EF2",
+"7. c #4F93EF",
+"8. c #4C98F4",
+"9. c #5694EA",
+"0. c #569BF3",
+"q. c #5983E4",
+"w. c #4DA2F8",
+"e. c #54AAFE",
+"r. c #5AADFE",
+"t. c #5DA7FF",
+"y. c #5EB0FF",
+"u. c #629ECF",
+"i. c #609CD3",
+"p. c #6794E9",
+"a. c #65B3D7",
+"s. c #6BA2EC",
+"d. c #69A3E5",
+"f. c #65B5FF",
+"g. c #6DBBFF",
+"h. c #73A9EA",
+"j. c #75AAF1",
+"k. c #74BEFF",
+"l. c #77B7F9",
+"z. c #61A5F7",
+"x. c #78C5FE",
+"c. c #807F90",
+"v. c #83FE12",
+"b. c #8AFF1D",
+"n. c #81EC30",
+"m. c #8AFF20",
+"M. c #96FF36",
+"N. c #8FF632",
+"B. c #84DA55",
+"V. c #A1FF4B",
+"C. c #A9FF5A",
+"Z. c #A1EE60",
+"A. c #8DDF63",
+"S. c #87879B",
+"D. c #8B8BB4",
+"F. c #878AB9",
+"G. c #9D9DB4",
+"H. c #8B8AAB",
+"J. c #83BB8A",
+"K. c #89A8AC",
+"L. c #A4A4BD",
+"P. c #A1B7BF",
+"I. c #9C9CC1",
+"U. c #9496C8",
+"Y. c #999ED3",
+"T. c #979AD0",
+"R. c #8F94D9",
+"E. c #9CA1D7",
+"W. c #8FB8D1",
+"Q. c #8AA7E1",
+"!. c #85B8F5",
+"~. c #91B3F6",
+"^. c #A6A5C9",
+"/. c #A1A2D0",
+"(. c #A7ACD8",
+"). c #ACB1DA",
+"_. c #B5B8D8",
+"`. c #ACBAC2",
+"'. c #A5ABE1",
+"]. c #AAB3E2",
+"[. c #B5BBE4",
+"{. c #B5BBE9",
+"}. c #8FC38F",
+"|. c #97CF86",
+" X c #9AC7A0",
+".X c #A4D592",
+"XX c #B7D0BF",
+"oX c #AECCB6",
+"OX c #A8E483",
+"+X c #B1E889",
+"@X c #86CAFE",
+"#X c #89CCFF",
+"$X c #87C0F8",
+"%X c #81D2FE",
+"&X c #99C6E2",
+"*X c #98C3F5",
+"=X c #9ACAFA",
+"-X c #92C6FB",
+";X c #93D3FE",
+":X c #9DDBFF",
+">X c #97D8FF",
+",X c #8CC4EB",
+"<X c #BFC0DA",
+"1X c #BAD5C7",
+"2X c #A3D3FB",
+"3X c #A3DCFF",
+"4X c #AADBFD",
+"5X c #A6D4F4",
+"6X c #BDC3EE",
+"7X c #BAC3F3",
+"8X c #B5C0F1",
+"9X c #B2DCFC",
+"0X c #B9D7F9",
+"qX c #A8CCEC",
+"wX c #ADE4FF",
+"eX c #B4E3FE",
+"rX c #BBE4FD",
+"tX c #BDECFE",
+"yX c #B5EAFF",
+"uX c #C0C7DE",
+"iX c #C5C8E7",
+"pX c #C5CDF6",
+"aX c #C9D0ED",
+"sX c #CCD5FC",
+"dX c #CFD8FE",
+"fX c #C6D2FF",
+"gX c #D6D8E9",
+"hX c #D2D5F3",
+"jX c #D6D8F3",
+"kX c #D3DAFB",
+"lX c #DADDFB",
+"zX c #D7D9F3",
+"xX c #CCE6C8",
+"cX c #D9E9D9",
+"vX c #C3EAFE",
+"bX c #CAEDFE",
+"nX c #C3E5FC",
+"mX c #C4F5FF",
+"MX c #CAF6FF",
+"NX c #CDFAFF",
+"BX c #D3E3FC",
+"VX c #DCE2FD",
+"CX c #DDE4F6",
+"ZX c #D4F2FE",
+"AX c #DAF4FE",
+"SX c #D5FDFF",
+"DX c #E1EDE3",
+"FX c #E0E6EE",
+"GX c #E4ECFE",
+"HX c #E5E8F8",
+"JX c #E2F6FE",
+"KX c #E5F8FF",
+"LX c #EBFBFF",
+"PX c #F2FCFF",
+"IX c #F5F8FC",
+"UX c #EFF9EB",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX% = 6 v H.H.I.I.x O YXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXO 6 x L.I.^.).iXgXCXzXD.< YXYX",
+"YXYXYXYXYXYXYXYXYXYX* - 8 S.L.G.L._.uXaXsXzXHXHXDXcXxXUX<X6 YXYX",
+"YXYXYXYXYXYXYXYXYXYXG._._.uXaXhXhXzXlXlXgXxXOXB.O.X.~ A.gXq YXYX",
+"YXYXYXYXYXYXYXYXYXS.gXhXsXsXaXuXXX.XZ.-.-.o.| { [ [ P ^ gXx YXYX",
+"YXYXYXYXYXYXYXYXYX^.HXdX6XoX+XZ.N.v.%.=. at .o.| { ' Q P ^ FXv YXYX",
+"YXYXYXYXYXYXYXYXYX0 jXdX_.+XC.M.b.v.%.#. at .o...{ [ [ L K FXv YXYX",
+"YXYXYXYXYXYXYXYXYX* <XsX{.Z.V.M.v.v.%.#. at .o.| { [ I H A cXH.  YX",
+"YXYXYXYXYXYXYXYXYXYXL.kX7X|.M.b.*.&.=.#.+. .} ] [ I G B oXI.  YX",
+"YXYXYXYXYXYXYXYXYXYXG.zXpX Xb.v.&.%.#. at .o. .{ ' I H A B |._.O YX",
+"YXYXYXYXYXYXYXYXYXYXH.iXdXoX&.&.=.$.#.+. .} ' Q L H A B _ iX% YX",
+"YXYXYXYXYXYXYX@ 3 3 w _.kX[.-.%.$.#.+.o.| { ! P H H A B ( gX= YX",
+"YXYXYXYX+ 2.W.&X;Xl.!.l.$X~.;.$.#.+.o.| ' ! P J H F B V ^ DX, YX",
+"YXYXYXYXK.5XrXZXbXbXAXrX;X$Xa.;.+.o.| ' ! W L J G F B N S cX0   ",
+"YXYX7 P.vXyXmXSXLXLXNXyX:X#Xx.t.) ..' ! W P H H F B N N D xXc.. ",
+"YXYXP.0X:XwXMXLXPXPXNXtX:X#Xg.y.<.( ! W P L H F A B N C / DXH.. ",
+"YX5 qXx.9XZXLXLXLXLXMXyX3X;Xk.r.w.<.T W J H G Z V V S }.IXHXx   ",
+"YXr j. at XAXJXJXLXKXNXtXeX4X#Xf.e.w.g E J H F Z B (  XDXHX^.v &   ",
+"3 &X8.4XZXAXJXZXwXwX:X>X at Xx.r.e.w.u :.U F Y ` 1XHXiXU.k $ . YXYX",
+"r ,X7.2XZXZXAXMX>X>X;X at Xx.f.r.e.w.t p R J.1XlXiXF.x : @   YXYXYX",
+"r h.,.w.%XtXSXZXrX3X#Xg.f.e.e.t.j u f 2XhX).U.q = & o YXYXYXYXYX",
+"l d.j 5.w.x.vXZXZXZX4Xf.e.e.e.t.g y ,.Q.{.6X].U.].Y.m , YXYXYXYX",
+"e d.p g ,.8.4XvXbXbX9Xr.w.<.9.j.h 5.0.0XlXkX{.T.].].7X{.F.n $ YX",
+"3 d.y u j s.9XrXvXbXeX7.f h !.j.t u 9.kXlXkX'.R.].E.8XfX7XR.: YX",
+"YX1.i t !.9XnXMXZXZXZXp.s ~.*Xh.y y *XVX[.T.U.).8X7X7XE.n 9 # . ",
+"YX3 9.a 2X0XbXZXJXLXJXnX0XvX*X!.s.7.Q./.Y.].iXpX7X'.n 9 : O   YX",
+"YXYX1.5.*XrXZXAXLXPXLXKXAXbX9X5X!.=XjXhXVXlX7XY.c 1 @   YXYXYXYX",
+"YXYX4 i.2XrXZXJXIXPXPXLXAXmX9X=X!.kXGXGXhX'.n 9 &   YXYXYXYXYXYX",
+"YXYXYX. u.5XrX0XBXKXAXCXAXbX:X~.JXGXaX/.n 1     YXYXYXYXYXYXYXYX",
+"YXYXYXYX; z 4.j s q.M p.=X,X~.GXjX/.c 9 & o YXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXO 4 >.5.3.>.2 # c.U.k <   YXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXX X X X   YX, 1 # . YXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/ksirc-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/ksirc-16.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/ksirc-16.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,184 @@
+/* XPM */
+static char *ksirc-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 162 2",
+"   c black",
+".  c #000001",
+"X  c #010000",
+"o  c #000002",
+"O  c #000003",
+"+  c #000004",
+"@  c #000005",
+"#  c #000104",
+"$  c #000006",
+"%  c #050000",
+"&  c #000008",
+"*  c #000009",
+"=  c #000108",
+"-  c #00000A",
+";  c #00000B",
+":  c #00000E",
+">  c #00010F",
+",  c #00020F",
+"<  c #0E0000",
+"1  c #0F0000",
+"2  c #0A0800",
+"3  c #000010",
+"4  c #000011",
+"5  c #000110",
+"6  c #000013",
+"7  c #000310",
+"8  c #000311",
+"9  c #010210",
+"0  c #000016",
+"q  c #000214",
+"w  c #000215",
+"e  c #000314",
+"r  c #000316",
+"t  c #010415",
+"y  c #010417",
+"u  c #000019",
+"i  c #00031A",
+"p  c #00031B",
+"a  c #00001C",
+"s  c #01041A",
+"d  c #01051B",
+"f  c #01051F",
+"g  c #00100F",
+"h  c #0C1915",
+"j  c #110000",
+"k  c #120000",
+"l  c #130000",
+"z  c #140000",
+"x  c #150000",
+"c  c #190000",
+"v  c #1A0000",
+"b  c #1B0000",
+"n  c #1D0000",
+"m  c #161615",
+"M  c #000020",
+"N  c #000121",
+"B  c #000130",
+"V  c #000436",
+"C  c #000038",
+"Z  c #00003B",
+"A  c #00053E",
+"S  c #030A36",
+"D  c #040933",
+"F  c #040A34",
+"G  c #050B37",
+"H  c #030B3A",
+"J  c #040A39",
+"K  c #040B3B",
+"L  c #050C3C",
+"P  c #040C3F",
+"I  c #0B1034",
+"U  c #0E2625",
+"Y  c #2F0000",
+"T  c #2F0302",
+"R  c #360000",
+"E  c #252209",
+"W  c #282619",
+"Q  c #282822",
+"!  c #292925",
+"~  c #2E2D2F",
+"^  c #31312C",
+"/  c #000544",
+"(  c #000048",
+")  c #050C40",
+"_  c #060D42",
+"`  c #050E45",
+"'  c #040E53",
+"]  c #060F54",
+"[  c #08125F",
+"{  c #030D62",
+"}  c #000970",
+"|  c #0E1A7A",
+" . c #101A77",
+".. c #22274F",
+"X. c #292F54",
+"o. c #420000",
+"O. c #430000",
+"+. c #550000",
+"@. c #5B0000",
+"#. c #5C0100",
+"$. c #660000",
+"%. c #740A0A",
+"&. c #424138",
+"*. c #4D4A31",
+"=. c #4C4B42",
+"-. c #55574F",
+";. c #5E5B4C",
+":. c #646151",
+">. c #6D6E6B",
+",. c #72726D",
+"<. c #747573",
+"1. c #7E7E7B",
+"2. c #0A1683",
+"3. c #06149D",
+"4. c #0D1B92",
+"5. c #0E1D9B",
+"6. c #131E83",
+"7. c #141F81",
+"8. c #0B1CA5",
+"9. c #1D2A88",
+"0. c #12209B",
+"q. c #1B299A",
+"w. c #1B29AA",
+"e. c #182ABD",
+"r. c #232D83",
+"t. c #263190",
+"y. c #283599",
+"u. c #2537A2",
+"i. c #2432BA",
+"p. c #1627C7",
+"a. c #192CC7",
+"s. c #2636D5",
+"d. c #2C3DD4",
+"f. c #36409E",
+"g. c #3443CC",
+"h. c #424DB3",
+"j. c #515AA4",
+"k. c #6F76B7",
+"l. c #727BBE",
+"z. c #4957D6",
+"x. c #505DD4",
+"c. c #5E6BD8",
+"v. c #5962E0",
+"b. c #5F6AE8",
+"n. c #616DC7",
+"m. c #6C79FF",
+"M. c #DB2727",
+"N. c #FF2424",
+"B. c #FB5B5B",
+"V. c #FA6464",
+"C. c #FF7272",
+"Z. c #FF7C7C",
+"A. c #8E8C75",
+"S. c #868682",
+"D. c #868683",
+"F. c #8D8D8C",
+"G. c #9C9A80",
+"H. c #959593",
+"J. c #FF8B8B",
+"K. c #FFB3B3",
+"L. c gray100",
+"P. c None",
+/* pixels */
+"P.P.P.P.P.P.l $.Y P.P.P.P.P.P.P.",
+"P.P.P.P.P.% B.J.N.R P.P.P.P.P.P.",
+"P.P.P.P.P.o.Z.K.J.%.P.P.P.P.P.P.",
+"P.P.P.P.P.o M.C.V.Y P.P.P.P.P.P.",
+"P.P.P.P.P.P.o o.v P.P.P.P.P.P.P.",
+"P.P.P.P.P.P.h U g o P.P.P.P.P.P.",
+"P.P.P.P.P.6 -.<.>.m B H F G , P.",
+"P.P.@ r.b.4.^ ,.S.~ { | 9. .f P.",
+"P.o w.v.q.V &.1.F.! o P.P.P.D o ",
+"P./ e.3.a o =.S.H.Q P.P.P.5.0.o ",
+"P.A 8.p.Z P.*.A.A.E P.[ a.2.o P.",
+"P.o } i.m.h.j.k.l.f.g.s.' o P.P.",
+"P.P.; ( 9.n.c.x.z.g.| 6 P.P.P.P.",
+"P.P.P.P.o o I ..X., o P.P.P.P.P.",
+"P.P.P.P.P.P.W :.;.2 P.P.P.P.P.P.",
+"P.P.P.P.P.P.o o o o P.P.P.P.P.P."
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/ksirc.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/ksirc.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/ksirc.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,207 @@
+/* XPM */
+static char *ksirc[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 169 2",
+"   c #000000",
+".  c #00010B",
+"X  c #0A0000",
+"o  c #08080B",
+"O  c #000211",
+"+  c #00021A",
+"@  c #0B0C17",
+"#  c #120000",
+"$  c #1B1B1B",
+"%  c #000424",
+"&  c #00032B",
+"*  c #000633",
+"=  c #00053A",
+"-  c #310000",
+";  c #3F0303",
+":  c #232322",
+">  c #2B2B2A",
+",  c #2D2F3E",
+"<  c #363636",
+"1  c #393835",
+"2  c #3C3C3C",
+"3  c #000643",
+"4  c #000844",
+"5  c #020B4B",
+"6  c #080F47",
+"7  c #000655",
+"8  c #010B54",
+"9  c #000B5B",
+"0  c #061055",
+"q  c #061059",
+"w  c #081254",
+"e  c #09135C",
+"r  c #000264",
+"t  c #000B64",
+"y  c #010C6C",
+"u  c #000770",
+"i  c #000D71",
+"p  c #000D79",
+"a  c #0B1564",
+"s  c #051173",
+"d  c #00107A",
+"f  c #081573",
+"g  c #09167B",
+"h  c #0E1B74",
+"j  c #0D1879",
+"k  c #121F7B",
+"l  c #162278",
+"z  c #1F2B7E",
+"x  c #3D404B",
+"c  c #4B0000",
+"v  c #560000",
+"b  c #590000",
+"n  c #740606",
+"m  c #7F0000",
+"M  c #444443",
+"N  c #484847",
+"B  c #4C4C4C",
+"V  c #4F5051",
+"C  c #535353",
+"Z  c #595857",
+"A  c #5B5B5B",
+"S  c #5B5C63",
+"D  c #646463",
+"F  c #686867",
+"G  c #6B6B6C",
+"H  c #737373",
+"J  c #7B7B7B",
+"K  c #000D81",
+"L  c #01128B",
+"P  c #09188F",
+"I  c #031490",
+"U  c #071896",
+"Y  c #07189C",
+"T  c #101C83",
+"R  c #111D88",
+"E  c #111D93",
+"W  c #0216A0",
+"Q  c #0C1DA3",
+"!  c #182388",
+"~  c #132192",
+"^  c #152198",
+"/  c #1A2695",
+"(  c #19249C",
+")  c #1C299E",
+"_  c #1624A1",
+"`  c #1B27A3",
+"'  c #1C2AAC",
+"]  c #1023B4",
+"[  c #1629BB",
+"{  c #1C2AB2",
+"}  c #222D80",
+"|  c #253199",
+" . c #222DAC",
+".. c #202EB4",
+"X. c #2832A4",
+"o. c #2330B4",
+"O. c #373EAD",
+"+. c #343FBD",
+"@. c #1729C1",
+"#. c #2F3EC0",
+"$. c #2B3BCA",
+"%. c #3D47AA",
+"&. c #3241BF",
+"*. c #3945BA",
+"=. c #3141C3",
+"-. c #3445D6",
+";. c #3443DD",
+":. c #3E4EE6",
+">. c #46509A",
+",. c #4950B7",
+"<. c #4C54C5",
+"1. c #4850CD",
+"2. c #4853DF",
+"3. c #4E58D5",
+"4. c #555EC7",
+"5. c #595EC3",
+"6. c #4E5DEB",
+"7. c #545FF4",
+"8. c #6E73D0",
+"9. c #7179E1",
+"0. c #7C81DB",
+"q. c #7E82E0",
+"w. c #7A82E9",
+"e. c #7F8AFF",
+"r. c #820505",
+"t. c #8C0404",
+"y. c #8C1A1A",
+"u. c #960000",
+"i. c #900808",
+"p. c #9F0000",
+"a. c #A20303",
+"s. c #A61111",
+"d. c #BD0404",
+"f. c #A52626",
+"g. c #D42323",
+"h. c #D32A2A",
+"j. c #DF2323",
+"k. c #EC3E3E",
+"l. c #F02B2B",
+"z. c #F43737",
+"x. c #CE4B4B",
+"c. c #DE4444",
+"v. c #DF5151",
+"b. c #D96262",
+"n. c #E65151",
+"m. c #F24545",
+"M. c #F44949",
+"N. c #F35757",
+"B. c #F75C5C",
+"V. c #FA5C5C",
+"C. c #EE6E6E",
+"Z. c #FF6666",
+"A. c #FF6D6D",
+"S. c #FF7C7C",
+"D. c #828181",
+"F. c gray61",
+"G. c #8C92C0",
+"H. c #8F98F9",
+"J. c #9BA3FA",
+"K. c #A4A9DB",
+"L. c #A3AAFC",
+"P. c #AFB4EC",
+"I. c #B2B8F9",
+"U. c #FF8484",
+"Y. c #FF9C9C",
+"T. c #FFA8A8",
+"R. c #FFC4C4",
+"E. c gray100",
+"W. c None",
+/* pixels */
+"W.W.W.W.W.W.W.W.W.W.W.W.W.W.X X   W.W.W.W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.W.# r.d.d.a.c   W.W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.X a.z.B.m.j.d.c   W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.b l.R.T.A.V.g.u.# W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.t.m.Y.U.S.S.n.s.-   W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.r.k.Z.S.U.U.C.f.-   W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.c g.N.A.S.U.b.y.#   W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.  r.h.c.n.x.f.;   W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.W.X v i.i.n -     W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.W.W.          W.W.W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.W.      o o     W.W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.W.  Z B 1 2 $     W.W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.  > F.Z C A C $     W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.. & 5 * > C C A F G M o 0 a a e q 0 8 0 =   W.W.",
+"W.W.W.W.W.W.% t ~ *.*.9 : V A F G H B @ ! o.o.{ { o.' ` g + W.W.",
+"W.W.W.W.. 9 _ <.q.0.) 7 : C D G H H B o + & & % & * * % .     W.",
+"W.W.W.. y ' 5.8.%.g p 8 > A D H H J B o                   W.W.W.",
+"W.W.W.5 Y O.,.~ u y 4 . > A G H J J B o   W.W.W.W.W.W.. 8 f + W.",
+"W.W.  d U X.E K y *     1 D G J D.D.V o   W.W.W.W.W.% I o.R +   ",
+"W.W.+ p I ( U L 8   W.  < D H J D.D.V X   W.W.W.W.4 Q ` j =     ",
+"W.W.+ i L ( Q W 9   W.  < D H J D.D.V o   W.W.+ s [ ` i *     W.",
+"W.W.. t p E  .{ W % W.  1 F H J D.D.B     . 9 ] $./ t %     W.W.",
+"W.W.W.= i p E 1.2. at .i * , S F J J J x & y [ ;.&.T 7 +     W.W.W.",
+"W.W.W.+ 9 i i / 9.L.e.6.-.$.#.&.&.=.$.:.7.3.| y 4 .     W.W.W.W.",
+"W.W.W.W.O 5 y y s >.G.K.P.I.L.J.J.H.w.4.| i 7 %     W.W.W.W.W.W.",
+"W.W.W.W.W.  % 4 9 r r y h l l z } k f t 7 * .     W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.  . % & = 6 0 q q 9 e 6 % .     W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.  W.  > M B B C Z :     W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.  $ N C D G Z :     W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.    : < 2 2 > o     W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.W.                  W.W.W.W.W.W.W.W.W.W.W.",
+"W.W.W.W.W.W.W.W.W.W.W.W.W.              W.W.W.W.W.W.W.W.W.W.W.W."
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kwifimanager-16.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kwifimanager-16.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kwifimanager-16.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,100 @@
+/* XPM */
+static char *kwifimanager-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 78 1",
+"  c black",
+". c #000013",
+"X c #050517",
+"o c #0D0D28",
+"O c #000039",
+"+ c #080835",
+"@ c #0B0B3C",
+"# c #191925",
+"$ c #000042",
+"% c #000043",
+"& c #000048",
+"* c #00004A",
+"= c #00004D",
+"- c #0C0C44",
+"; c #000059",
+": c #090954",
+"> c #001153",
+", c #0B0B61",
+"< c #0E0E75",
+"1 c #191972",
+"2 c #23234C",
+"3 c #2D2D42",
+"4 c #2F2F4E",
+"5 c #252574",
+"6 c #393960",
+"7 c #303075",
+"8 c #3D3D75",
+"9 c #42425E",
+"0 c #4C4C66",
+"q c #484875",
+"w c #4E4E7C",
+"e c #525273",
+"r c #606069",
+"t c #000084",
+"y c #00008A",
+"u c #00008B",
+"i c #0000B4",
+"p c #3C3C86",
+"a c #3333B7",
+"s c #0000FA",
+"d c #2323FF",
+"f c #444485",
+"g c #525283",
+"h c #4747A3",
+"j c #4E4EB9",
+"k c #5F5FAA",
+"l c #616184",
+"z c #7B7BA0",
+"x c #4040FF",
+"c c #4747FF",
+"v c #5555FE",
+"b c #6262FF",
+"n c #6767F9",
+"m c #6A6AFF",
+"M c #7878FF",
+"N c #00D306",
+"B c green",
+"V c #828288",
+"C c #9696B3",
+"Z c #8383FF",
+"A c #8E8EFF",
+"S c #9999FF",
+"D c #A4A4FF",
+"F c #A5A5FF",
+"G c #AFAFFF",
+"H c #BABAFF",
+"J c #BBBBFF",
+"K c #C3C3F0",
+"L c #C6C6FF",
+"P c #D1D1FF",
+"I c #DCDCFF",
+"U c #E1E1E2",
+"Y c #ECECEC",
+"T c #E8E8FF",
+"R c #F3F3FF",
+"E c #FEFEFF",
+"W c gray100",
+"Q c None",
+/* pixels */
+"QQQQQQQQQBBQQQQQ",
+"QQQQQQQQBQBBQQQQ",
+"QQQQQQQQBBBBBQQQ",
+"QQQQQQQQQBBBBBQQ",
+" QQQQQQBBQBBBBQQ",
+"$:-+**.QBBBBBBBQ",
+"udcnkw4o$NBBBBBQ",
+"udcmAlV0s>BBBQBB",
+"udcm9YWes;BQBBBB",
+"udchUWTqs;BBBBBB",
+"udcgRIL8s;BBBBQB",
+"tdaCPHF7s;QQQQQQ",
+"2pzLGSZ5s;QQQQQQ",
+"rKHFAMb1s;QQQQQQ",
+"#36fjvx<s;QQQQQQ",
+"QQQQX@,Oi=QQQQQQ"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/icons/kwifimanager.xpm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/icons/kwifimanager.xpm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/icons/kwifimanager.xpm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,250 @@
+/* XPM */
+static char *kwifimanager[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 212 2",
+"   c black",
+".  c #000007",
+"X  c #000009",
+"o  c #00000B",
+"O  c #03030D",
+"+  c #000010",
+"@  c #000012",
+"#  c #030311",
+"$  c #000015",
+"%  c #000017",
+"&  c #000019",
+"*  c #00001C",
+"=  c #00001D",
+"-  c #00001E",
+";  c #080811",
+":  c #000021",
+">  c #000022",
+",  c #000024",
+"<  c #000025",
+"1  c #000026",
+"2  c #000027",
+"3  c #00002A",
+"4  c #00002B",
+"5  c #03032B",
+"6  c #00002C",
+"7  c #00002D",
+"8  c #02022D",
+"9  c #04042B",
+"0  c #070728",
+"q  c #04042E",
+"w  c #06062C",
+"e  c #07072E",
+"r  c #09092E",
+"t  c #0A0A2D",
+"y  c #0D0D2D",
+"u  c #0C0C2E",
+"i  c #0D0D2F",
+"p  c #0F0F2D",
+"a  c #000030",
+"s  c #000034",
+"d  c #000035",
+"f  c #000037",
+"g  c #050533",
+"h  c #000039",
+"j  c #00003A",
+"k  c #00003B",
+"l  c #00003D",
+"z  c #0A0A38",
+"x  c #0A0A3D",
+"c  c #12122A",
+"v  c #11112C",
+"b  c #11112D",
+"n  c #10102E",
+"m  c #13132C",
+"M  c #14142E",
+"N  c #181820",
+"B  c #1B1B20",
+"V  c #191925",
+"C  c #181838",
+"Z  c #252534",
+"A  c #272736",
+"S  c #333334",
+"D  c #000040",
+"F  c #000041",
+"G  c #00004C",
+"H  c #0F0F42",
+"J  c #181841",
+"K  c #191940",
+"L  c #181846",
+"P  c #000066",
+"I  c #0F0F65",
+"U  c #0C0C69",
+"Y  c #000076",
+"T  c #161671",
+"R  c #27274E",
+"E  c #292940",
+"W  c #2C2C42",
+"Q  c #2C2C44",
+"!  c #24245F",
+"~  c #3E3E44",
+"^  c #313152",
+"/  c #323252",
+"(  c #373754",
+")  c #232361",
+"_  c #454553",
+"`  c #535354",
+"'  c #5F5F62",
+"]  c #5C5C70",
+"[  c #79797D",
+"{  c #090988",
+"}  c #1A1ABE",
+"|  c #3A3AB6",
+" . c #0000D3",
+".. c #0000D5",
+"X. c #0000D8",
+"o. c #0000DA",
+"O. c #0000DC",
+"+. c #0000DE",
+"@. c #0F0FD6",
+"#. c #0000E0",
+"$. c #0000E3",
+"%. c #0000E5",
+"&. c #0000E7",
+"*. c #0000E9",
+"=. c #0000EB",
+"-. c #0000EE",
+";. c #0000FA",
+":. c #0808FF",
+">. c #1010F8",
+",. c #1111FF",
+"<. c #1919FF",
+"1. c #2323FF",
+"2. c #2424FF",
+"3. c #2A2AFF",
+"4. c #2F2FFF",
+"5. c #3333F8",
+"6. c #3535FF",
+"7. c #3A3AFF",
+"8. c #3B3BFF",
+"9. c #43439F",
+"0. c #494996",
+"q. c #56569B",
+"w. c #6D6D88",
+"e. c #4343C3",
+"r. c #4040E7",
+"t. c #4040FF",
+"y. c #4444FA",
+"u. c #4646FF",
+"i. c #4747FF",
+"p. c #4B4BFF",
+"a. c #4C4CFF",
+"s. c #5151FF",
+"d. c #5656FF",
+"f. c #5757FF",
+"g. c #5858FF",
+"h. c #5C5CFF",
+"j. c #6060E8",
+"k. c #6F6FE6",
+"l. c #6161FF",
+"z. c #6262FF",
+"x. c #6767FF",
+"c. c #6A6AFF",
+"v. c #6C6CFF",
+"b. c #6D6DFF",
+"n. c #7A7AEF",
+"m. c #7272FF",
+"M. c #7777FF",
+"N. c #7878FF",
+"B. c #7C7CFF",
+"V. c #7D7DFF",
+"C. c #7E7EFF",
+"Z. c green",
+"A. c #97979A",
+"S. c #9898A9",
+"D. c #9797BD",
+"F. c #ACACAC",
+"G. c #9090CE",
+"H. c #9A9ACA",
+"J. c #8383FF",
+"K. c #8888F6",
+"L. c #8888FF",
+"P. c #8989FF",
+"I. c #8E8EFF",
+"U. c #8F8FFF",
+"Y. c #9393FF",
+"T. c #9494FF",
+"R. c #9999FF",
+"E. c #9A9AFF",
+"W. c #9F9FFF",
+"Q. c #AAAAC2",
+"!. c #A6A6DD",
+"~. c #A0A0FF",
+"^. c #A4A4FF",
+"/. c #A5A5FF",
+"(. c #AAAAFF",
+"). c #ABABFF",
+"_. c #AEAEFC",
+"`. c #AFAFFF",
+"'. c #BFBFE4",
+"]. c #B0B0FF",
+"[. c #B5B5FF",
+"{. c #BABAFF",
+"}. c #BBBBFF",
+"|. c #C5C5C6",
+" X c #C2C2E8",
+".X c #C0C0FF",
+"XX c #C1C1FF",
+"oX c #C5C5FF",
+"OX c #C6C6FF",
+"+X c #CBCBFF",
+"@X c #CCCCFF",
+"#X c #D0D0FF",
+"$X c #D1D1FF",
+"%X c #D2D2FF",
+"&X c #D7D7FF",
+"*X c #DFDFF0",
+"=X c #DCDCFF",
+"-X c #DDDDFF",
+";X c #EAEAEA",
+":X c gray92",
+">X c #E2E2FF",
+",X c #E3E3FF",
+"<X c #E8E8FF",
+"1X c #EDEDFF",
+"2X c #EEEEFF",
+"3X c #F3F3FF",
+"4X c GhostWhite",
+"5X c #F9F9FF",
+"6X c #FEFEFE",
+"7X c #FEFEFF",
+"8X c gray100",
+"9X c None",
+/* pixels */
+"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XZ.Z.9X9X9X9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XZ.Z.Z.9X9X9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XZ.Z.Z.Z.9X9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XZ.9X9X9XZ.Z.Z.9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XZ.Z.Z.9X9XZ.Z.Z.Z.9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XZ.Z.Z.9X9XZ.Z.Z.Z.9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XZ.Z.Z.9X9XZ.Z.Z.Z.9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XZ.Z.Z.9X9XZ.Z.Z.9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X9X9X9X9X9XZ.Z.9X9X9XZ.Z.Z.9X9XZ.Z.Z.9X9X9X9X",
+"    9X9X9X9X9X9X9X9X9X9X9X9XZ.Z.Z.Z.9X9X9XZ.Z.Z.9XZ.Z.Z.9X9X9X9X",
+"@ * & 4 k f * o   9X9X9X9X9X9X9XZ.Z.Z.9X9XZ.Z.Z.9X9XZ.Z.Z.9X9X9X",
+"2 -.>.} T H z g a F l F . 9X9X9X9XZ.Z.Z.9X9XZ.Z.Z.9XZ.Z.Z.9X9X9X",
+"2 *.,.1.6.i.g.j.0.R C i q k k k f   Z.Z.Z.9XZ.Z.Z.9X9XZ.Z.Z.9X9X",
+"2 *.,.1.6.i.g.c.B.I.~._.H.] V @ a > % Z.Z.9X9XZ.Z.Z.9XZ.Z.Z.9X9X",
+"2 %.,.1.6.i.g.c.B.I.~.G._ ` F.c ;.;.G Z.Z.Z.9X9XZ.Z.9X9XZ.Z.Z.9X",
+"2 $.,.1.6.i.g.c.B.K.( ' :X8X8Xm ;.;.G 9XZ.Z.9X9XZ.Z.Z.9XZ.Z.Z.9X",
+"> $.,.1.6.i.g.c.k.Z |.8X8X8X3Xc ;.;.G 9XZ.Z.Z.9XZ.Z.Z.9X9XZ.Z.9X",
+"> $.,.1.6.i.g.c.W :X8X8X4X2X,Xi ;.;.G 9XZ.Z.Z.9X9XZ.Z.9X9XZ.Z.Z.",
+"4 O.,.1.6.i.g.9.A.8X8X3X<X-X%Xm ;.;.G 9X9XZ.Z.9X9XZ.Z.9X9XZ.Z.Z.",
+"4 O.,.1.6.i.g.W 8X4X2X,X&X at X.Xp ;.;.G 9X9XZ.Z.9X9XZ.Z.Z.9XZ.Z.Z.",
+"7 o.,.1.6.i.e.[ 3X<X=X at XOX}.`.i ;.;.G 9X9XZ.Z.9X9XZ.Z.Z.9X9XZ.Z.",
+"2 ..,.1.6.i.! *X,X&X at X.X[.).~.i ;.;.G 9X9XZ.9X9X9X9XZ.Z.9X9XZ.Z.",
+"* ..,.1.6.r.^ -X%XOX}.`./.E.Y.t ;.;.G 9X9X9X9X9X9X9X9X9X9X9X9X9X",
+"%  .,.1.5.L  X+X.X[.).~.T.P.B.t ;.;.G 9X9X9X9X9X9X9X9X9X9X9X9X9X",
+"o Y { I C D.OX}._./.E.I.J.N.m.q ;.;.G 9X9X9X9X9X9X9X9X9X9X9X9X9X",
+"S S.Q.'.+X}.[.).~.T.P.B.m.c.h.q ;.;.G 9X9X9X9X9X9X9X9X9X9X9X9X9X",
+"~ -X%XOX}.`./.E.I.J.N.c.z.f.p.9 ;.;.G 9X9X9X9X9X9X9X9X9X9X9X9X9X",
+"B w.!.[.).~.T.J.B.m.c.h.s.i.7.4 ;.;.G 9X9X9X9X9X9X9X9X9X9X9X9X9X",
+"9XN Z W ^ q.n.M.c.z.f.p.t.6.3.7 ;.;.G 9X9X9X9X9X9X9X9X9X9X9X9X9X",
+"9X9X9X9X  ; m K ) | y.7.6.2.<.7 ;.;.G 9X9X9X9X9X9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X  O 0 x U @.:.7 ;.;.G 9X9X9X9X9X9X9X9X9X9X9X9X9X",
+"9X9X9X9X9X9X9X9X9X9X9X9X  2 a @ P P a 9X9X9X9X9X9X9X9X9X9X9X9X9X"
+};

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-dev.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-dev.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-dev.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,75 @@
+debian/tmp/usr/include/kde/kopete/kabcpersistence.h
+debian/tmp/usr/include/kde/kopete/kopete_export.h
+debian/tmp/usr/include/kde/kopete/kopeteaccount.h
+debian/tmp/usr/include/kde/kopete/kopeteaccountmanager.h
+debian/tmp/usr/include/kde/kopete/kopeteaway.h
+debian/tmp/usr/include/kde/kopete/kopeteawayaction.h
+debian/tmp/usr/include/kde/kopete/kopeteawaydialog.h
+debian/tmp/usr/include/kde/kopete/kopeteblacklister.h
+debian/tmp/usr/include/kde/kopete/kopetechatsession.h
+debian/tmp/usr/include/kde/kopete/kopetechatsessionmanager.h
+debian/tmp/usr/include/kde/kopete/kopetecommandhandler.h
+debian/tmp/usr/include/kde/kopete/kopetecontact.h
+debian/tmp/usr/include/kde/kopete/kopetecontactlist.h
+debian/tmp/usr/include/kde/kopete/kopetecontactlistelement.h
+debian/tmp/usr/include/kde/kopete/kopetecontactproperty.h
+debian/tmp/usr/include/kde/kopete/kopeteeventpresentation.h
+debian/tmp/usr/include/kde/kopete/kopeteglobal.h
+debian/tmp/usr/include/kde/kopete/kopetegroup.h
+debian/tmp/usr/include/kde/kopete/kopetemessage.h
+debian/tmp/usr/include/kde/kopete/kopetemessageevent.h
+debian/tmp/usr/include/kde/kopete/kopetemessagehandler.h
+debian/tmp/usr/include/kde/kopete/kopetemessagehandlerchain.h
+debian/tmp/usr/include/kde/kopete/kopetemetacontact.h
+debian/tmp/usr/include/kde/kopete/kopetemimetypehandler.h
+debian/tmp/usr/include/kde/kopete/kopetenotifydataobject.h
+debian/tmp/usr/include/kde/kopete/kopeteonlinestatus.h
+debian/tmp/usr/include/kde/kopete/kopeteonlinestatusmanager.h
+debian/tmp/usr/include/kde/kopete/kopetepassword.h
+debian/tmp/usr/include/kde/kopete/kopetepasswordedaccount.h
+debian/tmp/usr/include/kde/kopete/kopeteplugin.h
+debian/tmp/usr/include/kde/kopete/kopeteprotocol.h
+debian/tmp/usr/include/kde/kopete/kopetesimplemessagehandler.h
+debian/tmp/usr/include/kde/kopete/kopetetask.h
+debian/tmp/usr/include/kde/kopete/kopetetransfermanager.h
+debian/tmp/usr/include/kde/kopete/kopeteuiglobal.h
+debian/tmp/usr/include/kde/kopete/kopeteversion.h
+debian/tmp/usr/include/kde/kopete/kopetexsl.h
+debian/tmp/usr/include/kde/kopete/managedconnectionaccount.h
+debian/tmp/usr/include/kde/kopete/ui/accountselector.h
+debian/tmp/usr/include/kde/kopete/ui/addcontactpage.h
+debian/tmp/usr/include/kde/kopete/ui/addressbookselectordialog.h
+debian/tmp/usr/include/kde/kopete/ui/addressbookselectorwidget.h
+debian/tmp/usr/include/kde/kopete/ui/editaccountwidget.h
+debian/tmp/usr/include/kde/kopete/ui/fileconfirmbase.h
+debian/tmp/usr/include/kde/kopete/ui/kopeteawaydialogbase.h
+debian/tmp/usr/include/kde/kopete/ui/kopetecontactaction.h
+debian/tmp/usr/include/kde/kopete/ui/kopetefileconfirmdialog.h
+debian/tmp/usr/include/kde/kopete/ui/kopetelistview.h
+debian/tmp/usr/include/kde/kopete/ui/kopetelistviewitem.h
+debian/tmp/usr/include/kde/kopete/ui/kopetelistviewsearchline.h
+debian/tmp/usr/include/kde/kopete/ui/kopetepassworddialog.h
+debian/tmp/usr/include/kde/kopete/ui/kopetepasswordwidget.h
+debian/tmp/usr/include/kde/kopete/ui/kopetepasswordwidgetbase.h
+debian/tmp/usr/include/kde/kopete/ui/kopetestdaction.h
+debian/tmp/usr/include/kde/kopete/ui/kopeteview.h
+debian/tmp/usr/include/kde/kopete/ui/kopeteviewplugin.h
+debian/tmp/usr/include/kde/kopete/ui/userinfodialog.h
+debian/tmp/usr/include/kde/rss/article.h
+debian/tmp/usr/include/kde/rss/document.h
+debian/tmp/usr/include/kde/rss/global.h
+debian/tmp/usr/include/kde/rss/image.h
+debian/tmp/usr/include/kde/rss/librss.h
+debian/tmp/usr/include/kde/rss/loader.h
+debian/tmp/usr/include/kde/rss/textinput.h
+debian/tmp/usr/lib/libkdeinit_ksirc.la
+debian/tmp/usr/lib/libkopete.la
+debian/tmp/usr/lib/libkopete.so
+debian/tmp/usr/lib/libkopete_msn_shared.la
+debian/tmp/usr/lib/libkopete_msn_shared.so
+debian/tmp/usr/lib/libkopete_oscar.la
+debian/tmp/usr/lib/libkopete_oscar.so
+debian/tmp/usr/lib/libkopete_videodevice.la
+debian/tmp/usr/lib/libkopete_videodevice.so
+debian/tmp/usr/lib/librss.la
+debian/tmp/usr/lib/librss.so

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+Document: kdenetwork-doc-html-kdict
+Title: KDict Handbook
+Author: Christian Gebauer
+Abstract: KDict is a graphical client for the DICT protocol. It enables you
+ to search through dictionary databases for a word or phrase.
+Section: Apps/Text
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kdict/index.html
+Files: /usr/share/doc/kde/HTML/en/kdict/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,10 @@
+Document: kdenetwork-doc-html-kget
+Title: KGet Handbook
+Author: Jonathan E. Drews
+Abstract: KGet allows you to group and manage downloads.
+Section: Apps/Web
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kget/index.html
+Files: /usr/share/doc/kde/HTML/en/kget/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,10 @@
+Document: kdenetwork-doc-html-knewsticker
+Title: KNewsTicker Handbook
+Author: Frerich Raabe, Jonathan Singer
+Abstract: KNewsTicker is a news ticker applet for the KDE panel.
+Section: Apps/Web
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/knewsticker/index.html
+Files: /usr/share/doc/kde/HTML/en/knewsticker/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,10 @@
+Document: kdenetwork-doc-html-kopete
+Title: Kopete Handbook
+Author: Will Stephenson, Matt Rogers
+Abstract: Kopete is KDE's is multi-protocol instant messenger client.
+Section: Apps/Web
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kopete/index.html
+Files: /usr/share/doc/kde/HTML/en/kopete/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,10 @@
+Document: kdenetwork-doc-html-kpf
+Title: Kpf Handbook
+Author: Rik Hemsley
+Abstract: Kpf allows you to share files over a network.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kpf/index.html
+Files: /usr/share/doc/kde/HTML/en/kpf/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+Document: kdenetwork-doc-html-kppp
+Title: KPPP Handbook
+Author: Lauri Watts
+Abstract: KPPP is a dialer and front end for pppd, allowing for interactive
+ script generation and network setup.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kppp/index.html
+Files: /usr/share/doc/kde/HTML/en/kppp/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,12 @@
+Document: kdenetwork-doc-html-krdc
+Title: Krdc Handbook
+Author: Brad Hards
+Abstract: Krdc is a client application that allows you to view or even control
+ the desktop session on another machine that is running a compatible
+ (VNC) server.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/krdc/index.html
+Files: /usr/share/doc/kde/HTML/en/krdc/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,12 @@
+Document: kdenetwork-doc-html-krfb
+Title: Krfb Handbook
+Author: Brad Hards
+Abstract: Krfb is a server application that allows you to share your current
+ session with a user on another machine, who can use a VNC client to view or
+ even control the desktop.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/krfb/index.html
+Files: /usr/share/doc/kde/HTML/en/krfb/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,10 @@
+Document: kdenetwork-doc-html-ksirc
+Title: KsIRC Handbook
+Author: Andrew Stanley-Jones, Philip Rodrigues
+Abstract: KsIRC is the default KDE IRC client.
+Section: Apps/Web
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ksirc/index.html
+Files: /usr/share/doc/kde/HTML/en/ksirc/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,12 @@
+Document: kdenetwork-doc-html-ktalkd
+Title: Ktalkd Handbook
+Author: David Faure
+Abstract: Ktalkd is an enhanced talk daemon - a program to handle incoming
+ talk requests, announce them and allow you to respond to it using a talk
+ client.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/ktalkd/index.html
+Files: /usr/share/doc/kde/HTML/en/ktalkd/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+Document: kdenetwork-doc-html-kwifimanager
+Title: KWiFiManager Handbook
+Author: Stefan Winter
+Abstract: The KWiFiMananger suite can be used to configure and monitor
+ wireless LAN cards.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/kwifimanager/index.html
+Files: /usr/share/doc/kde/HTML/en/kwifimanager/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+Document: kdenetwork-doc-html-lisa
+Title: Lisa Handbook
+Author: Alexander Neundorf
+Abstract: Lisa is intended to provide a kind of Network Neighborhood, but
+ only relying on the TCP/IP protocol stack.
+Section: Apps/Net
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/lisa/index.html
+Files: /usr/share/doc/kde/HTML/en/lisa/*.html
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-filesharing.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-filesharing.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-filesharing.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,10 @@
+debian/tmp/usr/lib/kde3/fileshare_propsdlgplugin.la
+debian/tmp/usr/lib/kde3/fileshare_propsdlgplugin.so
+debian/tmp/usr/lib/kde3/kcm_fileshare.la
+debian/tmp/usr/lib/kde3/kcm_fileshare.so
+debian/tmp/usr/lib/kde3/libkcm_kcmsambaconf.la
+debian/tmp/usr/lib/kde3/libkcm_kcmsambaconf.so
+debian/tmp/usr/share/applications/kde/fileshare.desktop
+debian/tmp/usr/share/applications/kde/kcmsambaconf.desktop
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kcmsambaconf.png
+debian/tmp/usr/share/services/fileshare_propsdlgplugin.desktop

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-kfile-plugins.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-kfile-plugins.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdenetwork-kfile-plugins.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/kde3/kfile_torrent.la
+debian/tmp/usr/lib/kde3/kfile_torrent.so
+debian/tmp/usr/share/services/kfile_torrent.desktop

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdict.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdict.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdict.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,30 @@
+debian/tmp/usr/bin/kdict
+debian/tmp/usr/lib/kde3/kdict.la
+debian/tmp/usr/lib/kde3/kdict.so
+debian/tmp/usr/lib/kde3/kdict_panelapplet.la
+debian/tmp/usr/lib/kde3/kdict_panelapplet.so
+debian/tmp/usr/lib/libkdeinit_kdict.la
+debian/tmp/usr/lib/libkdeinit_kdict.so
+debian/tmp/usr/share/applications/kde/kdict.desktop
+debian/tmp/usr/share/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png
+debian/tmp/usr/share/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png
+debian/tmp/usr/share/apps/kdict/icons/crystalsvg/22x22/actions/define_clip.png
+debian/tmp/usr/share/apps/kdict/icons/crystalsvg/32x32/actions/define_clip.png
+debian/tmp/usr/share/apps/kdict/kdictui.rc
+debian/tmp/usr/share/apps/kicker/applets/kdictapplet.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kdict/applet.png
+debian/tmp/usr/share/doc/kde/HTML/en/kdict/common
+debian/tmp/usr/share/doc/kde/HTML/en/kdict/conf.png
+debian/tmp/usr/share/doc/kde/HTML/en/kdict/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kdict/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kdict/mainwin.png
+debian/tmp/usr/share/doc/kde/HTML/en/kdict/seteditor.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kdict.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kdict.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kdict.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kdict.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kdict.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kdict.svgz
+
+debian/icons/kdict-16.xpm	/usr/share/pixmaps
+debian/icons/kdict.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kdict.menu
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kdict.menu	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kdict.menu	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+?package(kdict):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KDict"\
+	icon32x32="/usr/share/pixmaps/kdict.xpm"\
+	icon16x16="/usr/share/pixmaps/kdict-16.xpm"\
+	command="/usr/bin/kdict"
+
+# Icon 32x32 kdict/cr32-app-kdict.png kdict.xpm
+# Icon 16x16 kdict/cr16-app-kdict.png kdict-16.xpm

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kget.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kget.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kget.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,83 @@
+debian/tmp/usr/bin/kget
+debian/tmp/usr/lib/kde3/khtml_kget.la
+debian/tmp/usr/lib/kde3/khtml_kget.so
+debian/tmp/usr/share/applications/kde/kget.desktop
+debian/tmp/usr/share/apps/kget/eventsrc
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar1.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar2.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar3.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar4.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar5.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar6.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/kget_dock.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/kget_dock_download.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_clipboard.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_delay.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_disconnect.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_dock.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_drop_target.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_expert.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_logwindow.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_normal.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_off.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_on.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_pause.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_queue.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_restart.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_resume.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_shutdown.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_timer.png
+debian/tmp/usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_uselastdir.png
+debian/tmp/usr/share/apps/kget/kgetui.rc
+debian/tmp/usr/share/apps/kget/pics/connect0.png
+debian/tmp/usr/share/apps/kget/pics/connect1.png
+debian/tmp/usr/share/apps/kget/pics/connect2.png
+debian/tmp/usr/share/apps/kget/pics/connect3.png
+debian/tmp/usr/share/apps/kget/pics/connect4.png
+debian/tmp/usr/share/apps/kget/pics/connect5.png
+debian/tmp/usr/share/apps/kget/pics/connect6.png
+debian/tmp/usr/share/apps/kget/pics/connect7.png
+debian/tmp/usr/share/apps/kget/pics/md_delayed.png
+debian/tmp/usr/share/apps/kget/pics/md_finished.png
+debian/tmp/usr/share/apps/kget/pics/md_queued.png
+debian/tmp/usr/share/apps/kget/pics/md_scheduled.png
+debian/tmp/usr/share/apps/kget/pics/retrying.png
+debian/tmp/usr/share/apps/kget/pics/target.png
+debian/tmp/usr/share/apps/kget/pics/try0.png
+debian/tmp/usr/share/apps/kget/pics/try1.png
+debian/tmp/usr/share/apps/kget/pics/try2.png
+debian/tmp/usr/share/apps/kget/pics/try3.png
+debian/tmp/usr/share/apps/kget/pics/try4.png
+debian/tmp/usr/share/apps/kget/pics/try5.png
+debian/tmp/usr/share/apps/kget/pics/try6.png
+debian/tmp/usr/share/apps/kget/pics/try7.png
+debian/tmp/usr/share/apps/khtml/kpartplugins/kget_plug_in.desktop
+debian/tmp/usr/share/apps/khtml/kpartplugins/kget_plug_in.rc
+debian/tmp/usr/share/apps/konqueror/servicemenus/kget_download.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kget/common
+debian/tmp/usr/share/doc/kde/HTML/en/kget/fileopen.png
+debian/tmp/usr/share/doc/kde/HTML/en/kget/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kget/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kget/kget1.png
+debian/tmp/usr/share/doc/kde/HTML/en/kget/kget2.png
+debian/tmp/usr/share/doc/kde/HTML/en/kget/kget3.png
+debian/tmp/usr/share/doc/kde/HTML/en/kget/kget4.png
+debian/tmp/usr/share/doc/kde/HTML/en/kget/kget5.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kget.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kget_list.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/actions/khtml_kget.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kget.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kget_list.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kget.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kget_list.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kget.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kget_list.png
+debian/tmp/usr/share/mimelnk/application/x-kgetlist.desktop
+debian/tmp/usr/share/sounds/KGet_Added.ogg
+debian/tmp/usr/share/sounds/KGet_Finished.ogg
+debian/tmp/usr/share/sounds/KGet_Finished_All.ogg
+debian/tmp/usr/share/sounds/KGet_Started.ogg
+
+debian/icons/kget-16.xpm	/usr/share/pixmaps
+debian/icons/kget.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kget.menu
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kget.menu	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kget.menu	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+?package(kget):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KGet"\
+	icon32x32="/usr/share/pixmaps/kget.xpm"\
+	icon16x16="/usr/share/pixmaps/kget-16.xpm"\
+	command="/usr/bin/kget"
+
+# Icon 32x32 kget/cr48-app-kget.png kget.xpm
+# Icon 16x16 kget/cr48-app-kget.png kget-16.xpm

Added: people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,40 @@
+debian/tmp/usr/bin/knewstickerstub
+debian/tmp/usr/lib/kde3/knewsticker_panelapplet.la
+debian/tmp/usr/lib/kde3/knewsticker_panelapplet.so
+debian/tmp/usr/lib/kde3/libkntsrcfilepropsdlg.la
+debian/tmp/usr/lib/kde3/libkntsrcfilepropsdlg.so
+debian/tmp/usr/share/applications/kde/knewsticker-standalone.desktop
+debian/tmp/usr/share/applnk/.hidden/knewstickerstub.desktop
+debian/tmp/usr/share/apps/kconf_update/knewsticker.upd
+debian/tmp/usr/share/apps/kconf_update/knt-0.1-0.2.pl
+debian/tmp/usr/share/apps/kicker/applets/knewsticker.desktop
+debian/tmp/usr/share/apps/knewsticker/eventsrc
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/TODO
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/about-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/checknews-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/common
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/contextmenu.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/help-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-filters.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-general.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-newssitedialog.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-newssources.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/kcmnewsticker-scrollerprefs.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/kcontrol-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/knewsticker-childpanel.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/knewsticker-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/knewsticker-kicker.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/knewsticker-ownwindow.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/newarticle-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/newssite-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/oldarticle-icon.png
+debian/tmp/usr/share/doc/kde/HTML/en/knewsticker/preferences-icon.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/knewsticker.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/knewsticker.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/knewsticker.png
+debian/tmp/usr/share/services/kntsrcfilepropsdlg.desktop
+
+debian/icons/knewsticker-16.xpm		/usr/share/pixmaps
+debian/icons/knewsticker.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.lintian	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.lintian	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1 @@
+knewsticker: menu-command-not-in-package /usr/lib/menu/knewsticker:8 /usr/bin/appletproxy

Added: people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.menu
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.menu	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/knewsticker.menu	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+?package(knewsticker):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KNewsTicker"\
+	icon32x32="/usr/share/pixmaps/knewsticker.xpm"\
+	icon16x16="/usr/share/pixmaps/knewsticker-16.xpm"\
+	command="/usr/bin/appletproxy knewsticker.desktop"
+
+# Icon 32x32 knewsticker/cr32-app-knewsticker.png knewsticker.xpm
+# Icon 16x16 knewsticker/cr16-app-knewsticker.png knewsticker-16.xpm

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kopete.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kopete.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kopete.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,841 @@
+debian/tmp/usr/bin/kopete
+debian/tmp/usr/bin/kopete_latexconvert.sh
+debian/tmp/usr/lib/kconf_update_bin/kopete-account-kconf_update
+debian/tmp/usr/lib/kconf_update_bin/kopete-nameTracking-kconf_update
+debian/tmp/usr/lib/kconf_update_bin/kopete-pluginloader2-kconf_update
+debian/tmp/usr/lib/kde3/kcm_kopete_accountconfig.la
+debian/tmp/usr/lib/kde3/kcm_kopete_accountconfig.so
+debian/tmp/usr/lib/kde3/kcm_kopete_addbookmarks.la
+debian/tmp/usr/lib/kde3/kcm_kopete_addbookmarks.so
+debian/tmp/usr/lib/kde3/kcm_kopete_alias.la
+debian/tmp/usr/lib/kde3/kcm_kopete_alias.so
+debian/tmp/usr/lib/kde3/kcm_kopete_appearanceconfig.la
+debian/tmp/usr/lib/kde3/kcm_kopete_appearanceconfig.so
+debian/tmp/usr/lib/kde3/kcm_kopete_autoreplace.la
+debian/tmp/usr/lib/kde3/kcm_kopete_autoreplace.so
+debian/tmp/usr/lib/kde3/kcm_kopete_avdeviceconfig.la
+debian/tmp/usr/lib/kde3/kcm_kopete_avdeviceconfig.so
+debian/tmp/usr/lib/kde3/kcm_kopete_behaviorconfig.la
+debian/tmp/usr/lib/kde3/kcm_kopete_behaviorconfig.so
+debian/tmp/usr/lib/kde3/kcm_kopete_cryptography.la
+debian/tmp/usr/lib/kde3/kcm_kopete_cryptography.so
+debian/tmp/usr/lib/kde3/kcm_kopete_highlight.la
+debian/tmp/usr/lib/kde3/kcm_kopete_highlight.so
+debian/tmp/usr/lib/kde3/kcm_kopete_history.la
+debian/tmp/usr/lib/kde3/kcm_kopete_history.so
+debian/tmp/usr/lib/kde3/kcm_kopete_identityconfig.la
+debian/tmp/usr/lib/kde3/kcm_kopete_identityconfig.so
+debian/tmp/usr/lib/kde3/kcm_kopete_latex.la
+debian/tmp/usr/lib/kde3/kcm_kopete_latex.so
+debian/tmp/usr/lib/kde3/kcm_kopete_msn.la
+debian/tmp/usr/lib/kde3/kcm_kopete_msn.so
+debian/tmp/usr/lib/kde3/kcm_kopete_netmeeting.la
+debian/tmp/usr/lib/kde3/kcm_kopete_netmeeting.so
+debian/tmp/usr/lib/kde3/kcm_kopete_nowlistening.la
+debian/tmp/usr/lib/kde3/kcm_kopete_nowlistening.so
+debian/tmp/usr/lib/kde3/kcm_kopete_texteffect.la
+debian/tmp/usr/lib/kde3/kcm_kopete_texteffect.so
+debian/tmp/usr/lib/kde3/kcm_kopete_translator.la
+debian/tmp/usr/lib/kde3/kcm_kopete_translator.so
+debian/tmp/usr/lib/kde3/kcm_kopete_webpresence.la
+debian/tmp/usr/lib/kde3/kcm_kopete_webpresence.so
+debian/tmp/usr/lib/kde3/kio_jabberdisco.la
+debian/tmp/usr/lib/kde3/kio_jabberdisco.so
+debian/tmp/usr/lib/kde3/kopete_addbookmarks.la
+debian/tmp/usr/lib/kde3/kopete_addbookmarks.so
+debian/tmp/usr/lib/kde3/kopete_aim.la
+debian/tmp/usr/lib/kde3/kopete_aim.so
+debian/tmp/usr/lib/kde3/kopete_alias.la
+debian/tmp/usr/lib/kde3/kopete_alias.so
+debian/tmp/usr/lib/kde3/kopete_autoreplace.la
+debian/tmp/usr/lib/kde3/kopete_autoreplace.so
+debian/tmp/usr/lib/kde3/kopete_chatwindow.la
+debian/tmp/usr/lib/kde3/kopete_chatwindow.so
+debian/tmp/usr/lib/kde3/kopete_connectionstatus.la
+debian/tmp/usr/lib/kde3/kopete_connectionstatus.so
+debian/tmp/usr/lib/kde3/kopete_contactnotes.la
+debian/tmp/usr/lib/kde3/kopete_contactnotes.so
+debian/tmp/usr/lib/kde3/kopete_cryptography.la
+debian/tmp/usr/lib/kde3/kopete_cryptography.so
+debian/tmp/usr/lib/kde3/kopete_emailwindow.la
+debian/tmp/usr/lib/kde3/kopete_emailwindow.so
+debian/tmp/usr/lib/kde3/kopete_gadu.la
+debian/tmp/usr/lib/kde3/kopete_gadu.so
+debian/tmp/usr/lib/kde3/kopete_groupwise.la
+debian/tmp/usr/lib/kde3/kopete_groupwise.so
+debian/tmp/usr/lib/kde3/kopete_highlight.la
+debian/tmp/usr/lib/kde3/kopete_highlight.so
+debian/tmp/usr/lib/kde3/kopete_history.la
+debian/tmp/usr/lib/kde3/kopete_history.so
+debian/tmp/usr/lib/kde3/kopete_icq.la
+debian/tmp/usr/lib/kde3/kopete_icq.so
+debian/tmp/usr/lib/kde3/kopete_irc.la
+debian/tmp/usr/lib/kde3/kopete_irc.so
+debian/tmp/usr/lib/kde3/kopete_jabber.la
+debian/tmp/usr/lib/kde3/kopete_jabber.so
+debian/tmp/usr/lib/kde3/kopete_latex.la
+debian/tmp/usr/lib/kde3/kopete_latex.so
+debian/tmp/usr/lib/kde3/kopete_msn.la
+debian/tmp/usr/lib/kde3/kopete_msn.so
+debian/tmp/usr/lib/kde3/kopete_netmeeting.la
+debian/tmp/usr/lib/kde3/kopete_netmeeting.so
+debian/tmp/usr/lib/kde3/kopete_nowlistening.la
+debian/tmp/usr/lib/kde3/kopete_nowlistening.so
+debian/tmp/usr/lib/kde3/kopete_sms.la
+debian/tmp/usr/lib/kde3/kopete_sms.so
+debian/tmp/usr/lib/kde3/kopete_statistics.la
+debian/tmp/usr/lib/kde3/kopete_statistics.so
+debian/tmp/usr/lib/kde3/kopete_testbed.la
+debian/tmp/usr/lib/kde3/kopete_testbed.so
+debian/tmp/usr/lib/kde3/kopete_texteffect.la
+debian/tmp/usr/lib/kde3/kopete_texteffect.so
+debian/tmp/usr/lib/kde3/kopete_translator.la
+debian/tmp/usr/lib/kde3/kopete_translator.so
+debian/tmp/usr/lib/kde3/kopete_webpresence.la
+debian/tmp/usr/lib/kde3/kopete_webpresence.so
+debian/tmp/usr/lib/kde3/kopete_yahoo.la
+debian/tmp/usr/lib/kde3/kopete_yahoo.so
+debian/tmp/usr/lib/kde3/libkrichtexteditpart.la
+debian/tmp/usr/lib/kde3/libkrichtexteditpart.so
+debian/tmp/usr/lib/libkopete.so.1
+debian/tmp/usr/lib/libkopete.so.1.0.0
+debian/tmp/usr/lib/libkopete_msn_shared.so.0
+debian/tmp/usr/lib/libkopete_msn_shared.so.0.0.0
+debian/tmp/usr/lib/libkopete_oscar.so.2
+debian/tmp/usr/lib/libkopete_oscar.so.2.0.0
+debian/tmp/usr/lib/libkopete_videodevice.so.0
+debian/tmp/usr/lib/libkopete_videodevice.so.0.0.0
+debian/tmp/usr/share/applications/kde/kopete.desktop
+debian/tmp/usr/share/apps/kconf_update/kopete-account-0.10.pl
+debian/tmp/usr/share/apps/kconf_update/kopete-account-kconf_update.sh
+debian/tmp/usr/share/apps/kconf_update/kopete-account-kconf_update.upd
+debian/tmp/usr/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh
+debian/tmp/usr/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd
+debian/tmp/usr/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.sh
+debian/tmp/usr/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.upd
+debian/tmp/usr/share/apps/kconf_update/kopete-nameTracking.upd
+debian/tmp/usr/share/apps/kconf_update/kopete-pluginloader.pl
+debian/tmp/usr/share/apps/kconf_update/kopete-pluginloader.upd
+debian/tmp/usr/share/apps/kconf_update/kopete-pluginloader2.sh
+debian/tmp/usr/share/apps/kconf_update/kopete-pluginloader2.upd
+debian/tmp/usr/share/apps/kopete/eventsrc
+debian/tmp/usr/share/apps/kopete/icons
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/128x128
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/128x128/apps
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/128x128/apps/aim_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/128x128/apps/icq_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/128x128/apps/msn_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/128x128/apps/sms_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/128x128/apps/yahoo_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/account_offline_overlay.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/aim_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/aim_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/aim_offline.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/aim_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/emoticon.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy_d.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_con.mng
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_connecting.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_ignored.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_invi.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_invi_d.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_offline.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_offline_d.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_online_d.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_busy.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_invisible.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/icq_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/icq_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/icq_dnd.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/icq_ffc.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/icq_invisible.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/icq_na.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/icq_occupied.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/icq_offline.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/icq_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/irc_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/irc_channel.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/irc_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/irc_normal.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/irc_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/irc_op.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/irc_server.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/irc_voice.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_chatty.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_group.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_invisible.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_na.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_offline.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_original.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_raw.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_off.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_on.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_xa.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key1.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key2.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key3.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteavailable.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteaway.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/logging.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_offline.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_unknown.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_blocked.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_brb.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_busy.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_invisible.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_lunch.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_na.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_newmsg.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_offline.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_phone.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/newmsg.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/status_unknown.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_busy.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_idle.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_invisible.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_mobile.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_tea.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps/aim_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps/gadu_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps/groupwise_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps/icq_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps/irc_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps/jabber_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps/msn_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps/sms_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/16x16/apps/yahoo_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/22x22
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/22x22/actions
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/22x22/actions/account_offline_overlay.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteavailable.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteaway.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/22x22/actions/logging.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/22x22/apps
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/22x22/apps/groupwise_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/account_offline_overlay.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteavailable.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteaway.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/logging.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_offline.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_unknown.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/newmessage.mng
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/actions/newmsg.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/aim_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/autoreplace.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/gadu_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/groupwise_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/highlight.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/icq_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/irc_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/jabber_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/latex.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/msn_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/sms_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/texteffect.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/32x32/apps/yahoo_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/actions
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteavailable.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteaway.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/actions/logging.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_away.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_offline.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_online.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/apps
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/apps/aim_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/apps/groupwise_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/apps/icq_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/apps/jabber_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/apps/msn_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/apps/sms_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/48x48/apps/yahoo_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64/actions
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64/actions/logging.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64/apps
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64/apps/aim_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64/apps/groupwise_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64/apps/icq_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64/apps/msn_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64/apps/sms_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/64x64/apps/yahoo_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/scalable
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/scalable/actions
+debian/tmp/usr/share/apps/kopete/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz
+debian/tmp/usr/share/apps/kopete/icons/hicolor
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/aim_away.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/aim_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/aim_offline.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/aim_online.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/emoticon.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/icq_away.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/icq_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/icq_dnd.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/icq_ffc.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/icq_invisible.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/icq_na.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/icq_occupied.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/icq_offline.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/icq_online.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_away.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_chatty.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_connecting.mng
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_group.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_invisible.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_na.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_offline.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_online.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_original.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_raw.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_off.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_on.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/jabber_xa.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/kopeteavailable.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/kopeteaway.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/newmsg.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/actions/status_unknown.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/apps
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/apps/aim_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/apps/icq_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/16x16/apps/jabber_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/22x22
+debian/tmp/usr/share/apps/kopete/icons/hicolor/22x22/actions
+debian/tmp/usr/share/apps/kopete/icons/hicolor/22x22/actions/kopeteavailable.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/22x22/actions/kopeteaway.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/32x32
+debian/tmp/usr/share/apps/kopete/icons/hicolor/32x32/actions
+debian/tmp/usr/share/apps/kopete/icons/hicolor/32x32/actions/kopeteavailable.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/32x32/actions/kopeteaway.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/32x32/actions/newmessage.mng
+debian/tmp/usr/share/apps/kopete/icons/hicolor/32x32/apps
+debian/tmp/usr/share/apps/kopete/icons/hicolor/32x32/apps/aim_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/32x32/apps/icq_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/32x32/apps/jabber_protocol.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/48x48
+debian/tmp/usr/share/apps/kopete/icons/hicolor/48x48/actions
+debian/tmp/usr/share/apps/kopete/icons/hicolor/48x48/actions/kopeteavailable.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/48x48/actions/kopeteaway.png
+debian/tmp/usr/share/apps/kopete/icons/hicolor/48x48/apps
+debian/tmp/usr/share/apps/kopete/icons/hicolor/48x48/apps/jabber_protocol.png
+debian/tmp/usr/share/apps/kopete/ircchatui.rc
+debian/tmp/usr/share/apps/kopete/ircnetworks.xml
+debian/tmp/usr/share/apps/kopete/kopetechatwindow.rc
+debian/tmp/usr/share/apps/kopete/kopetecommandui.rc
+debian/tmp/usr/share/apps/kopete/kopeteemailwindow.rc
+debian/tmp/usr/share/apps/kopete/kopeteui.rc
+debian/tmp/usr/share/apps/kopete/nowlisteningchatui.rc
+debian/tmp/usr/share/apps/kopete/nowlisteningui.rc
+debian/tmp/usr/share/apps/kopete/pics
+debian/tmp/usr/share/apps/kopete/pics/statistics
+debian/tmp/usr/share/apps/kopete/pics/statistics/black.png
+debian/tmp/usr/share/apps/kopete/pics/statistics/blue.png
+debian/tmp/usr/share/apps/kopete/pics/statistics/gray.png
+debian/tmp/usr/share/apps/kopete/pics/statistics/navy.png
+debian/tmp/usr/share/apps/kopete/styles
+debian/tmp/usr/share/apps/kopete/styles/Adium.xsl
+debian/tmp/usr/share/apps/kopete/styles/Enclosed.xsl
+debian/tmp/usr/share/apps/kopete/styles/Gaim.xsl
+debian/tmp/usr/share/apps/kopete/styles/Keramik.xsl
+debian/tmp/usr/share/apps/kopete/styles/Konsole.xsl
+debian/tmp/usr/share/apps/kopete/styles/Kopete.xsl
+debian/tmp/usr/share/apps/kopete/styles/MSN.xsl
+debian/tmp/usr/share/apps/kopete/styles/Minimal.xsl
+debian/tmp/usr/share/apps/kopete/styles/XChat.xsl
+debian/tmp/usr/share/apps/kopete/styles/data
+debian/tmp/usr/share/apps/kopete/styles/data/Adium
+debian/tmp/usr/share/apps/kopete/styles/data/Adium/adium.js
+debian/tmp/usr/share/apps/kopete/styles/data/iChat
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/blue/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/clear/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/graphite/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/green/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/orange/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/pink/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/purple/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat-Trans/yellow/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/blue/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/clear/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/graphite/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/green/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/orange/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/pink/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/purple/them.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/From/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To/bl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To/bm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To/br.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To/ml.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To/mm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To/mr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To/tl.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To/tm.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/To/tr.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/me.png
+debian/tmp/usr/share/apps/kopete/styles/data/iChat/yellow/them.png
+debian/tmp/usr/share/apps/kopete/styles/iChat.xsl
+debian/tmp/usr/share/apps/kopete/webpresence
+debian/tmp/usr/share/apps/kopete_contactnotes/contactnotesui.rc
+debian/tmp/usr/share/apps/kopete_cryptography/cryptographychatui.rc
+debian/tmp/usr/share/apps/kopete_cryptography/cryptographyui.rc
+debian/tmp/usr/share/apps/kopete_groupwise/gwchatui.rc
+debian/tmp/usr/share/apps/kopete_history/historychatui.rc
+debian/tmp/usr/share/apps/kopete_history/historyui.rc
+debian/tmp/usr/share/apps/kopete_latex/latexchatui.rc
+debian/tmp/usr/share/apps/kopete_msn/msnchatui.rc
+debian/tmp/usr/share/apps/kopete_netmeeting/netmeetingchatui.rc
+debian/tmp/usr/share/apps/kopete_statistics/statisticsui.rc
+debian/tmp/usr/share/apps/kopete_translator/translatorchatui.rc
+debian/tmp/usr/share/apps/kopete_translator/translatorui.rc
+debian/tmp/usr/share/apps/kopete_yahoo/yahoochatui.rc
+debian/tmp/usr/share/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
+debian/tmp/usr/share/config.kcfg/historyconfig.kcfg
+debian/tmp/usr/share/config.kcfg/kopete.kcfg
+debian/tmp/usr/share/config.kcfg/kopeteidentityconfigpreferences.kcfg
+debian/tmp/usr/share/config.kcfg/latexconfig.kcfg
+debian/tmp/usr/share/config.kcfg/nowlisteningconfig.kcfg
+debian/tmp/usr/share/doc/kde/HTML/en/kopete/common
+debian/tmp/usr/share/doc/kde/HTML/en/kopete/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kopete/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kopete/menus.docbook
+debian/tmp/usr/share/icons/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kopete_all_away.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kopete_offline.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kopete_some_away.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kopete_some_online.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kopete.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kopete.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kopete.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kopete.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kopete.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kopete.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kopete2.svgz
+debian/tmp/usr/share/mimelnk/application/x-icq.desktop
+debian/tmp/usr/share/mimelnk/application/x-kopete-emoticons.desktop
+debian/tmp/usr/share/services/aim.protocol
+debian/tmp/usr/share/services/chatwindow.desktop
+debian/tmp/usr/share/services/emailwindow.desktop
+debian/tmp/usr/share/services/irc.protocol usr/share/apps/kopete/
+debian/tmp/usr/share/services/jabberdisco.protocol
+debian/tmp/usr/share/services/kconfiguredialog/kopete_addbookmarks_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_alias_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_autoreplace_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_cryptography_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_highlight_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_history_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_latex_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_msn_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_netmeeting_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_nowlistening_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_texteffect_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_translator_config.desktop
+debian/tmp/usr/share/services/kconfiguredialog/kopete_webpresence_config.desktop
+debian/tmp/usr/share/services/kopete_accountconfig.desktop
+debian/tmp/usr/share/services/kopete_addbookmarks.desktop
+debian/tmp/usr/share/services/kopete_aim.desktop
+debian/tmp/usr/share/services/kopete_alias.desktop
+debian/tmp/usr/share/services/kopete_appearanceconfig.desktop
+debian/tmp/usr/share/services/kopete_autoreplace.desktop
+debian/tmp/usr/share/services/kopete_avdeviceconfig.desktop
+debian/tmp/usr/share/services/kopete_behaviorconfig.desktop
+debian/tmp/usr/share/services/kopete_connectionstatus.desktop
+debian/tmp/usr/share/services/kopete_contactnotes.desktop
+debian/tmp/usr/share/services/kopete_cryptography.desktop
+debian/tmp/usr/share/services/kopete_gadu.desktop
+debian/tmp/usr/share/services/kopete_groupwise.desktop
+debian/tmp/usr/share/services/kopete_highlight.desktop
+debian/tmp/usr/share/services/kopete_history.desktop
+debian/tmp/usr/share/services/kopete_icq.desktop
+debian/tmp/usr/share/services/kopete_identityconfig.desktop
+debian/tmp/usr/share/services/kopete_irc.desktop
+debian/tmp/usr/share/services/kopete_jabber.desktop
+debian/tmp/usr/share/services/kopete_latex.desktop
+debian/tmp/usr/share/services/kopete_msn.desktop
+debian/tmp/usr/share/services/kopete_netmeeting.desktop
+debian/tmp/usr/share/services/kopete_nowlistening.desktop
+debian/tmp/usr/share/services/kopete_sms.desktop
+debian/tmp/usr/share/services/kopete_statistics.desktop
+debian/tmp/usr/share/services/kopete_testbed.desktop
+debian/tmp/usr/share/services/kopete_texteffect.desktop
+debian/tmp/usr/share/services/kopete_translator.desktop
+debian/tmp/usr/share/services/kopete_webpresence.desktop
+debian/tmp/usr/share/services/kopete_yahoo.desktop
+debian/tmp/usr/share/servicetypes/kopeteplugin.desktop
+debian/tmp/usr/share/servicetypes/kopeteprotocol.desktop
+debian/tmp/usr/share/servicetypes/kopeteui.desktop
+debian/tmp/usr/share/sounds/Kopete_Event.ogg
+debian/tmp/usr/share/sounds/Kopete_Received.ogg
+debian/tmp/usr/share/sounds/Kopete_Sent.ogg
+debian/tmp/usr/share/sounds/Kopete_User_is_Online.ogg
+
+debian/icons/kopete-16.xpm	/usr/share/pixmaps
+debian/icons/kopete.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kopete.manpages
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kopete.manpages	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kopete.manpages	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1 @@
+debian/man/out/kopete.1

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kopete.menu
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kopete.menu	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kopete.menu	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+?package(kopete):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE,IM"\
+	title="Kopete"\
+	icon32x32="/usr/share/pixmaps/kopete.xpm"\
+	icon16x16="/usr/share/pixmaps/kopete-16.xpm"\
+	command="/usr/bin/kopete"
+
+# Icon 32x32 kopete/kopete/cr32-app-kopete.png kopete.xpm
+# Icon 16x16 kopete/kopete/cr16-app-kopete.png kopete-16.xpm

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kopete.postinst
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kopete.postinst	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kopete.postinst	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,42 @@
+#! /bin/sh
+# postinst script for kopete
+#
+# 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 --quiet --install \
+                /usr/share/services/irc.protocol irc.protocol \
+                /usr/share/apps/kopete/irc.protocol 40
+    ;;
+
+    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

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kopete.prerm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kopete.prerm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kopete.prerm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,40 @@
+#! /bin/sh
+# prerm script for kopete
+#
+# 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 /usr/share/doc/packaging-manual/
+
+case "$1" in
+    remove)
+        update-alternatives --quiet --remove irc.protocol \
+                /usr/share/apps/kopete/irc.protocol
+        ;;
+
+    upgrade|deconfigure)
+        ;;
+
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kpf.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kpf.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kpf.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,12 @@
+debian/tmp/usr/lib/kde3/kpf_panelapplet.la
+debian/tmp/usr/lib/kde3/kpf_panelapplet.so
+debian/tmp/usr/lib/kde3/kpfpropertiesdialog.la
+debian/tmp/usr/lib/kde3/kpfpropertiesdialog.so
+debian/tmp/usr/share/apps/kicker/applets/kpfapplet.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kpf/common
+debian/tmp/usr/share/doc/kde/HTML/en/kpf/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kpf/index.docbook
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpf.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpf.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kpf.png
+debian/tmp/usr/share/services/kpfpropertiesdialogplugin.desktop

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kppp-options
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kppp-options	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kppp-options	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1 @@
+#noauth

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kppp.README.Debian
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kppp.README.Debian	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kppp.README.Debian	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,40 @@
+Configuring and Running KPPP
+============================
+
+In order to use KPPP, you must first be a member of the "dip" group.
+Membership in this group is a prerequisite for any and all use of ppp in
+Debian. If you are not a member of this group, you will not be able to run
+the ppp daemon (pppd) or make a dialup connection. Since KPPP's backend
+runs SUID root, membership in the "dialout" group is not needed to access
+device nodes.
+
+KPPP also requires that the ppp daemon be run with the "noauth" option.
+However, pppd's default setting, in /etc/ppp/options, is "auth", and for
+security reasons it should remain so. To work around this problem, uncomment
+"noauth" in /etc/ppp/peers/kppp-options. You should then be able to connect.
+
+Note that if "noauth" is uncommented, a setting of "noauth" in
+/etc/ppp/options will conflict with KPPP. Note also that uncommenting
+"noauth" opens the possibility that other malicious members of the "dip"
+group might potentially abuse the ppp daemon.
+
+Finally, if you are uncertain as to which device node represents your modem,
+you can try to find out by running "dmesg | grep tty". The output of this
+command will sometimes provide the needed hint.
+
+If the answer seems to be that your modem is on a node, such as ttyS28, that
+KPPP does not accept as a configuration option, then you should create a
+symlink from that node to /dev/modem (by running, as root,
+"ln -s /dev/ttyS28 /dev/modem", where ttyS28 is replaced by whatever node your
+modem is on). Then simply configure KPPP to use /dev/modem. Further modems
+with non-standard device nodes can likewise be symlinked to /dev/modem[0-3].
+
+If you use udev, then symlinks in /dev will not be preserved
+across reboots. In this case, you should edit, as root, /etc/udev/links.conf,
+adding a line that resembles "L modem    /dev/ttyS28". You must then either
+reboot, or run "/etc/init.d/udev restart", for the link to be created.
+
+If you believe that your modem node should be included in KPPP's default list,
+and you are using a common type of hardware, you can always file a wishlist
+bug against the kppp package, although the package maintainers maintain the
+right to judge your device node too esoteric for inclusion.

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kppp.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kppp.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kppp.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,534 @@
+debian/tmp/usr/bin/kppp
+debian/tmp/usr/bin/kppplogview
+debian/tmp/usr/share/applications/kde/Kppp.desktop
+debian/tmp/usr/share/applications/kde/kppplogview.desktop
+debian/tmp/usr/share/apps/kppp/Provider/Austria/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Austria/Simon%032Media
+debian/tmp/usr/share/apps/kppp/Provider/Belarus/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Belarus/AtlantTelecom
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/AICOM
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/ARsystem
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/ASYS
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/ApexNet
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/BohemiaNet
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/Brailcom
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/CITYNET
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/Contactel
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/ES-servis
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/Econnect
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/Falco_computer
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/Fortech
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/HP-NET
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/INTERNET_OnLine
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/INTERNEXT
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/IQNET
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/KPNQuest
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/M-soft
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/Nextra
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/ProfiNet
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/SeverNET
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/Video_OnLine
+debian/tmp/usr/share/apps/kppp/Provider/Czech_Republic/Volny
+debian/tmp/usr/share/apps/kppp/Provider/Denmark/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Denmark/Get2Net
+debian/tmp/usr/share/apps/kppp/Provider/France/.directory
+debian/tmp/usr/share/apps/kppp/Provider/France/ClubInternetFull
+debian/tmp/usr/share/apps/kppp/Provider/Germany/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Germany/CityWeb
+debian/tmp/usr/share/apps/kppp/Provider/Germany/FH%032Rhein%032Sieg%032%040Informatik%041
+debian/tmp/usr/share/apps/kppp/Provider/Germany/MUC%046DE
+debian/tmp/usr/share/apps/kppp/Provider/Germany/Netsurf
+debian/tmp/usr/share/apps/kppp/Provider/Irland/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Irland/Eircom
+debian/tmp/usr/share/apps/kppp/Provider/Irland/IOL
+debian/tmp/usr/share/apps/kppp/Provider/Irland/UTV
+debian/tmp/usr/share/apps/kppp/Provider/Irland/UVT
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/12Move
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Bart
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Betuwenet%032BFree
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Betuwenet%032BQuality
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Cistron
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Concepts%032ICT
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Cubic%032Circle
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Dataweb
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Daxis%032Internet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Demon%032Internet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Energis-Ision
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Euronet%032anytime
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Euronet%032professional
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/FlakkeeNet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/FreeAcces
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Freeler%032basis
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Freeler%032compleet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Freeler%032voordelig
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/HCC%032NET
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Hacom
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/HetNet%032Basis%032Surfen
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/HetNet%032Frequent%032Surfen
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/HetNet%032Regelmatig%032Surfen
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/IAE
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/ILimburg
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/InterNLnet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Interbox
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Internet%032Acces%032Facilities
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Internet%032Online
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Interstroom
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/IntroWeb%032Hengelo%032e.o.
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0323-cijferig%032kengetal
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0324-cijferig%032kengetal
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Kabelfoon
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0323%032cijferig%032kengetal
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0324%032cijferig%032kengetal
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Luna
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Macom
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Nederland.net
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Premium
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Standaard
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Plant%032Acces
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Popin
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/PublishNet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Raketnet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Solcon
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Support%032Net
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Telebyte
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Tiscali%032Compleet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Tiscali%032Gratis
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/UwNet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Via%032Networks
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Wannadoo%032budget
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Wannadoo%032budget%320plus
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Wannadoo%032smartpack
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Wirehub
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/XS4All
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Zeelandnet
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Zon%0322
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Zon%032Gratis
+debian/tmp/usr/share/apps/kppp/Provider/Netherlands/Zon%032Inclusief
+debian/tmp/usr/share/apps/kppp/Provider/NewZealand/.directory
+debian/tmp/usr/share/apps/kppp/Provider/NewZealand/OrconInternet
+debian/tmp/usr/share/apps/kppp/Provider/NewZealand/Paradise
+debian/tmp/usr/share/apps/kppp/Provider/NewZealand/Voyager
+debian/tmp/usr/share/apps/kppp/Provider/NewZealand/XTRA
+debian/tmp/usr/share/apps/kppp/Provider/NewZealand/ihug
+debian/tmp/usr/share/apps/kppp/Provider/Norway/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Norway/BGNett
+debian/tmp/usr/share/apps/kppp/Provider/Norway/Institutt%032for%032informatikk
+debian/tmp/usr/share/apps/kppp/Provider/Portugal/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Portugal/Clix
+debian/tmp/usr/share/apps/kppp/Provider/Portugal/Netc
+debian/tmp/usr/share/apps/kppp/Provider/Portugal/OniNet
+debian/tmp/usr/share/apps/kppp/Provider/Slovenia/AmisNet
+debian/tmp/usr/share/apps/kppp/Provider/Slovenia/Arnes
+debian/tmp/usr/share/apps/kppp/Provider/Slovenia/Kiss
+debian/tmp/usr/share/apps/kppp/Provider/Slovenia/MojNet
+debian/tmp/usr/share/apps/kppp/Provider/Slovenia/SiOL
+debian/tmp/usr/share/apps/kppp/Provider/Slovenia/Volja
+debian/tmp/usr/share/apps/kppp/Provider/Sweden/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Sweden/Tiscali
+debian/tmp/usr/share/apps/kppp/Provider/Sweden/Utfors
+debian/tmp/usr/share/apps/kppp/Provider/Switzerland/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Switzerland/Bluewin
+debian/tmp/usr/share/apps/kppp/Provider/Taiwan/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Taiwan/EraNet
+debian/tmp/usr/share/apps/kppp/Provider/Taiwan/HiNet
+debian/tmp/usr/share/apps/kppp/Provider/Taiwan/SeedNet
+debian/tmp/usr/share/apps/kppp/Provider/Ukraine/.directory
+debian/tmp/usr/share/apps/kppp/Provider/Ukraine/Adamant
+debian/tmp/usr/share/apps/kppp/Provider/Ukraine/IPTelecom
+debian/tmp/usr/share/apps/kppp/Provider/Ukraine/NuVse
+debian/tmp/usr/share/apps/kppp/Provider/United_Kingdom/.directory
+debian/tmp/usr/share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
+debian/tmp/usr/share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
+debian/tmp/usr/share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
+debian/tmp/usr/share/apps/kppp/Provider/United_Kingdom/FreeServe
+debian/tmp/usr/share/apps/kppp/Provider/United_Kingdom/UK%032Free%032Software%032Network%032ISDN
+debian/tmp/usr/share/apps/kppp/Provider/United_Kingdom/UK%032Free%032Software%032Network%032Modem
+debian/tmp/usr/share/apps/kppp/Provider/United_Kingdom/UKPOST%032ISDN
+debian/tmp/usr/share/apps/kppp/Provider/United_Kingdom/UKPOST%032Modem
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/041Net
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/BeoTelNet
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Bar.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Berane.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.BijeloPolje.CG.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Budva.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Cetinje.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.HercegNovi.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Kotor.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Niksic.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Pljevlja.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Podgorica.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Tivat.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.Ulcinj.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/CG.yu
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/DrenikNet
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnet at Full
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnet at Lite
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnetBeograd
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnetCacak
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnetKragujevac
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnetNis
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnetNoviSad
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnetPristina
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnetSombor
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/EUnetSubotica
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/InfoSKY
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/PTT
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/SCnet
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/Sezampro
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/SuOnline
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/TippNet
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/VeratNet
+debian/tmp/usr/share/apps/kppp/Provider/Yugoslavia/YUBCnet
+debian/tmp/usr/share/apps/kppp/Rules/Argentina/Argentina_0610.rst
+debian/tmp/usr/share/apps/kppp/Rules/Argentina/Argentina_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Australia/Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Australia/Optus_Residential.rst
+debian/tmp/usr/share/apps/kppp/Rules/Australia/STD_Zone_1_-_25-50_kms.rst
+debian/tmp/usr/share/apps/kppp/Rules/Australia/STD_Zone_2_-_50-85_kms.rst
+debian/tmp/usr/share/apps/kppp/Rules/Australia/STD_Zone_3_-_85-165_kms.rst
+debian/tmp/usr/share/apps/kppp/Rules/Australia/STD_Zone_4_-_165+_kms.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Business_1/Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Business_1/Long_Distance.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Business_1/Online.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Business_2/Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Business_2/Long_Distance.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Business_2/Online.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Minimum/Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Minimum/Long_Distance.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Minimum/Online.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Standard/Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Standard/Long_Distance.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Standard/Online.rst
+debian/tmp/usr/share/apps/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Bangladesh/ATT00007.rst
+debian/tmp/usr/share/apps/kppp/Rules/Bangladesh/ATT00010.rst
+debian/tmp/usr/share/apps/kppp/Rules/Belgium/Belgium_internet_euro.rst
+debian/tmp/usr/share/apps/kppp/Rules/Belgium/Belgium_internet_frank.rst
+debian/tmp/usr/share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
+debian/tmp/usr/share/apps/kppp/Rules/Belgium/Belgium_zonal.rst
+debian/tmp/usr/share/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_home_-_bez_impulsa.rst
+debian/tmp/usr/share/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_student_-_bez_impulsa.rst
+debian/tmp/usr/share/apps/kppp/Rules/Bosnia_and_Herzegovina/SmartNet_PERSONAL_bez_impulsa.rst
+debian/tmp/usr/share/apps/kppp/Rules/Bosnia_and_Herzegovina/samo_impulsi.rst
+debian/tmp/usr/share/apps/kppp/Rules/Brasil/Brasil.rst
+debian/tmp/usr/share/apps/kppp/Rules/Brasil/Brasil_Ligbr.rst
+debian/tmp/usr/share/apps/kppp/Rules/Brasil/Rio_de_Janeiro.rst
+debian/tmp/usr/share/apps/kppp/Rules/Brasil/SaoPaulo.rst
+debian/tmp/usr/share/apps/kppp/Rules/Croatia/CARNet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Business_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Home_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_180_+_660.rst
+debian/tmp/usr/share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_90_+_300.rst
+debian/tmp/usr/share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_universal.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/12Move_Analog.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/12Move_ISDN.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/Cybercity_Friabonnement.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/Get2net_Betaling.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/Get2net_Gratis.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/Mobilix_Wanadoo.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/Teledanmark_Basis.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/Teledanmark_Favoritinternet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/Worldonline-Analog.rst
+debian/tmp/usr/share/apps/kppp/Rules/Denmark/Worldonline-ISDN.rst
+debian/tmp/usr/share/apps/kppp/Rules/Estonia/Eesti_Telefon.rst
+debian/tmp/usr/share/apps/kppp/Rules/Finland/VLP.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/Cegetel_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/Cegetel_National.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/France_Telecom_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/France_Telecom_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/France_Telecom_National.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/Le_9_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/Le_9_National.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/OneTel.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/Tele2_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/Tele2_National.rst
+debian/tmp/usr/share/apps/kppp/Rules/France/Wanadoo_Free.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/1und1_InternetZugang.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/2.5min.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/2.5s.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Addcom.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Arcor_Internet_by_Call_easy.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/CallOkaynet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Callisa_City.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Cityweb.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/CompuservePro.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/E-Plus-Online_Jedermann.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Easynet_easy-call.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Freenet_Sorglos.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Freenet_StandardTarif.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Freenet_Super_CbC.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Freenet_special_call_by_call.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/MSN.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/NGI_Call_By_Call.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Netcom_Kassel.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Nikoma.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Nikoma_Internet_by_Call.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Nikoma_Study_and_Surf.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Planet-Interkom_Internet_by_call.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Puretec.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/Telekom_City_Select_5_30.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/VR-Web.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/expressnet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/knUUt-by-Call.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/talkline_by_call.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/vossnet_fun.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/vossnet_fun_light.rst
+debian/tmp/usr/share/apps/kppp/Rules/Germany/vossnet_kompl.rst
+debian/tmp/usr/share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone1_in_euro.rst
+debian/tmp/usr/share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone2_in_euro.rst
+debian/tmp/usr/share/apps/kppp/Rules/Greece/Hellas_EPAK_local_in_euro.rst
+debian/tmp/usr/share/apps/kppp/Rules/Greece/Hellas_analog_local_in_euro.rst
+debian/tmp/usr/share/apps/kppp/Rules/Greece/Hellas_digital_local_in_euro.rst
+debian/tmp/usr/share/apps/kppp/Rules/Hong_Kong/Hong_Kong_Telecom.rst
+debian/tmp/usr/share/apps/kppp/Rules/Hungary/Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Hungary/LocalTop_MATAV.rst
+debian/tmp/usr/share/apps/kppp/Rules/Hungary/Local_MATAV.rst
+debian/tmp/usr/share/apps/kppp/Rules/Hungary/PapaTel.rst
+debian/tmp/usr/share/apps/kppp/Rules/Iceland/Iceland_general.rst
+debian/tmp/usr/share/apps/kppp/Rules/India/BSNL_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/India/BSNL_Long_101_To_200.rst
+debian/tmp/usr/share/apps/kppp/Rules/India/BSNL_Medium_51_To_100.rst
+debian/tmp/usr/share/apps/kppp/Rules/India/Vsnl_local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Indonesia/Lokal_1_Metropolitan.rst
+debian/tmp/usr/share/apps/kppp/Rules/Indonesia/Lokal_2_Metropolitan.rst
+debian/tmp/usr/share/apps/kppp/Rules/Indonesia/Lokal_non_metropolitan.rst
+debian/tmp/usr/share/apps/kppp/Rules/Ireland/Eircom_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Ireland/Eircom_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Ireland/Eircom_National.rst
+debian/tmp/usr/share/apps/kppp/Rules/Ireland/Eircom_Special.rst
+debian/tmp/usr/share/apps/kppp/Rules/Israel/Bezeq_Interurban.rst
+debian/tmp/usr/share/apps/kppp/Rules/Israel/Bezeq_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Atlanet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Cheapnet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Infostrada_Internet_SpZero.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Infostrada_Libero1055_Base.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Infostrada_Libero1055_SpZero.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Infostrada_Loc_Reg_Naz_SpZero.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Infostrada_Locali_Base.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Infostrada_Reg_Naz_Base.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Tele2_Altri_ISP.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Tele2_Internet_Tele2.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Telecom_Interurbane_Fino15Km.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Telecom_Interurbane_Oltre15Km.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Telecom_Locali.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Teleconomy24_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Teleconomy24_Nazionali.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Teleconomy_NoStop_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_24ore_Internet_AltriISP.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_24ore_Internet_InWind.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_24ore_Interurbane.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_24ore_Urbane.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Internet_InWind.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Urbane_Interurbane.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_Family_Internet_AltriISP.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_Family_Internet_InWind.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_Family_Interurbane.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_Family_Urbane.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_Flat_Internet_AltriISP.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_Flat_Internet_InWind.rst
+debian/tmp/usr/share/apps/kppp/Rules/Italy/Wind_Urbana_1088_Light.rst
+debian/tmp/usr/share/apps/kppp/Rules/Jamaica/CWJ_InterParish.rst
+debian/tmp/usr/share/apps/kppp/Rules/Jamaica/CWJ_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Japan/NTT_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Kazakhstan/Akparat_Sprint.rst
+debian/tmp/usr/share/apps/kppp/Rules/Luxembourg/Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_interurban.rst
+debian/tmp/usr/share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Macedonia/Macedonia_MTnet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst
+debian/tmp/usr/share/apps/kppp/Rules/Malaysia/malaysia.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/12Move.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/BelBasis_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/BelBasis_Regio_Nummervoordeel.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/BelBudget_Buiten_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Cistron
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Freeler_Basis.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Freeler_Voordelig.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/HetNet_Regelmatig_Surfen.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/InterNLnet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Buiten_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Buiten_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Planet_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Priority_Telecom_Nationaal.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Priority_Telecom_Regionaal.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Tele2_Extra_Buiten_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Tele2_Extra_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Buiten_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Buiten_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Regio.rst
+debian/tmp/usr/share/apps/kppp/Rules/Netherlands/Wannadoo_Budget_Plus
+debian/tmp/usr/share/apps/kppp/Rules/Norway/Local_Area.rst
+debian/tmp/usr/share/apps/kppp/Rules/Norway/Long_Distance.rst
+debian/tmp/usr/share/apps/kppp/Rules/Norway/Netcom.rst
+debian/tmp/usr/share/apps/kppp/Rules/Poland/Internetia.rst
+debian/tmp/usr/share/apps/kppp/Rules/Poland/Netia_100km_Niebieska.rst
+debian/tmp/usr/share/apps/kppp/Rules/Poland/Netia_100km_Zielona.rst
+debian/tmp/usr/share/apps/kppp/Rules/Poland/Netia_Lokalne_Niebieska.rst
+debian/tmp/usr/share/apps/kppp/Rules/Poland/Netia_Lokalne_Zielona.rst
+debian/tmp/usr/share/apps/kppp/Rules/Poland/TPSA.rst
+debian/tmp/usr/share/apps/kppp/Rules/Poland/TP_100km.rst
+debian/tmp/usr/share/apps/kppp/Rules/Poland/TP_Lokalne.rst
+debian/tmp/usr/share/apps/kppp/Rules/Portugal/PT_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Portugal/PT_Local_Ilhas.rst
+debian/tmp/usr/share/apps/kppp/Rules/Portugal/PT_Regional.rst
+debian/tmp/usr/share/apps/kppp/Rules/Portugal/PT_Regional_Ilhas.rst
+debian/tmp/usr/share/apps/kppp/Rules/Portugal/PT_YesNET.rst
+debian/tmp/usr/share/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst
+debian/tmp/usr/share/apps/kppp/Rules/Romania/Easynet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Romania/RomTelecom_GSM.rst
+debian/tmp/usr/share/apps/kppp/Rules/Romania/Romtelecom_Acces_Special_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Romania/Romtelecom_Interjudetean.rst
+debian/tmp/usr/share/apps/kppp/Rules/Romania/Romtelecom_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Romania/Zapp-Mobile.rst
+debian/tmp/usr/share/apps/kppp/Rules/Russia/TEMPLATE.ru
+debian/tmp/usr/share/apps/kppp/Rules/Russia/mtu-intel_standart.rst
+debian/tmp/usr/share/apps/kppp/Rules/Singapore/SingTel_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Slovakia/Internetovy_tarif_019XY.rst
+debian/tmp/usr/share/apps/kppp/Rules/Slovakia/ST_medzimesto.rst
+debian/tmp/usr/share/apps/kppp/Rules/Slovakia/ST_mesto.rst
+debian/tmp/usr/share/apps/kppp/Rules/Slovenia/omrezje_0880.rst
+debian/tmp/usr/share/apps/kppp/Rules/Slovenia/omrezje_0889.rst
+debian/tmp/usr/share/apps/kppp/Rules/Slovenia/stacionarno_omrezje.rst
+debian/tmp/usr/share/apps/kppp/Rules/South_Africa/South_Africa_local.rst
+debian/tmp/usr/share/apps/kppp/Rules/South_Africa/South_Africa_long_distance.rst
+debian/tmp/usr/share/apps/kppp/Rules/South_Afrika/South_Afrika.rst
+debian/tmp/usr/share/apps/kppp/Rules/South_Afrika/South_Afrika_Justin.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Infovia.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Infovia_IVA.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Telefonica_Interprovincial.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Telefonica_Interprovincial_IVA.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Telefonica_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Telefonica_Metropolitana.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Telefonica_Metropolitana_IVA.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst
+debian/tmp/usr/share/apps/kppp/Rules/Spain/Telefonica_Provincial_IVA.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/ACN.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Abonnera_com.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Crossnet-Affinity.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Glocalnet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Gts.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Home_se.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Nemtel.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Plusenergi.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/RSLCom.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Rix_Telecom.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Supertel.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Svensk_Telekom.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Tele1_Europe.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Tele2.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Tele8.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Teleman.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Telenordia.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Telerian.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Telia.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Telia_Telebonus1.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Telia_Telebonus2.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Telitel.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Tiscali.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Transnet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Universal_Telecom.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Utfors.rst
+debian/tmp/usr/share/apps/kppp/Rules/Sweden/Vattenfall.rst
+debian/tmp/usr/share/apps/kppp/Rules/Switzerland/Sunrise_Freetime.rst
+debian/tmp/usr/share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst
+debian/tmp/usr/share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst
+debian/tmp/usr/share/apps/kppp/Rules/TEMPLATE
+debian/tmp/usr/share/apps/kppp/Rules/Turkey/Turk_Telekom_Internet.rst
+debian/tmp/usr/share/apps/kppp/Rules/Ukraine/IPTelecom_hourly.rst
+debian/tmp/usr/share/apps/kppp/Rules/Ukraine/NuVse_hourly.rst
+debian/tmp/usr/share/apps/kppp/Rules/Ukraine/TEMPLATE.uk
+debian/tmp/usr/share/apps/kppp/Rules/Ukraine/Utel_Unet.rst
+debian/tmp/usr/share/apps/kppp/Rules/United_Kingdom/BirminghamCable_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/United_Kingdom/BirminghamCable_National.rst
+debian/tmp/usr/share/apps/kppp/Rules/United_Kingdom/BirminghamCable_SameTelco.rst
+debian/tmp/usr/share/apps/kppp/Rules/United_Kingdom/BritishTelecom_Local.rst
+debian/tmp/usr/share/apps/kppp/Rules/United_Kingdom/BritishTelecom_National.rst
+debian/tmp/usr/share/apps/kppp/Rules/United_Kingdom/BritishTelecom_Regional.rst
+debian/tmp/usr/share/apps/kppp/Rules/United_Kingdom/British_OneTel.rst
+debian/tmp/usr/share/apps/kppp/Rules/United_Kingdom/Connaught_Telecom.rst
+debian/tmp/usr/share/apps/kppp/Rules/Uruguay/Adinet_cIVA.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/041_1xx_xxx.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/041_2xx_xxx.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/041_3xx_xxx.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/041_4xx_xxx.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/041_5xx_xxx.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/041_9xx_xxx.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/III_zona-preko_200km.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/II_zona-do_200km.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/I_zona-ista_mreza.rst
+debian/tmp/usr/share/apps/kppp/Rules/Yugoslavia/Lokalni_poziv.rst
+debian/tmp/usr/share/apps/kppp/Rules/checkrules
+debian/tmp/usr/share/apps/kppp/pics/dock_both.png
+debian/tmp/usr/share/apps/kppp/pics/dock_left.png
+debian/tmp/usr/share/apps/kppp/pics/dock_none.png
+debian/tmp/usr/share/apps/kppp/pics/dock_right.png
+debian/tmp/usr/share/apps/kppp/pics/folder.png
+debian/tmp/usr/share/apps/kppp/pics/modemboth.png
+debian/tmp/usr/share/apps/kppp/pics/modemleft.png
+debian/tmp/usr/share/apps/kppp/pics/modemnone.png
+debian/tmp/usr/share/apps/kppp/pics/modemright.png
+debian/tmp/usr/share/apps/kppp/pics/phone.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/accounting.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/callback.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/chap.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/common
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/costsgraphs.fig
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/costsgraphs.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/dialog-setup.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/getting-online.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/global-settings.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/hayes.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-account-accounting-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-account-dial-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-account-dns-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-account-execute-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-account-gateway-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-account-ip-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-account-login-script-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-config.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-device-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-dialler-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-faq.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-graph-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-misc-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-modem-tab.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp-wizard.png
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/kppp.faq.question
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/security.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/tricks.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/ttyS-cua.txt
+debian/tmp/usr/share/doc/kde/HTML/en/kppp/wizard.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kppp.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kppp.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kppp.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kppp.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kppp.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kppp.png
+
+debian/icons/kppp-16.xpm	/usr/share/pixmaps
+debian/icons/kppp.xpm		/usr/share/pixmaps
+debian/kppp-options	etc/ppp/peers/

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kppp.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kppp.lintian	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kppp.lintian	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,3 @@
+kppp: setuid-binary usr/bin/kppp 4754 root/dip
+kppp: non-standard-executable-perm usr/bin/kppplogview 0754 != 0755
+kppp: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kppp.menu
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kppp.menu	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kppp.menu	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,18 @@
+?package(kppp):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KPPP"\
+	icon32x32="/usr/share/pixmaps/kppp.xpm"\
+	icon16x16="/usr/share/pixmaps/kppp-16.xpm"\
+	command="/usr/bin/kppp"
+
+?package(kppp):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KPPP - Logview"\
+	command="/usr/bin/kppplogview"
+
+# Icon 32x32 kppp/icons/cr32-app-kppp.png kppp.xpm
+# Icon 16x16 kppp/icons/cr16-app-kppp.png kppp-16.xpm

Added: people/jriddell/KDE/3.5/kdenetwork/debian/krdc.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/krdc.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/krdc.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,40 @@
+debian/tmp/usr/bin/krdc
+debian/tmp/usr/share/applications/kde/krdc.desktop
+debian/tmp/usr/share/apps/konqueror/servicemenus/smb2rdc.desktop
+debian/tmp/usr/share/apps/krdc/pics/close.png
+debian/tmp/usr/share/apps/krdc/pics/iconify.png
+debian/tmp/usr/share/apps/krdc/pics/pindown.png
+debian/tmp/usr/share/apps/krdc/pics/pinup.png
+debian/tmp/usr/share/apps/krdc/pics/pointcursor.png
+debian/tmp/usr/share/apps/krdc/pics/pointcursormask.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/authentication.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/authentication.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/close.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/common
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/krdc_window.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/krdc_window.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/preferences_profilestab.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/preferences_profilestab.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/preferences_rdpdefaultstab.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/preferences_rdpdefaultstab.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/preferences_vncdefaultstab.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/preferences_vncdefaultstab.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/snapshot.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/snapshot.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/snapshot_connectionspeed.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/snapshot_connectionspeed.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/snapshot_nobrowse.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/snapshot_nobrowse.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/snapshot_vncentry.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/snapshot_vncentry.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/window_fullscreen.png
+debian/tmp/usr/share/doc/kde/HTML/en/krdc/window_nofullscreen.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/krdc.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/krdc.png
+debian/tmp/usr/share/services/rdp.protocol
+debian/tmp/usr/share/services/vnc.protocol
+
+debian/icons/krdc-16.xpm	/usr/share/pixmaps
+debian/icons/krdc.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdenetwork/debian/krdc.menu
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/krdc.menu	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/krdc.menu	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+?package(krdc):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="Krdc"\
+	icon32x32="/usr/share/pixmaps/krdc.xpm"\
+	icon16x16="/usr/share/pixmaps/krdc-16.xpm"\
+	command="/usr/bin/krdc"
+
+# Icon 32x32 krdc/cr32-app-krdc.png krdc.xpm
+# Icon 16x16 krdc/cr32-app-krdc.png krdc-16.xpm

Added: people/jriddell/KDE/3.5/kdenetwork/debian/krfb.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/krfb.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/krfb.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,44 @@
+debian/tmp/usr/bin/krfb
+debian/tmp/usr/bin/krfb_httpd
+debian/tmp/usr/lib/kde3/kcm_krfb.la
+debian/tmp/usr/lib/kde3/kcm_krfb.so
+debian/tmp/usr/lib/kde3/kded_kinetd.la
+debian/tmp/usr/lib/kde3/kded_kinetd.so
+debian/tmp/usr/share/applications/kde/kcmkrfb.desktop
+debian/tmp/usr/share/applications/kde/krfb.desktop
+debian/tmp/usr/share/apps/kinetd/eventsrc
+debian/tmp/usr/share/apps/krfb/eventsrc
+debian/tmp/usr/share/apps/krfb/pics/connection-side-image.png
+debian/tmp/usr/share/apps/krfb/pics/eyes-closed24.png
+debian/tmp/usr/share/apps/krfb/pics/eyes-open24.png
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/common
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/configuration_access.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/configuration_access.png
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/configuration_network.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/configuration_network.png
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/configuration_session.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/configuration_session.png
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/connection.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/connection.png
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/email_invitation.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/email_invitation.png
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/invitation_management.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/invitation_management.png
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/personal_invitation.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/personal_invitation.png
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/screenshot.eps
+debian/tmp/usr/share/doc/kde/HTML/en/krfb/screenshot.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/krfb.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/krfb.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/krfb.png
+debian/tmp/usr/share/icons/locolor/16x16/apps/krfb.png
+debian/tmp/usr/share/icons/locolor/32x32/apps/krfb.png
+debian/tmp/usr/share/services/kded/kinetd.desktop
+debian/tmp/usr/share/services/kinetd_krfb.desktop
+debian/tmp/usr/share/services/kinetd_krfb_httpd.desktop
+debian/tmp/usr/share/servicetypes/kinetdmodule.desktop
+
+debian/icons/krfb-16.xpm	/usr/share/pixmaps
+debian/icons/krfb.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdenetwork/debian/krfb.menu
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/krfb.menu	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/krfb.menu	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+?package(krfb):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="Krfb"\
+	icon32x32="/usr/share/pixmaps/krfb.xpm"\
+	icon16x16="/usr/share/pixmaps/krfb-16.xpm"\
+	command="/usr/bin/krfb"
+
+# Icon 32x32 krfb/krfb/cr32-app-krfb.png krfb.xpm
+# Icon 16x16 krfb/krfb/cr32-app-krfb.png krfb-16.xpm

Added: people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,89 @@
+debian/tmp/etc/kde3/ksircrc
+debian/tmp/usr/bin/dsirc
+debian/tmp/usr/bin/ksirc
+debian/tmp/usr/lib/kde3/ksirc.la
+debian/tmp/usr/lib/kde3/ksirc.so
+debian/tmp/usr/lib/libkdeinit_ksirc.so
+debian/tmp/usr/share/applications/kde/ksirc.desktop
+debian/tmp/usr/share/apps/ksirc/autodcc.pl
+debian/tmp/usr/share/apps/ksirc/eventsrc
+debian/tmp/usr/share/apps/ksirc/filters.pl
+debian/tmp/usr/share/apps/ksirc/icons/crystalsvg/22x22/actions/info.png
+debian/tmp/usr/share/apps/ksirc/icons/crystalsvg/22x22/actions/ksirc_dock.png
+debian/tmp/usr/share/apps/ksirc/icons/hicolor/16x16/apps/ksirc.png
+debian/tmp/usr/share/apps/ksirc/icons/hicolor/22x22/apps/ksirc.png
+debian/tmp/usr/share/apps/ksirc/icons/hicolor/32x32/apps/ksirc.png
+debian/tmp/usr/share/apps/ksirc/icons/hicolor/48x48/apps/ksirc.png
+debian/tmp/usr/share/apps/ksirc/icons/hicolor/64x64/apps/ksirc.png
+debian/tmp/usr/share/apps/ksirc/ksirc.pl
+debian/tmp/usr/share/apps/ksirc/pics/X.png
+debian/tmp/usr/share/apps/ksirc/pics/action.png
+debian/tmp/usr/share/apps/ksirc/pics/arrow.png
+debian/tmp/usr/share/apps/ksirc/pics/blueball.png
+debian/tmp/usr/share/apps/ksirc/pics/bluepin.png
+debian/tmp/usr/share/apps/ksirc/pics/bminus.png
+debian/tmp/usr/share/apps/ksirc/pics/bplus.png
+debian/tmp/usr/share/apps/ksirc/pics/channel.xpm
+debian/tmp/usr/share/apps/ksirc/pics/channels.xpm
+debian/tmp/usr/share/apps/ksirc/pics/ctcpping.png
+debian/tmp/usr/share/apps/ksirc/pics/dcc.png
+debian/tmp/usr/share/apps/ksirc/pics/dccget.png
+debian/tmp/usr/share/apps/ksirc/pics/dccsend.png
+debian/tmp/usr/share/apps/ksirc/pics/elipsis.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/biggrin.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/clown.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/cry.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/devil.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/frown.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/heart.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/loveit.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/puh.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/puh2.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/redface.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/sadley.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/slime.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/smile.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/wink.png
+debian/tmp/usr/share/apps/ksirc/pics/emoticons/yummie.png
+debian/tmp/usr/share/apps/ksirc/pics/error.png
+debian/tmp/usr/share/apps/ksirc/pics/greenpin.png
+debian/tmp/usr/share/apps/ksirc/pics/info.png
+debian/tmp/usr/share/apps/ksirc/pics/info1.png
+debian/tmp/usr/share/apps/ksirc/pics/join.png
+debian/tmp/usr/share/apps/ksirc/pics/kick.png
+debian/tmp/usr/share/apps/ksirc/pics/ksirc.png
+debian/tmp/usr/share/apps/ksirc/pics/ksirc_a.xpm
+debian/tmp/usr/share/apps/ksirc/pics/ksirc_b.xpm
+debian/tmp/usr/share/apps/ksirc/pics/madsmiley.png
+debian/tmp/usr/share/apps/ksirc/pics/mdi.png
+debian/tmp/usr/share/apps/ksirc/pics/mini-run.png
+debian/tmp/usr/share/apps/ksirc/pics/minus.png
+debian/tmp/usr/share/apps/ksirc/pics/mode.png
+debian/tmp/usr/share/apps/ksirc/pics/notice.png
+debian/tmp/usr/share/apps/ksirc/pics/ominus.png
+debian/tmp/usr/share/apps/ksirc/pics/oplus.png
+debian/tmp/usr/share/apps/ksirc/pics/part.png
+debian/tmp/usr/share/apps/ksirc/pics/plus.png
+debian/tmp/usr/share/apps/ksirc/pics/quit.png
+debian/tmp/usr/share/apps/ksirc/pics/sadsmiley.png
+debian/tmp/usr/share/apps/ksirc/pics/sdi.png
+debian/tmp/usr/share/apps/ksirc/pics/server.xpm
+debian/tmp/usr/share/apps/ksirc/pics/servinfo.png
+debian/tmp/usr/share/apps/ksirc/pics/smiley.png
+debian/tmp/usr/share/apps/ksirc/pics/star.png
+debian/tmp/usr/share/apps/ksirc/pics/topic.png
+debian/tmp/usr/share/apps/ksirc/relnotes
+debian/tmp/usr/share/apps/ksirc/servers.ini
+debian/tmp/usr/share/apps/ksirc/servers.txt
+debian/tmp/usr/share/apps/ksirc/sirc.help.gz
+debian/tmp/usr/share/doc/kde/HTML/en/ksirc/common
+debian/tmp/usr/share/doc/kde/HTML/en/ksirc/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/ksirc/index.docbook
+debian/tmp/usr/share/icons/hicolor/16x16/apps/ksirc.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/ksirc.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/ksirc.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/ksirc.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/ksirc.png
+
+debian/icons/ksirc-16.xpm	/usr/share/pixmaps
+debian/icons/ksirc.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.lintian	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.lintian	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,3 @@
+ksirc: no-shlibs-control-file usr/lib/libkdeinit_ksirc.so
+ksirc: postinst-must-call-ldconfig usr/lib/libkdeinit_ksirc.so
+ksirc: postrm-should-call-ldconfig usr/lib/libkdeinit_ksirc.so

Added: people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.menu
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.menu	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/ksirc.menu	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+?package(ksirc):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE,IRC"\
+	title="KSirc"\
+	icon32x32="/usr/share/pixmaps/ksirc.xpm"\
+	icon16x16="/usr/share/pixmaps/ksirc-16.xpm"\
+	command="/usr/bin/ksirc"
+
+# Icon 32x32 ksirc/icons/cr32-app-ksirc.png ksirc.xpm
+# Icon 16x16 ksirc/icons/cr16-app-ksirc.png ksirc-16.xpm

Added: people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,20 @@
+debian/tmp/etc/kde3/ktalkdrc
+debian/tmp/usr/bin/ktalkdlg
+debian/tmp/usr/bin/mail.local
+debian/tmp/usr/lib/kde3/kcm_ktalkd.la
+debian/tmp/usr/lib/kde3/kcm_ktalkd.so
+debian/tmp/usr/share/applications/kde/kcmktalkd.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmtalkd/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmtalkd/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmtalkd/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/ktalkd/common
+debian/tmp/usr/share/doc/kde/HTML/en/ktalkd/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/ktalkd/index.docbook
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/ktalkd.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/ktalkd.png
+debian/tmp/usr/share/icons/crystalsvg/22x22/apps/ktalkd.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/ktalkd.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/ktalkd.png
+debian/tmp/usr/share/sounds/ktalkd.wav
+
+debian/tmp/usr/bin/ktalkd	usr/sbin/

Added: people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.postinst
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.postinst	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.postinst	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,50 @@
+#! /bin/sh
+# postinst script for ktalkd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+talk_entry="talk		dgram	udp	wait	nobody.tty	/usr/sbin/tcpd	/usr/sbin/ktalkd"
+ntalk_entry="ntalk	dgram	udp	wait	nobody.tty	/usr/sbin/tcpd	/usr/sbin/ktalkd"
+
+enable_talk() {
+        update-inetd --pattern '[ \t]/usr/sbin/ktalkd' --enable talk
+        update-inetd --pattern '[ \t]/usr/sbin/ktalkd' --enable ntalk
+}
+ 
+remove_talk() {
+        update-inetd --remove 'talk[ \t].*[ \t]/usr/sbin/ktalkd'
+        update-inetd --remove 'ntalk[ \t].*[ \t]/usr/sbin/ktalkd'
+}
+
+case "$1" in
+    configure)
+      remove_talk
+      if grep -q ^talk /etc/inetd.conf; then
+        update-inetd --group BSD --add "#$talk_entry"
+        update-inetd --group BSD --add "#$ntalk_entry"
+      else
+        update-inetd --group BSD --add "$talk_entry"
+        update-inetd --group BSD --add "$ntalk_entry"
+      fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+      enable_talk
+    ;;
+
+    *)
+        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
+
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.postrm
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.postrm	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/ktalkd.postrm	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,31 @@
+#! /bin/sh
+# postrm script for ktalkd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+remove_talk() {
+        update-inetd --remove 'talk[ \t].*[ \t]/usr/sbin/ktalkd'
+        update-inetd --remove 'ntalk[ \t].*[ \t]/usr/sbin/ktalkd'
+}
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+      remove_talk
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,34 @@
+debian/tmp/usr/bin/kwifimanager
+debian/tmp/usr/lib/kde3/kcm_wifi.la
+debian/tmp/usr/lib/kde3/kcm_wifi.so
+debian/tmp/usr/lib/libkwireless.la
+debian/tmp/usr/lib/libkwireless.so
+debian/tmp/usr/share/applications/kde/kcmwifi.desktop
+debian/tmp/usr/share/applications/kde/kwifimanager.desktop
+debian/tmp/usr/share/apps/kicker/applets/kwireless.desktop
+debian/tmp/usr/share/apps/kwifimanager/kwifimanagerui.rc
+debian/tmp/usr/share/apps/kwifimanager/locations/DE_BW_Karlsruhe_University.loc
+debian/tmp/usr/share/apps/kwifimanager/locations/NOWHERE.loc
+debian/tmp/usr/share/apps/kwifimanager/pics/ad_hoc.png
+debian/tmp/usr/share/apps/kwifimanager/pics/all_alone.png
+debian/tmp/usr/share/apps/kwifimanager/pics/ap_connect.png
+debian/tmp/usr/share/apps/kwifimanager/pics/excellent.png
+debian/tmp/usr/share/apps/kwifimanager/pics/good.png
+debian/tmp/usr/share/apps/kwifimanager/pics/marginal.png
+debian/tmp/usr/share/apps/kwifimanager/pics/no_card.png
+debian/tmp/usr/share/apps/kwifimanager/pics/offline.png
+debian/tmp/usr/share/apps/kwifimanager/pics/oor_down.png
+debian/tmp/usr/share/apps/kwifimanager/pics/oor_minimum.png
+debian/tmp/usr/share/doc/kde/HTML/en/kwifimanager/common
+debian/tmp/usr/share/doc/kde/HTML/en/kwifimanager/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kwifimanager/index.docbook
+debian/tmp/usr/share/icons/hicolor/128x128/apps/kwifimanager.png
+debian/tmp/usr/share/icons/hicolor/16x16/apps/kwifimanager.png
+debian/tmp/usr/share/icons/hicolor/22x22/apps/kwifimanager.png
+debian/tmp/usr/share/icons/hicolor/32x32/apps/kwifimanager.png
+debian/tmp/usr/share/icons/hicolor/48x48/apps/kwifimanager.png
+debian/tmp/usr/share/icons/hicolor/64x64/apps/kwifimanager.png
+debian/tmp/usr/share/icons/hicolor/scalable/apps/kwifimanager.svgz
+
+debian/icons/kwifimanager-16.xpm	/usr/share/pixmaps
+debian/icons/kwifimanager.xpm		/usr/share/pixmaps

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.lintian
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.lintian	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.lintian	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,3 @@
+kwifimanager: no-shlibs-control-file usr/lib/libkwireless.so
+kwifimanager: postinst-must-call-ldconfig usr/lib/libkwireless.so
+kwifimanager: postrm-should-call-ldconfig usr/lib/libkwireless.so

Added: people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.menu
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.menu	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/kwifimanager.menu	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+?package(kwifimanager):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="KWifiManager"\
+	icon32x32="/usr/share/pixmaps/kwifimanager.xpm"\
+	icon16x16="/usr/share/pixmaps/kwifimanager-16.xpm"\
+	command="/usr/bin/kwifimanager"
+
+# Icon 32x32 wifi/cr32-app-kwifimanager.png kwifimanager.xpm
+# Icon 16x16 wifi/cr16-app-kwifimanager.png kwifimanager-16.xpm

Added: people/jriddell/KDE/3.5/kdenetwork/debian/librss1.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/librss1.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/librss1.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/librss.so.1
+debian/tmp/usr/lib/librss.so.1.0.0

Added: people/jriddell/KDE/3.5/kdenetwork/debian/lisa.docs
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/lisa.docs	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/lisa.docs	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1 @@
+lanbrowsing/lisa/README

Added: people/jriddell/KDE/3.5/kdenetwork/debian/lisa.init
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/lisa.init	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/lisa.init	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,51 @@
+#! /bin/sh
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/lisa
+NAME=lisa
+PIDFILE=/var/run/$NAME.pid
+DESC="LAN Information Server"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON \
+		> /dev/null
+	echo $(pidof lisa) > $PIDFILE
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+		--exec $DAEMON
+	rm -f $PIDFILE
+	echo "$NAME."
+	;;
+  reload|force-reload)
+	echo "Reloading $DESC configuration files."
+	start-stop-daemon --stop --quiet --signal 1 --pidfile $PIDFILE \
+		--exec $DAEMON
+	;;
+  restart)
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+		--exec $DAEMON
+	rm -f $PIDFILE
+	sleep 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON \
+		> /dev/null
+	echo $(pidof lisa) > $PIDFILE
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

Added: people/jriddell/KDE/3.5/kdenetwork/debian/lisa.install
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/lisa.install	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/lisa.install	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,23 @@
+debian/tmp/usr/lib/kde3/kcm_lanbrowser.la
+debian/tmp/usr/lib/kde3/kcm_lanbrowser.so
+debian/tmp/usr/lib/kde3/kio_lan.la
+debian/tmp/usr/lib/kde3/kio_lan.so
+debian/tmp/usr/share/applnk/.hidden/kcmkiolan.desktop
+debian/tmp/usr/share/applnk/.hidden/kcmlisa.desktop
+debian/tmp/usr/share/applnk/.hidden/kcmreslisa.desktop
+debian/tmp/usr/share/apps/konqsidebartng/virtual_folders/services/lisa.desktop
+debian/tmp/usr/share/apps/konqueror/dirtree/remote/lan.desktop
+debian/tmp/usr/share/apps/lisa/README
+debian/tmp/usr/share/apps/remoteview/lan.desktop
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/lanbrowser/common
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/lanbrowser/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/lanbrowser/index.docbook
+debian/tmp/usr/share/doc/kde/HTML/en/lisa/common
+debian/tmp/usr/share/doc/kde/HTML/en/lisa/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/lisa/index.docbook
+debian/tmp/usr/share/services/lan.protocol
+debian/tmp/usr/share/services/rlan.protocol
+
+debian/lisarc		etc/
+debian/tmp/usr/bin/lisa		usr/sbin/
+debian/tmp/usr/bin/reslisa	usr/sbin/

Added: people/jriddell/KDE/3.5/kdenetwork/debian/lisarc
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/lisarc	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/lisarc	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+PingAddresses		=	127.0.0.1/255.255.255.255;
+PingNames		= 
+AllowedAddresses	=	127.0.0.1/255.255.255.255
+BroadcastNetwork	=	127.0.0.1/255.255.255.255
+SearchUsingNmblookup	=	0	#also try nmblookup
+FirstWait		=	30	#30 hundredth seconds
+SecondWait		=	-1	#only one try
+#SecondWait		=	60	#the second time wait 0.6 seconds
+UpdatePeriod		=	300	#update after 300 secs
+DeliverUnnamedHosts	=	0	#don't publish hosts without name
+MaxPingsAtOnce		=	256	#send up to 256 pings at once

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

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/10_kppp_options.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/10_kppp_options.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/10_kppp_options.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,10 @@
+--- kdenetwork-orig/kppp/connect.cpp
++++ kdenetwork-patched/kppp/connect.cpp
+@@ -1253,6 +1253,7 @@
+   command += " " + gpppdata.speed();
+
+   command += " -detach";
++  command += " call kppp-options";
+
+   if(gpppdata.ipaddr() != "0.0.0.0" ||
+      gpppdata.gateway() != "0.0.0.0") {

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/11_dlopen-xmms.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/11_dlopen-xmms.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/11_dlopen-xmms.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,60 @@
+--- kdenetwork/kopete/plugins/nowlistening/nlxmms.h~
++++ kdenetwork/kopete/plugins/nowlistening/nlxmms.h
+@@ -31,7 +31,11 @@
+ {
+ 	public:
+ 		NLXmms();
++		~NLXmms();
+ 		virtual void update();
++
++	private:
++		void *xmmslib;
+ };
+ 
+ #endif
+--- kdenetwork/kopete/plugins/nowlistening/nlxmms.cpp~	2005-11-12 19:33:51.000000000 +0000
++++ kdenetwork/kopete/plugins/nowlistening/nlxmms.cpp	2005-11-12 19:33:54.000000000 +0000
+@@ -24,6 +24,7 @@
+ 
+ #ifdef HAVE_XMMS
+ 
++#include <dlfcn.h>
+ #include <kdebug.h>
+ #include <xmmsctrl.h> // need to fix Makefile.am for this?
+ #include "nlmediaplayer.h"
+@@ -32,13 +33,21 @@
+ NLXmms::NLXmms() : NLMediaPlayer()
+ {
+ 	m_name = "Xmms";
++
++	xmmslib = dlopen("libxmms.so.1", RTLD_LAZY | RTLD_GLOBAL);
+ }
+ 
++NLXmms::~NLXmms()
++{
++	if (xmmslib)
++		dlclose(xmmslib);
++}
+ 
+ void NLXmms::update()
+ {
+ 	//look for running xmms
+-	if ( xmms_remote_get_version( 0 ) )
++	if ( xmmslib &&
++		 xmms_remote_get_version( 0 ) )
+ 	{
+ 		QString newTrack;
+ 		// see if it's playing
+--- kdenetwork/kopete/plugins/nowlistening/Makefile.am	2005-11-12 19:30:22.000000000 +0000
++++ kdenetwork/kopete/plugins/nowlistening/Makefile.am	2005-11-12 19:32:17.000000000 +0000
+@@ -5,8 +5,8 @@
+ kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
+ 
+ kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
+-kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(XMMS_LDFLAGS) $(all_libraries)
+-kopete_nowlistening_la_LIBADD =  ../../libkopete/libkopete.la $(XMMS_LIBS)
++kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries)
++kopete_nowlistening_la_LIBADD =  ../../libkopete/libkopete.la
+ 
+ kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
+ kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/13_improve-libgadu-detection.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/13_improve-libgadu-detection.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/13_improve-libgadu-detection.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,25 @@
+--- kdenetwork/kopete/protocols/configure.in.in
++++ kdenetwork/kopete/protocols/configure.in.in
+@@ -42,8 +42,20 @@
+ 	int main()
+ 	{
+ #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
+-		int maj, min, date;
+-		sscanf( gg_libgadu_version(), "%u.%u.%u", &maj,&min,&date );
++		int maj, min, date, items;
++		const char *libgadu_version = gg_libgadu_version();
++
++		items = sscanf( libgadu_version, "%u.%u.%u", &maj,&min,&date );
++
++		if ( items != 3 ) { /* version in YYYYDDMM format only */
++			sscanf( libgadu_version, "%u", &date );
++
++			if ( date < 20040520 )
++				return 1;
++			else
++				return 0;
++		}
++
+ 		if ( maj != 1 ) {
+ 			return 1;
+ 		}

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/14_kppp_doc_pointer.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/14_kppp_doc_pointer.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/14_kppp_doc_pointer.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,13 @@
+--- kde.orig/kppp/ppplog.cpp
++++ kde.patched/kppp/ppplog.cpp
+@@ -188,7 +188,10 @@
+   }
+ 
+   if (result.isEmpty())
++  {
+     result.append(i18n("Unable to provide help."));
++    result.append("Please refer to /usr/share/doc/kppp/README.Debian for more information.");
++  }
+ }
+ 
+ 

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,16 @@
+--- krdc/rdp/rdpprefs.ui	2005-09-24 18:38:57.000000000 +0200
++++ krdc/rdp/rdpprefs.ui.new	2005-09-24 18:42:07.000000000 +0200
+@@ -191,7 +191,12 @@
+                     </item>
+                     <item>
+                         <property name="text">
+-                            <string>Croation (hr)</string>
++                            <string>Croatian (hr)</string>
++                        </property>
++                    </item>
++                    <item>
++                        <property name="text">
++                            <string>Hungarian (hu)</string>
+                         </property>
+                     </item>
+                     <item>

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/16_kopete_green_folder.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/16_kopete_green_folder.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/16_kopete_green_folder.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,25 @@
+--- kdenetwork-orig/kopete/kopete/kopetewindow.cpp
++++ kdenetwork-patched/kopete/kopete/kopetewindow.cpp
+@@ -182,7 +182,7 @@
+ 
+ 	actionShowOffliners = new KToggleAction( i18n( "Show Offline &Users" ), "viewmag", CTRL + Key_U,
+ 			this, SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" );
+-	actionShowEmptyGroups = new KToggleAction( i18n( "Show Empty &Groups" ), "folder_green", CTRL + Key_G,
++	actionShowEmptyGroups = new KToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G,
+ 			this, SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );
+ 
+ # if KDE_IS_VERSION(3,2,90)
+--- kdenetwork-orig/kopete/kopete/contactlist/kopetegroupviewitem.h
++++ kdenetwork-patched/kopete/kopete/contactlist/kopetegroupviewitem.h
+@@ -21,8 +21,8 @@
+ #include "kopetelistviewitem.h"
+ #include <qpixmap.h>
+
+-#define KOPETE_GROUP_DEFAULT_OPEN_ICON "folder_green_open"
+-#define KOPETE_GROUP_DEFAULT_CLOSED_ICON "folder_green"
++#define KOPETE_GROUP_DEFAULT_OPEN_ICON "folder_open"
++#define KOPETE_GROUP_DEFAULT_CLOSED_ICON "folder"
+
+ /**
+  * @author Olivier Goffart
+

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/17_kppp_devices.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/17_kppp_devices.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/17_kppp_devices.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,77 @@
+--- kde.orig/kppp/devices.h
++++ kde.patched/kppp/devices.h
+@@ -37,17 +37,32 @@
+   "/dev/dtyU3",
+ #elif defined (__linux__)
+   "/dev/modem",
++  "/dev/modem0",
++  "/dev/modem1",
++  "/dev/modem2",
++  "/dev/modem3",
+   "/dev/ttyS0",
+   "/dev/ttyS1",
+   "/dev/ttyS2",
+   "/dev/ttyS3",
+   "/dev/ttyS4",
+-#ifdef ISDNSUPPORT
+-  "/dev/ttyI0",
+-  "/dev/ttyI1",
+-  "/dev/ttyI2",
+-  "/dev/ttyI3",
+-#endif
++  "/dev/ttyS5",
++  "/dev/ttyS6",
++  "/dev/ttyS7",
++  "/dev/ttyS8",
++  "/dev/ttyS9",
++  "/dev/ttyS10",
++  "/dev/ttyS11",
++  "/dev/ttyS12",
++  "/dev/ttyS13",
++  "/dev/ttyS14",
++  "/dev/ttyS15",
++  "/dev/ttyS16",
++  "/dev/ttyS17",
++  "/dev/ttyACM0",
++  "/dev/ttyACM1",
++  "/dev/ttyACM2",
++  "/dev/ttyACM3",
+   "/dev/usb/ttyACM0",          /* USB stuff modems */
+   "/dev/usb/ttyACM1",
+   "/dev/usb/ttyACM2",
+@@ -64,14 +79,14 @@
+   "/dev/ttyUSB1",
+   "/dev/ttyUSB2",
+   "/dev/ttyUSB3",  
+-  "/dev/usb/tts/0",          /* USB stuff modems with devfs*/
+-  "/dev/usb/tts/1",
+-  "/dev/usb/tts/2",
+-  "/dev/usb/tts/3",
+   "/dev/rfcomm0",	       /* BlueTooth */
+   "/dev/rfcomm1",
+   "/dev/rfcomm2",
+   "/dev/rfcomm3",
++  "/dev/bluetooth/rfcomm/0",
++  "/dev/bluetooth/rfcomm/1",
++  "/dev/bluetooth/rfcomm/2",
++  "/dev/bluetooth/rfcomm/3",
+   "/dev/ircomm0",	       /* IrDA */
+   "/dev/ircomm1",
+   "/dev/ircomm2",
+@@ -80,6 +95,16 @@
+   "/dev/ttySHSF1",
+   "/dev/ttySHSF2",
+   "/dev/ttySHSF3",  /* necessary for conexant modem which use hsfserial commercial module */
++  "/dev/ttySLT0",   /* Lucent winmodem devices */
++  "/dev/ttySLT1",
++  "/dev/ttySLT2",
++  "/dev/ttySLT3",
++#ifdef ISDNSUPPORT
++  "/dev/ttyI0",
++  "/dev/ttyI1",
++  "/dev/ttyI2",
++  "/dev/ttyI3",
++#endif
+ #elif defined(__svr4__)
+   "/dev/cua/a",
+   "/dev/cua/b",

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

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

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/05_pedantic-errors.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/05_pedantic-errors.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/05_pedantic-errors.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,12 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -2144,9 +2144,6 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ kde_safe_LIBS="$LIBS"
+ LIBS="$LIBS $X_EXTRA_LIBS"
+-if test "$GXX" = "yes"; then
+-CXXFLAGS="$CXXFLAGS -pedantic-errors"
+-fi
+ AC_TRY_COMPILE([
+ $2
+ ],

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/06_disable_no_undefined.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/06_disable_no_undefined.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/common/06_disable_no_undefined.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)

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

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

Added: people/jriddell/KDE/3.5/kdenetwork/debian/patches/kubuntu_01_kmenu_changes.diff
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/patches/kubuntu_01_kmenu_changes.diff	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/patches/kubuntu_01_kmenu_changes.diff	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,33 @@
+--- kdenetwork-orig/wifi/kwifimanager.desktop	2005-03-16 22:51:10.175765744 +0000
++++ kdenetwork/wifi/kwifimanager.desktop	2005-03-16 22:53:23.163548528 +0000
+@@ -102,4 +102,4 @@
+ GenericName[uz]=Симсиз тармоқ бошқарувчиси
+ GenericName[xx]=xxWireless LAN Managerxx
+ GenericName[zh_CN]=无线局域网管理器
+-Categories=Qt;KDE;Network;X-KDE-More;
++Categories=Qt;KDE;Network;
+
+--- kdenetwork-orig/knewsticker/knewsticker-standalone.desktop	2005-03-16 22:57:07.890384856 +0000
++++ kdenetwork/knewsticker/knewsticker-standalone.desktop	2005-03-16 22:57:50.612890048 +0000
+@@ -84,3 +84,4 @@
+ X-KDE-StartupNotify=true
+ X-DCOP-ServiceType=Unique
+ Categories=Qt;KDE;Network;X-KDE-More;
++NoDisplay=true
+
+--- kdenetwork-orig/kppp/logview/kppplogview.desktop-orig	2005-03-16 23:01:48.978652944 +0000
++++ kdenetwork/kppp/logview/kppplogview.desktop	2005-03-16 23:01:58.273239952 +0000
+@@ -39,3 +39,4 @@
+ Terminal=false
+ X-DCOP-ServiceType=Multi
+ Categories=Qt;KDE;Network;X-KDE-More;
++NoDisplay=true
+
+--- kdenetwork-orig/krfb/krfb/krfb.desktop-orig	2005-03-16 23:07:58.007552024 +0000
++++ kdenetwork/krfb/krfb/krfb.desktop	2005-03-16 23:08:00.130229328 +0000
+@@ -33,4 +33,4 @@
+ GenericName[uk]=Спільні стільниці
+ GenericName[xx]=xxDesktop Sharingxx
+ GenericName[zh_CN]=桌面共享
+-Categories=Qt;KDE;System;
++Categories=Qt;KDE;Network;

Added: people/jriddell/KDE/3.5/kdenetwork/debian/rules
===================================================================
--- people/jriddell/KDE/3.5/kdenetwork/debian/rules	2005-11-12 17:31:48 UTC (rev 2224)
+++ people/jriddell/KDE/3.5/kdenetwork/debian/rules	2005-11-12 20:32:22 UTC (rev 2225)
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-qt-kde.mk
+include debian/cdbs/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+PACKAGES_WITH_LIBS := librss1 kopete ksirc kwifimanager
+
+DEB_DH_MAKESHLIBS_ARGS_librss1	:= -V'librss1 (>= 4:3.4.3-1)'
+DEB_DH_MAKESHLIBS_ARGS_kopete	:= -V'kopete (>= 4:3.4.3-1)'
+
+###
+
+GCC4_ICES_HERE := arm m68k hppa
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+ifneq (,$(findstring $(DEB_BUILD_ARCH),$(GCC4_ICES_HERE)))
+    export CC=gcc-3.4
+    export CPP=cpp-3.4
+    export CXX=g++-3.4
+endif
+
+###
+
+#shlibs_ver = 4:3.4.3-1
+#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+
+DEB_FIXPERMS_EXCLUDE := usr/bin/kppp usr/bin/kppplogview \
+	etc/ppp/peers/kppp-options
+
+DOC_HTML_PRUNE := kcontrol
+
+binary-install/kppp::
+	chown root:dip debian/kppp/usr/bin/kppp*
+	chown root:dip debian/kppp/etc/ppp/peers/kppp-options
+	chmod 4754 debian/kppp/usr/bin/kppp
+	chmod 0754 debian/kppp/usr/bin/kppplogview
+	chmod 0640 debian/kppp/etc/ppp/peers/kppp-options


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




More information about the pkg-kde-commits mailing list