9 files changed, 6 insertions, 352 deletions
diff --git a/admin b/admin
-Subproject 85116532467b2bb4c73caf54c106c91a22dbe37
+Subproject 12bb2cad8e2982bd842d168158e391d6c12fb6a
diff --git a/kdat/main.cpp b/kdat/main.cpp
index a2d55ea..e8f377e 100644
--- a/kdat/main.cpp
+++ b/kdat/main.cpp
@@ -29,7 +29,7 @@
 #include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kcrash.h>
+#include <tdecrash.h>
 #include <tdemessagebox.h>
 
 #include <signal.h>
diff --git a/knetworkconf/backends/guess_system.sh b/knetworkconf/backends/guess_system.sh
index 056f283..5faca78 100755
--- a/knetworkconf/backends/guess_system.sh
+++ b/knetworkconf/backends/guess_system.sh
@@ -68,61 +68,6 @@ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.globl main
-	.ent main
-main:
-	.frame \$30,0,\$26,0
-	.prologue 0
-	.long 0x47e03d80 # implver $0
-	lda \$2,259
-	.long 0x47e20c21 # amask $2,$1
-	srl \$1,8,\$2
-	sll \$2,2,\$2
-	sll \$0,3,\$0
-	addl \$1,\$0,\$0
-	addl \$2,\$0,\$0
-	ret \$31,(\$26),1
-	.end main
-EOF
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		./$dummy
-		case "$?" in
-			7)
-				UNAME_MACHINE="alpha"
-				;;
-			15)
-				UNAME_MACHINE="alphaev5"
-				;;
-			14)
-				UNAME_MACHINE="alphaev56"
-				;;
-			10)
-				UNAME_MACHINE="alphapca56"
-				;;
-			16)
-				UNAME_MACHINE="alphaev6"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
@@ -504,19 +449,6 @@ EOF
     *9??*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i?86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
@@ -868,9 +800,6 @@ EOF
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
diff --git a/knetworkconf/backends/type1inst b/knetworkconf/backends/type1inst
index 86d6425..ed88f9d 100755
--- a/knetworkconf/backends/type1inst
+++ b/knetworkconf/backends/type1inst
@@ -216,7 +216,6 @@ $copyright = "Copyright (C) 1996-1998 James Macnicol ($emailaddress)";
 	      "ep:expert",
 	      "exp:expert",
 	      "ornaments:ornaments",
-	      "osf:oldstylefigures",
 	      "outline:outline",
 	      "sc:smallcaps",
 	      "shaded:shaded",
diff --git a/knetworkconf/knetworkconf-mdk.spec b/knetworkconf/knetworkconf-mdk.spec
deleted file mode 100644
index 8c1e88f..0000000
--- a/knetworkconf/knetworkconf-mdk.spec
+++ /dev/null
@@ -1,159 +0,0 @@
-%define name knetworkconf
-%define version 0.6.1
-%define release 1mdk
-#%define _unpackaged_files_terminate_build 0
-
-Summary:   	A Trinity Control Center Module to configure Network settings.
-Name:      	%{name}
-Version:   	%{version}
-Release:   	%{release}
-License: 	GPL
-Url:       	http://www.merlinux.org/knetworkconf/
-Group:     	Networking/Other
-Source:    	%{name}-%{version}.tar.bz2
-BuildRoot:  %{_tmppath}/%{name}-buildroot
-Requires: 	%_bindir/tdesu
-Patch1:		knetworkconf-0.6-fix-menu.patch.bz2
-
-%description
-KNetworkConf is a Trinity Control Center module to configure  the Network 
-settings in a Linux machine. I developed it because I couldn't find any
-application to do this from within KDE, and I think this is a "must have" 
-app for a serious Desktop Enviroment like KDE.
-KNetworkConf can configure installed network devices (you can't
-add new ones for now), the default gateway,host and domain names,
-add/remove DNS servers and add/remove static hosts. 
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-
-%setup -q 
-%patch1 -p0 -b .fix_menu
-
-%build
-make -f Makefile.cvs
-TQTDIR=%qtdir
-export LD_LIBRARY_PATH=$TQTDIR/%_lib:$LD_LIBRARY_PATH
-
-# Search for qt/kde libraries in the right directories (avoid patch)
-# NOTE: please don't regenerate configure scripts below
-perl -pi -e "s@/lib(\"|\b[^/])@/%_lib\1@g if /(kde|qt)_(libdirs|libraries)=/" configure
-
-
-%{?__cputoolize: %{__cputoolize} }
-
-
-%ifarch %ix86
-CFLAGS="%optflags" CXXFLAGS="`echo %optflags |sed -e 's/-fomit-frame-pointer//'`" \
-%else
-CFLAGS="%optflags" CXXFLAGS="%optflags" \
-%endif
-	%configure --disable-debug
-
-%make
-
-%install
-
-%makeinstall_std
-
-%find_lang %name
-
-mkdir -p %buildroot/{%_miconsdir,%{_prefix}/share/pixmaps/}
-install -m 644 %{name}/lo16-app-%{name}.png %buildroot/%{_miconsdir}/%{name}.png
-install -m 644 %{name}/lo32-app-%{name}.png %buildroot/%{_iconsdir}/%{name}.png
-install -m 644 %{name}/network_card.png %buildroot/%{_prefix}/share/pixmaps/network_card.png
-
-mkdir -p %{buildroot}/%{_menudir}
-kdedesktop2mdkmenu.pl %{name} System/Configuration/KDE/Network  $RPM_BUILD_ROOT%{_datadir}/applications/tde/kcm_knetworkconfmodule.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
-
-
-%post
-/sbin/ldconfig
-%{update_menus}
-
-%postun
-/sbin/ldconfig
-%{clean_menus}
-
-%clean
-rm -rf $RPM_BUILD_ROOT/*
-
-%files -f %name.lang
-
-#Quick Hack: for some reason the %find_lang command doesn't find 
-#the translations files, it outputs a knetworkconf.lang file full
-#of empty lines instead of the following ones:
-%lang(de) /usr/share/locale/de/LC_MESSAGES/knetworkconfmodule.mo
-%lang(es) /usr/share/locale/es/LC_MESSAGES/knetworkconfmodule.mo
-%lang(eu) /usr/share/locale/eu/LC_MESSAGES/knetworkconfmodule.mo
-%lang(fr) /usr/share/locale/fr/LC_MESSAGES/knetworkconfmodule.mo
-%lang(hu) /usr/share/locale/hu/LC_MESSAGES/knetworkconfmodule.mo
-%lang(no) /usr/share/locale/no/LC_MESSAGES/knetworkconfmodule.mo
-%lang(pl) /usr/share/locale/pl/LC_MESSAGES/knetworkconfmodule.mo
-%lang(pt_BR) /usr/share/locale/pt_BR/LC_MESSAGES/knetworkconfmodule.mo
-
-%defattr(-,root,root,0755)
-%doc README COPYING AUTHORS LEAME
-
-%{_libdir}/menu/*
-
-%{_libdir}/trinity/*.la
-%{_libdir}/trinity/*.so
-%{_libdir}/pkgconfig/*.pc
-%{_iconsdir}/*.png
-%{_miconsdir}/%{name}.png
-%_datadir/applications/tde/*.desktop
-%_datadir/pixmaps/network_card.png
-
-%_datadir/icons/locolor/16x16/apps/*.png
-%_datadir/icons/locolor/22x22/apps/*.png
-%_datadir/icons/locolor/32x32/apps/*.png
-%_datadir/icons/hicolor/22x22/actions/*.png
-
-#%dir %_docdir/HTML/en/%{name}/
-%_docdir/HTML/en/%{name}/
-#%dir %_docdir/HTML/de/%{name}/
-%_docdir/HTML/de/%{name}/
-#%dir %_docdir/HTML/es/%{name}/
-%_docdir/HTML/es/%{name}/
-
-%dir %_datadir/apps/%{name}/backends/
-%_datadir/apps/%{name}/backends/*
-
-%dir %_datadir/apps/%{name}/pixmaps/
-%_datadir/apps/%{name}/pixmaps/*.png
-
-
-%changelog
-* Sun Feb 20 2005 Juan Luis Baptiste <juan.baptiste@kdemail.net> 0.6.1-1mdk
-- 0.6.1
-
-* Tue Feb 08 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-3mdk
-- Fix section
-
-* Thu Sep 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-2mdk
-- Fix menu
-
-* Tue Aug 10 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.6-1mdk
-- from Juan Luis Baptiste <juan.baptiste@kdemail.net> :
-	- 0.6
-
-* Tue Jun 15 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.5-2mdk
-- rebuild
-
-* Thu Feb 26 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.5-1mdk
-- 0.5
-
-* Thu Oct 02 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4.2-1mdk
-- 0.4.2
-
-* Fri Jul 18 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.4.1-2mdk
-- Rebuild
-
-* Thu Apr 10 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4.1-1mdk
-- 0.4.1
-- find lang macro
-
-* Fri Mar 28 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4-1mdk
-- from Juan Luis Baptiste <juancho@linuxmail.org> :
-	- Initial release.
diff --git a/knetworkconf/knetworkconf.spec b/knetworkconf/knetworkconf.spec
deleted file mode 100644
index 11b0d5c..0000000
--- a/knetworkconf/knetworkconf.spec
+++ /dev/null
@@ -1,110 +0,0 @@
-# This spec file was generated using Kpp
-# If you find any problems with this spec file please report
-# the error to ian geiser <geiseri@msoe.edu>
-%define name knetworkconf
-%define version 0.5
-%define release 1mdk
-
-Summary:   A KDE application to configure TCP/IP settings.
-Name:      %{name}
-Version:   %{version}
-Release:   %{release}
-License: GPL
-Url:       http://www.merlinux.org/knetworkconf/
-Group:     Networking/Other
-Source:    %{name}-%{version}.tar.bz2
-BuildRoot:  %{_tmppath}/%{name}-buildroot
-Requires: %_bindir/tdesu
-
-%description
-KNetworkConf is a KDE application to configure  TCP/IP settings
-in a Linux machine. I developed it because I couldn't find any
-application to configure TCP/IP settings from within KDE, and I
-think this is a "must have" app for a serious Desktop Enviroment
-like KDE.
-KNetworkConf can configure installed network devices (you can't
-add new ones for now), the default gateway,host and domain names,
-and add/remove DNS servers. This first version is a standalone
-application, but the idea is to make it a Trinity Control Center
-module and a KApplet to have a fast access to it from the KDE
-panel.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-
-%setup 
-
-./configure --prefix=%_prefix --mandir=%_mandir --datadir=%_datadir --libdir=%_libdir
-
-%build
-
-%make
-
-%install
-#icons
-mkdir -p %buildroot/{%_miconsdir,%{_prefix}/share/pixmaps/}
-#cd $RPM_BUILD_DIR/%{name}-%{version}
-install -m 644 %{name}/lo16-app-%{name}.png %buildroot/%{_miconsdir}/%{name}.png
-install -m 644 %{name}/lo32-app-%{name}.png %buildroot/%{_iconsdir}/%{name}.png
-install -m 644 %{name}/network_card.png %buildroot/%{_prefix}/share/pixmaps/network_card.png
-
-# Menu
-mkdir -p %buildroot/%_menudir
-cat <<EOF > %buildroot/%_menudir/%name  
-?package(%name): command="tdesu %_bindir/%name" needs="X11" \
-icon="%name.png" section="Configuration/Networking" \
-title="KNetworkConf" longtitle="Configure TCP/IP settings under KDE"
-EOF
-
-make DESTDIR=$RPM_BUILD_ROOT bitsdata=$RPM_BUILD_ROOT/%{_datadir} bitssysconf=$RPM_BUILD_ROOT/%{_sysconfdir} install
-
-%find_lang %name
-
-%post
-%{update_menus}
-
-%postun
-%{clean_menus}
-
-%clean
-rm -rf $RPM_BUILD_ROOT/*
-
-
-%files -f %name.lang
-%defattr(-,root,root,0755)
-%doc README COPYING AUTHORS LEAME
-%{_libdir}/menu/*
-%{_bindir}/knetworkconf
-%{_iconsdir}/*.png
-%{_miconsdir}/%{name}.png
-%_datadir/pixmaps/network_card.png
-%_datadir/applnk-mdk/Configuration/Networking/*
-%_datadir/applnk/System/*
-#%_datadir/applnk/Internet/*
-%_datadir/icons/locolor/16x16/apps/*
-%_datadir/icons/locolor/32x32/apps/*
-%_docdir/HTML/en/knetworkconf
-%_docdir/HTML/de/knetworkconf
-%_docdir/HTML/es/knetworkconf
-%_datadir/apps/knetworkconf/backends/*
-%_datadir/apps/knetworkconf/pixmaps/*
-%{_libdir}/pkgconfig/system-tools-backends.pc
-
-
-%changelog
-* Sun Feb 22 2004 Juan Luis Baptiste <juan.baptiste@kdemail.net> 0.5-1mdk
-- 0.5
-
-* Thu Oct 02 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4.2-1mdk
-- 0.4.2
-
-* Fri Jul 18 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.4.1-2mdk
-- Rebuild
-
-* Thu Apr 10 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4.1-1mdk
-- 0.4.1
-- find lang macro
-
-* Fri Mar 28 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4-1mdk
-- from Juan Luis Baptiste <juancho@linuxmail.org> :
-	- Initial release.
diff --git a/kpackage/kpPty.cpp b/kpackage/kpPty.cpp
index af34fbf..12f15ec 100644
--- a/kpackage/kpPty.cpp
+++ b/kpackage/kpPty.cpp
@@ -50,7 +50,7 @@ extern Opts *opts;
 //////////////////////////////////////////////////////////////////////////////
 
 kpKProcIO::kpKProcIO ( TQTextCodec *_codec)
-  : KProcIO(_codec)
+  : TDEProcIO(_codec)
 {
 }
 
@@ -78,7 +78,7 @@ kpPty::kpPty() : TQObject()
   pty = new kpKProcIO();
   pty->setUsePty(TDEProcess::All, false);
 
-  connect(pty, TQ_SIGNAL(readReady(KProcIO *)), this,
+  connect(pty, TQ_SIGNAL(readReady(TDEProcIO *)), this,
 		   TQ_SLOT(readLines()));
   connect(pty, TQ_SIGNAL(processExited(TDEProcess *)), this,
 		   TQ_SLOT(done()));
diff --git a/kpackage/kpPty.h b/kpackage/kpPty.h
index 3c26180..35ba413 100644
--- a/kpackage/kpPty.h
+++ b/kpackage/kpPty.h
@@ -33,11 +33,11 @@
 #include <tqtextcodec.h> 
 #include <tqmap.h>
 
-#include <kprocio.h>
+#include <tdeprocio.h>
 
 //////////////////////////////////////////////////////////////////////////////
 
-class kpKProcIO: public KProcIO
+class kpKProcIO: public TDEProcIO
 {
    TQ_OBJECT
   
diff --git a/tdefile-plugins/rpm/tdefile_rpm.cpp b/tdefile-plugins/rpm/tdefile_rpm.cpp
index 3adb742..777600f 100644
--- a/tdefile-plugins/rpm/tdefile_rpm.cpp
+++ b/tdefile-plugins/rpm/tdefile_rpm.cpp
@@ -22,15 +22,10 @@
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <tqfile.h>
+#include "tdefile_rpm.h"
 
-#if !defined(__osf__)
 #include <inttypes.h>
-#else
-typedef unsigned short uint16_t;
-typedef unsigned int   uint32_t;
-#endif
 
-#include "tdefile_rpm.h"
 
 typedef KGenericFactory<KRpmPlugin> RpmFactory;