Hello community, here is the log from the commit of package kdeadmin3 checked in at Tue Aug 1 16:54:23 CEST 2006. -------- --- KDE/kdeadmin3/kdeadmin3.changes 2006-06-14 22:53:16.000000000 +0200 +++ kdeadmin3/kdeadmin3.changes 2006-07-28 15:06:08.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 23 22:16:22 CEST 2006 - coolo@suse.de + +- update to KDE 3.5.4: + * several fixes in knetworkconf module + +------------------------------------------------------------------- Old: ---- kdeadmin-3.5.3.tar.bz2 New: ---- kdeadmin-3.5.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeadmin3.spec ++++++ --- /var/tmp/diff_new_pack.eNLbue/_old 2006-08-01 16:54:15.000000000 +0200 +++ /var/tmp/diff_new_pack.eNLbue/_new 2006-08-01 16:54:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeadmin3 (Version 3.5.3) +# spec file for package kdeadmin3 (Version 3.5.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ Group: System/GUI/KDE Summary: KDE System Administration BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 3.5.3 -Release: 3 +Version: 3.5.4 +Release: 1 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) URL: http://www.kde.org Source0: kdeadmin-%{version}.tar.bz2 @@ -90,6 +90,9 @@ /opt/kde3/%_lib/* %changelog -n kdeadmin3 +* Sun Jul 23 2006 - coolo@suse.de +- update to KDE 3.5.4: + * several fixes in knetworkconf module * Wed Jun 14 2006 - dmueller@suse.de - build parallel * Wed May 24 2006 - stbinner@suse.de ++++++ kdeadmin-3.5.3.tar.bz2 -> kdeadmin-3.5.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/acinclude.m4 new/kdeadmin-3.5.4/acinclude.m4 --- old/kdeadmin-3.5.3/acinclude.m4 2006-05-24 06:47:54.000000000 +0200 +++ new/kdeadmin-3.5.4/acinclude.m4 2006-07-24 16:55:01.000000000 +0200 @@ -2747,7 +2747,7 @@ EXRSTATUS=old else kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" + LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/admin/acinclude.m4.in new/kdeadmin-3.5.4/admin/acinclude.m4.in --- old/kdeadmin-3.5.3/admin/acinclude.m4.in 2006-05-23 14:52:51.000000000 +0200 +++ new/kdeadmin-3.5.4/admin/acinclude.m4.in 2006-07-24 09:07:21.000000000 +0200 @@ -2747,7 +2747,7 @@ EXRSTATUS=old else kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" + LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/admin/cvs.sh new/kdeadmin-3.5.4/admin/cvs.sh --- old/kdeadmin-3.5.3/admin/cvs.sh 2006-05-23 14:52:51.000000000 +0200 +++ new/kdeadmin-3.5.4/admin/cvs.sh 2006-07-24 09:07:21.000000000 +0200 @@ -32,7 +32,7 @@ required_autoconf_version="2.53 or newer" AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; + Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." echo "*** KDE requires autoconf $required_autoconf_version" @@ -47,7 +47,7 @@ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; + Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." echo "*** KDE requires autoheader $required_autoconf_version" @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.3\"" + VERSION="\"3.5.4\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/configure new/kdeadmin-3.5.4/configure --- old/kdeadmin-3.5.3/configure 2006-05-24 06:48:28.000000000 +0200 +++ new/kdeadmin-3.5.4/configure 2006-07-24 16:55:34.000000000 +0200 @@ -1964,7 +1964,7 @@ # Define the identity of the package. PACKAGE=kdeadmin - VERSION="3.5.3" + VERSION="3.5.4" cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/configure.in new/kdeadmin-3.5.4/configure.in --- old/kdeadmin-3.5.3/configure.in 2006-05-24 06:47:55.000000000 +0200 +++ new/kdeadmin-3.5.4/configure.in 2006-07-24 16:55:01.000000000 +0200 @@ -40,7 +40,7 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(kdeadmin, "3.5.3") dnl searches for some needed programs +AM_INIT_AUTOMAKE(kdeadmin, "3.5.4") dnl searches for some needed programs KDE_SET_PREFIX Binary files old/kdeadmin-3.5.3/doc/kcron/index.cache.bz2 and new/kdeadmin-3.5.4/doc/kcron/index.cache.bz2 differ Binary files old/kdeadmin-3.5.3/doc/kdat/index.cache.bz2 and new/kdeadmin-3.5.4/doc/kdat/index.cache.bz2 differ Binary files old/kdeadmin-3.5.3/doc/knetworkconf/index.cache.bz2 and new/kdeadmin-3.5.4/doc/knetworkconf/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/doc/knetworkconf/index.docbook new/kdeadmin-3.5.4/doc/knetworkconf/index.docbook --- old/kdeadmin-3.5.3/doc/knetworkconf/index.docbook 2005-09-10 10:14:30.000000000 +0200 +++ new/kdeadmin-3.5.4/doc/knetworkconf/index.docbook 2006-07-22 10:08:13.000000000 +0200 @@ -25,7 +25,7 @@ <firstname>Christoph</firstname> <surname>Eckert</surname> <affiliation> -<address><email>mchristoph.eckert.at.t-online.de</email></address> +<address><email>ce.at.christeck.de</email></address> </affiliation> </author> @@ -61,18 +61,17 @@ </revhistory> --> <date>2005-03-24</date> -<releaseinfo><!-- FIXME: Keep this synched with the current version of --> -<!-- &kappname; --></releaseinfo> +<releaseinfo>1.0</releaseinfo> <abstract> -<para>This manual explains how to install and use &kappname;, a module for -&kcontrol; that enables management of Network Interfaces, Routing and DNS +<para>This manual explains how to install and use &knetworkconf;, a module for +&kcontrolcenter; that enables management of Network Interfaces, Routing and DNS properties.</para> </abstract> <keywordset> <keyword>KDE</keyword> -<keyword>Package-this-will-be-in</keyword> +<keyword>kdeadmin</keyword> <keyword>network</keyword> <keyword>ethernet</keyword> </keywordset> @@ -81,15 +80,15 @@ <chapter id="introduction"> <title>Introduction</title> -<para>The &kcontrolcenter; (&kcontrol;) provides users with a single +<para>The &kcontrolcenter; (&kcontrolcenter;) provides users with a single integrated interface from which to manage a wide variety of system and -desktop settings and preferences. &kcontrol; can be started by selecting +desktop settings and preferences. &kcontrolcenter; can be started by selecting <menuchoice><guimenu>K Menu</guimenu><guimenuitem>Control Center</guimenuitem></menuchoice>.</para> -<para>The &kappname; package was developed to enable users to manage TCP/IP +<para>The &knetworkconf; package was developed to enable users to manage TCP/IP networking settings in the same way they manage other system settings from -&kcontrol;. Tasks enabled by &kappname; provide users with a simple +&kcontrolcenter;. Tasks enabled by &knetworkconf; provide users with a simple interface from which to perform the following tasks:</para> <itemizedlist> @@ -117,28 +116,28 @@ </itemizedlist> <para>Once installed a new module called <guibutton>Network -Settings</guibutton> is displayed in the &kcontrol; <guibutton>Internet & +Settings</guibutton> is displayed in the &kcontrolcenter; <guibutton>Internet & Network</guibutton> module group. To start the <application>Network -Settings</application> (&kappname;) module select <menuchoice> +Settings</application> (&knetworkconf;) module select <menuchoice> <guibutton>Index</guibutton> <guimenu>Internet & Network</guimenu> <guimenuitem>Network Settings</guimenuitem> </menuchoice>.</para> <mediaobject> <imageobject> -<imagedata fileref="figures/knetwork-conf-kcontrol-user-mode.png" format="PNG"/> +<imagedata fileref="11.png" format="PNG"/> </imageobject> <textobject> -<phrase>&kappname; in user mode</phrase> +<phrase>&knetworkconf; in user mode</phrase> </textobject> </mediaobject> -<para>It is important to understand that &kappname; cannot install +<para>It is important to understand that &knetworkconf; cannot install networking hardware. As such physical devices and their drivers must be -properly installed and configured in order for &kappname; to display the -device and enable management of networking properties.</para> +properly installed and configured in order for &knetworkconf; to display the +device and enable management of networking properties.</para> <para>In most cases drivers for networking hardware and other devices are -installed and configured while installing Linux. If you add networking +installed and configured while installing &Linux;. If you add networking hardware after installation, you will have to define the drivers to be loaded by editing one of the following files depending on your kernel version:</para> @@ -170,10 +169,20 @@ <para>The <application>Network Settings</application> module is loaded when the <guibutton>Network Settings</guibutton> option is selected in the -&kcontrol; index. When started the <application>Network +&kcontrolcenter; index. When started the <application>Network Settings</application> module attempts to automatically detect the platform running on the system.</para> +<screenshot> +<screeninfo>Detecting the platform</screeninfo> +<mediaobject> +<imageobject> +<imagedata fileref="02.png" +format="PNG"/> +</imageobject> +</mediaobject> +</screenshot> + <para>When the platform is not a recognized you will be prompted to manually select the platform. Select a platform from the list that most closely corresponds to your distro and its release. Check the <guibutton>Don't ask @@ -181,7 +190,8 @@ <guibutton>Network Settings</guibutton> is started the system will automatically default to the selected platform option.</para> -<screenshot> +<!--FIXME: several screenshots that were linked in this doc are missing--> +<!--screenshot> <screeninfo>Selecting a platform</screeninfo> <mediaobject> <imageobject> @@ -192,7 +202,7 @@ <phrase>Selecting a platform</phrase> </textobject> </mediaobject> -</screenshot> +</screenshot--> <para>To manage the system network settings you must enter <quote>administrator mode.</quote> Prior to this all options will be @@ -202,14 +212,14 @@ left of the module. Enter your password when prompted.</para> <screenshot> -<screeninfo>&kappname; in administrator mode</screeninfo> +<screeninfo>&knetworkconf; in administrator mode</screeninfo> <mediaobject> <imageobject> -<imagedata fileref="figures/knetwork-conf-runasroot.png" +<imagedata fileref="01.png" format="PNG"/> </imageobject> <textobject> -<phrase>&kappname; in administrator mode</phrase> +<phrase>&knetworkconf; in administrator mode</phrase> </textobject> </mediaobject> </screenshot> @@ -264,11 +274,11 @@ <mediaobject> <imageobject> <imagedata -fileref="figures/knetwork-conf-kcontrol-interface.png" +fileref="03.png" format="PNG"/> </imageobject> <textobject> -<phrase>The &kappname; interface</phrase> +<phrase>The &knetworkconf; interface</phrase> </textobject> </mediaobject> @@ -324,7 +334,7 @@ <mediaobject> <imageobject> <imagedata -fileref="figures/knetwork-conf-kcontrol-eth-configure.png" +fileref="04.png" format="PNG"/> </imageobject> <textobject> @@ -339,7 +349,7 @@ <mediaobject> <imageobject> -<imagedata fileref="figures/knetwork-conf-kcontrol-eth-configure-advanced.png" +<imagedata fileref="05.png" format="PNG"/> </imageobject> <textobject> @@ -439,6 +449,16 @@ <para>The <guibutton>Routes</guibutton> tab enables management of the system routing configuration.</para> +<mediaobject> +<imageobject> +<imagedata fileref="06.png" +format="PNG"/> +</imageobject> +<textobject> +<phrase>Advanced device configuration</phrase> +</textobject> +</mediaobject> + <variablelist> <varlistentry> <term><guilabel>Default Gateway</guilabel></term> @@ -465,6 +485,16 @@ <para>The <guibutton>Domain Name System</guibutton> tab enables management of the system DNS configuration.</para> +<mediaobject> +<imageobject> +<imagedata fileref="07.png" +format="PNG"/> +</imageobject> +<textobject> +<phrase>Advanced device configuration</phrase> +</textobject> +</mediaobject> + <variablelist> <varlistentry> <term><guilabel>Host name</guilabel></term> @@ -516,14 +546,14 @@ <para>From the <guilabel>Domain Name Servers</guilabel> group click the <guibutton>Add</guibutton> button. The <interface>Add new DNS</interface> dialog is displayed.</para> -<mediaobject> +<!--mediaobject> <imageobject> <imagedata fileref="knetwork-conf-kcontrol-add-dns.png" format="PNG"/> </imageobject> <textobject><phrase>Adding a DNS server</phrase></textobject> -</mediaobject> +</mediaobject--> </step> <step> @@ -542,7 +572,7 @@ <mediaobject> <imageobject> <imagedata -fileref="knetwork-conf-kcontrol-add-editdns.png" +fileref="09.png" format="PNG"/> </imageobject> <textobject> @@ -575,20 +605,20 @@ <step> <para>Click the <guibutton>Add</guibutton> button. The <interface>Add new Static host</interface> dialog is displayed.</para> -<mediaobject> +<!--mediaobject> <imageobject> <imagedata fileref="figures/knetwork-conf-kcontrol-statichost.png" format="PNG"/> </imageobject> <textobject><phrase>Adding static hosts</phrase></textobject> -</mediaobject> +</mediaobject--> </step> <step> <para>Enter the IP-address of the known host then click <guibutton>Add</guibutton>. The <interface>Add New Alias</interface> is displayed.</para> -<mediaobject> +<!--mediaobject> <imageobject> <imagedata fileref="knetwork-conf-kcontrol-statichost-add.png" @@ -597,7 +627,7 @@ <textobject> <phrase>Adding a static host</phrase> </textobject> -</mediaobject> +</mediaobject--> </step> <step> <para>Enter the name of the known host then click the @@ -617,7 +647,7 @@ <para>Select a static host record from the list, then click the <guibutton>Edit</guibutton> button. The <interface>Edit Static Host</interface> dialog is displayed.</para> -<mediaobject> +<!--mediaobject> <imageobject> <imagedata fileref="figures/knetwork-conf-kcontrol-statichost-record-edit.png" @@ -626,7 +656,7 @@ <textobject> <phrase>Editing static hosts</phrase> </textobject> -</mediaobject> +</mediaobject--> </step> <step> <para>Perform any of the following tasks, then click @@ -660,7 +690,7 @@ <para>Changes made via the <application>Network Settings</application> module are not automatically applied to the system environment. To apply the -changes made, start <application>Konsole</application> and execute the +changes made, start &konsole; and execute the following command.</para> <screen> @@ -675,7 +705,7 @@ <sect1 id="requirements"> <title>Requirements</title> -<para>You need KDE 3.x and QT 3.x installed to use knetwork-conf. </para> +<para>You need &kde; 3.x and QT 3.x installed to use knetwork-conf. </para> <para>knetwork-conf can be used with the following platforms: </para> <itemizedlist> @@ -698,7 +728,7 @@ <para>Gentoo</para> </listitem> <listitem> -<para>Mandrake</para> +<para>&Mandrake;</para> </listitem> <listitem> <para>PLD</para> @@ -707,10 +737,10 @@ <para>OpenNA</para> </listitem> <listitem> -<para>Red Hat</para> +<para>&RedHat;</para> </listitem> <listitem> -<para>SuSE</para> +<para>&SuSE;</para> </listitem> </itemizedlist> </sect1> @@ -728,9 +758,9 @@ <title>Installing binaries</title> <para>When using the binary distributions (most often rpm packages), it is -enough to have the KDE and QT binaries installed. </para> <para>Installing +enough to have the &kde; and QT binaries installed. </para> <para>Installing binaries is recommended for less experienced users. Simply download the rpm -packages. Install them from <application>Konsole</application> using +packages. Install them from &konsole; using <application>RPM</application> as follows:</para> <para> @@ -745,11 +775,11 @@ <sect1 id="compilation-and-installation"> <title>Compilation and Installation</title> -<para>In this case, it is not enough to have the binaries of QT and KDE +<para>In this case, it is not enough to have the binaries of QT and &kde; installed; you also need the development packages which include libraries and other stuff. </para> -<para>Recommended for advanced users only. Otherwise, compiling &kappname; +<para>Recommended for advanced users only. Otherwise, compiling &knetworkconf; is not difficult. The following commands should do it.</para> <screen> @@ -772,7 +802,7 @@ <para>In the first section of this chapter, you'll find some valuable information about networking basics. In the second, all configuration files -on your disk which can be changed by &kappname; will be discussed. </para> +on your disk which can be changed by &knetworkconf; will be discussed. </para> <sect1 id="networking-overview"> <title>IPv4 Networking</title> @@ -836,7 +866,7 @@ <para>Furthermore, the netmask is most often set to 255.255.255.0, so that all of these machines are members of the same subnet. </para> -<para>Some addresses are reserved for special things, e.g. 0.0.0.0 and +<para>Some addresses are reserved for special things, ⪚ 0.0.0.0 and 127.0.0.1. The first one is the so called default route, the second the loopback address. The default route is needed by IP routing. </para> @@ -865,7 +895,7 @@ <title>Configuration files</title> <para>In this section you'll find the configuration files which are touched -by &kappname; and where they reside in the filesystem of the different +by &knetworkconf; and where they reside in the file system of the different distributions. </para> <sect2 id="resolv.conf"> @@ -904,11 +934,11 @@ </row> <row> <entry>Gentoo</entry> -<entry></entry> +<entry>2005.0</entry> <entry>/etc/resolv.conf</entry> </row> <row> -<entry>Mandrake</entry> +<entry>&Mandrake;</entry> <entry>9.2</entry> <entry>/etc/resolv.conf</entry> </row> @@ -923,12 +953,12 @@ <entry>/etc/resolv.conf</entry> </row> <row> -<entry>Red Hat</entry> +<entry>&RedHat;</entry> <entry>9.0</entry> <entry>/etc/resolv.conf</entry> </row> <row> -<entry>SuSE</entry> +<entry>&SuSE;</entry> <entry>9.0</entry> <entry>/etc/resolv.conf</entry> </row> @@ -982,7 +1012,7 @@ <entry>/etc/hosts</entry> </row> <row> -<entry>Mandrake</entry> +<entry>&Mandrake;</entry> <entry>9.2</entry> <entry>/etc/hosts</entry> </row> @@ -997,12 +1027,12 @@ <entry>/etc/hosts</entry> </row> <row> -<entry>Red Hat</entry> +<entry>&RedHat;</entry> <entry>9.0</entry> <entry>/etc/hosts</entry> </row> <row> -<entry>SuSE</entry> +<entry>&SuSE;</entry> <entry>9.0</entry> <entry>/etc/hosts</entry> </row> @@ -1010,7 +1040,7 @@ </tgroup> </table> -<para>On SuSE it is known that this file gets occasionally resorted by the +<para>On &SuSE; it is known that this file gets occasionally resorted by the script SuSEconfig. So do not wonder if you do not find in a state you have expected. </para> </sect2> Binary files old/kdeadmin-3.5.3/doc/kpackage/index.cache.bz2 and new/kdeadmin-3.5.4/doc/kpackage/index.cache.bz2 differ Binary files old/kdeadmin-3.5.3/doc/ksysv/index.cache.bz2 and new/kdeadmin-3.5.4/doc/ksysv/index.cache.bz2 differ Binary files old/kdeadmin-3.5.3/doc/kuser/index.cache.bz2 and new/kdeadmin-3.5.4/doc/kuser/index.cache.bz2 differ Binary files old/kdeadmin-3.5.3/doc/lilo-config/index.cache.bz2 and new/kdeadmin-3.5.4/doc/lilo-config/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/kcron/main.cpp new/kdeadmin-3.5.4/kcron/main.cpp --- old/kdeadmin-3.5.3/kcron/main.cpp 2005-09-10 10:14:36.000000000 +0200 +++ new/kdeadmin-3.5.4/kcron/main.cpp 2006-07-22 10:08:14.000000000 +0200 @@ -30,8 +30,7 @@ KCmdLineArgs::init(argc, argv, &aboutData); - KApplication app(&aboutData); - + KApplication app; if (app.isRestored()) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/kdeadmin.lsm new/kdeadmin-3.5.4/kdeadmin.lsm --- old/kdeadmin-3.5.3/kdeadmin.lsm 2006-05-23 13:18:12.000000000 +0200 +++ new/kdeadmin-3.5.4/kdeadmin.lsm 2006-07-23 16:06:27.000000000 +0200 @@ -1,7 +1,7 @@ Begin4 Title: kdeadmin -Version: 3.5.3 -Entered-date: 2006-05-23 +Version: 3.5.4 +Entered-date: 2006-08-02 Description: Administrative GUIs written for the K Desktop Environment (KDE) Keywords: KDE X11 desktop Qt Author: http://bugs.kde.org/ (KDE Bugtracking System) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/kfile-plugins/deb/kfile_deb.desktop new/kdeadmin-3.5.4/kfile-plugins/deb/kfile_deb.desktop --- old/kdeadmin-3.5.3/kfile-plugins/deb/kfile_deb.desktop 2006-05-22 20:00:32.000000000 +0200 +++ new/kdeadmin-3.5.4/kfile-plugins/deb/kfile_deb.desktop 2006-07-22 10:08:13.000000000 +0200 @@ -55,6 +55,7 @@ Name[wa]=Sitatistikes DEB Name[zh_CN]=DEB 统计 Name[zh_HK]=DEB 統計 +Name[zh_TW]=DEB 統計 ServiceTypes=KFilePlugin X-KDE-Library=kfile_deb MimeType=application/x-deb diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/kfile-plugins/rpm/kfile_rpm.desktop new/kdeadmin-3.5.4/kfile-plugins/rpm/kfile_rpm.desktop --- old/kdeadmin-3.5.3/kfile-plugins/rpm/kfile_rpm.desktop 2006-05-22 20:00:32.000000000 +0200 +++ new/kdeadmin-3.5.4/kfile-plugins/rpm/kfile_rpm.desktop 2006-07-22 10:08:13.000000000 +0200 @@ -56,6 +56,7 @@ Name[wa]=Sitatistikes RPM Name[zh_CN]=RPM 统计 Name[zh_HK]=RPM 統計 +Name[zh_TW]=RPM 統計 ServiceTypes=KFilePlugin X-KDE-Library=kfile_rpm MimeType=application/x-rpm diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/backends/network-conf.in new/kdeadmin-3.5.4/knetworkconf/backends/network-conf.in --- old/kdeadmin-3.5.3/knetworkconf/backends/network-conf.in 2006-05-22 20:00:32.000000000 +0200 +++ new/kdeadmin-3.5.4/knetworkconf/backends/network-conf.in 2006-07-22 10:08:14.000000000 +0200 @@ -71,7 +71,7 @@ "debian-2.2", "debian-3.0", "debian-sarge", "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "suse-7.0", "suse-9.0", "suse-9.1", - "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "rpath", + "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "pld-1.0", "pld-1.1", "pld-1.99", "conectiva-9", "conectiva-10", "vine-3.0", "vine-3.1", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/backends/network.pl.in new/kdeadmin-3.5.4/knetworkconf/backends/network.pl.in --- old/kdeadmin-3.5.3/knetworkconf/backends/network.pl.in 2006-05-22 20:00:32.000000000 +0200 +++ new/kdeadmin-3.5.4/knetworkconf/backends/network.pl.in 2006-07-22 10:08:14.000000000 +0200 @@ -523,6 +523,7 @@ "fedora-2" => "redhat-6.2", "fedora-3" => "redhat-6.2", "fedora-4" => "redhat-6.2", + "fedora-5" => "redhat-6.2", "rpath" => "redhat-6.2", "vine-3.0" => "redhat-6.2", "vine-3.1" => "redhat-6.2", @@ -1827,6 +1828,7 @@ "fedora-2" => \&gst_network_rh72_get_file, "fedora-3" => \&gst_network_rh72_get_file, "fedora-4" => \&gst_network_rh72_get_file, + "fedora-5" => \&gst_network_rh72_get_file, "rpath" => \&gst_network_rh72_get_file, "vine-3.0" => \&gst_network_rh62_get_file, "vine-3.1" => \&gst_network_rh62_get_file, @@ -3947,6 +3949,7 @@ "fedora-2" => "", "fedora-3" => "", "fedora-4" => "", + "fedora-5" => "", "rpath" => "", "vine-3.0" => "lo", "vine-3.1" => "lo", @@ -4112,6 +4115,7 @@ "fedora-2" => "redhat-7.2", "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", + "fedora-5" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", @@ -4533,6 +4537,7 @@ "fedora-2" => "redhat-7.2", "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", + "fedora-5" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", @@ -5371,6 +5376,7 @@ "fedora-2" => "redhat-7.2", "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", + "fedora-5" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", @@ -5777,6 +5783,7 @@ "fedora-2" => "redhat-7.2", "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", + "fedora-5" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/backends/platform.pl.in new/kdeadmin-3.5.4/knetworkconf/backends/platform.pl.in --- old/kdeadmin-3.5.3/knetworkconf/backends/platform.pl.in 2006-05-22 20:00:32.000000000 +0200 +++ new/kdeadmin-3.5.4/knetworkconf/backends/platform.pl.in 2006-07-22 10:08:14.000000000 +0200 @@ -96,6 +96,7 @@ "fedora-2" => "Fedora Core 2 (Tettnang)", "fedora-3" => "Fedora Core 3 (Heidelberg)", "fedora-4" => "Fedora Core 4 (Stentz)", + "fedora-5" => "Fedora Core 5 (Bordeaux)", "rpath" => "rPath Linux", "ark" => "Ark Linux", }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/backends/service.pl.in new/kdeadmin-3.5.4/knetworkconf/backends/service.pl.in --- old/kdeadmin-3.5.3/knetworkconf/backends/service.pl.in 2006-05-22 20:00:32.000000000 +0200 +++ new/kdeadmin-3.5.4/knetworkconf/backends/service.pl.in 2006-07-22 10:08:14.000000000 +0200 @@ -99,6 +99,7 @@ "fedora-2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], "fedora-3" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], "fedora-4" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "fedora-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], "rpath" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], "vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], @@ -169,6 +170,7 @@ "fedora-2" => [3, 5], "fedora-3" => [3, 5], "fedora-4" => [3, 5], + "fedora-5" => [3, 5], "rpath" => [3, 5], "vine-3.0" => [3, 5], @@ -236,6 +238,7 @@ "fedora-2" => "redhat-5.2", "fedora-3" => "redhat-5.2", "fedora-4" => "redhat-5.2", + "fedora-5" => "redhat-5.2", "rpath" => "redhat-5.2", "vine-3.0" => "redhat-5.2", @@ -1713,6 +1716,7 @@ "fedora-2" => \&gst_service_redhat_get_status, "fedora-3" => \&gst_service_redhat_get_status, "fedora-4" => \&gst_service_redhat_get_status, + "fedora-5" => \&gst_service_redhat_get_status, "rpath" => \&gst_service_redhat_get_status, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h new/kdeadmin-3.5.4/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h --- old/kdeadmin-3.5.3/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h 2005-09-10 10:14:31.000000000 +0200 +++ new/kdeadmin-3.5.4/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h 2006-07-22 10:08:14.000000000 +0200 @@ -30,15 +30,6 @@ void KAddDNSServerDlg::validateAddressSlot() { - if (addingAlias && kleNewServer->text() !="") - { - _modified2 = true; - close(); - } - else - { - KMessageBox::error(this,i18n("You have to type an alias first."),i18n("Invalid Text")); - } if (!addingAlias) { if (KAddressValidator::isValidIPAddress(kleNewServer->text())) @@ -51,6 +42,18 @@ KMessageBox::error(this,i18n("The format of the specified IP address is not valid."),i18n("Invalid IP Address")); } } + else + { + if (kleNewServer->text() !="") + { + _modified2 = true; + close(); + } + else + { + KMessageBox::error(this,i18n("You have to type an alias first."),i18n("Invalid Text")); + } + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/knetworkconf/kaddressvalidator.cpp new/kdeadmin-3.5.4/knetworkconf/knetworkconf/kaddressvalidator.cpp --- old/kdeadmin-3.5.3/knetworkconf/knetworkconf/kaddressvalidator.cpp 2005-09-10 10:14:31.000000000 +0200 +++ new/kdeadmin-3.5.4/knetworkconf/knetworkconf/kaddressvalidator.cpp 2006-07-22 10:08:14.000000000 +0200 @@ -43,7 +43,7 @@ return false; if ((i == 0) && (number == 0)) return false; - if ((number < 0) || (number >= 255)) + if ((number < 0) || (number > 255)) return false; if ((i == 3) && (number == 0)) return false; @@ -188,6 +188,8 @@ struct in_addr _addr, _netmask, _network; int prefix = 0; QString s; + if (addr.isNull() || netmask.isNull()) + return NULL; //bad address if (!inet_pton(AF_INET,addr.latin1(),&_addr)) return NULL; //bad address else @@ -214,6 +216,8 @@ struct in_addr _addr, _netmask, _network; int prefix = 0; QString s; + if (addr.isNull() || netmask.isNull()) + return NULL; //bad address if (!inet_pton(AF_INET,addr.latin1(),&_addr)) return NULL; //bad address else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop new/kdeadmin-3.5.4/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop --- old/kdeadmin-3.5.3/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2006-05-22 20:00:32.000000000 +0200 +++ new/kdeadmin-3.5.4/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop 2006-07-22 10:08:14.000000000 +0200 @@ -42,6 +42,8 @@ Comment[pt]=Configurar Opções de Rede Comment[pt_BR]=Configurar rede Comment[ru]=Утилита настройки сети +Comment[se]=Heivet fierpmádaga +Comment[sk]=Konfigurácia sieťových nastavení Comment[sl]=Nastavite omrežne nastavitve Comment[sr]=Подешавање поставки мреже Comment[sr@Latn]=Podešavanje postavki mreže @@ -49,6 +51,7 @@ Comment[uk]=Налаштувати мережні параметри Comment[zh_CN]=配置网络设置 Comment[zh_HK]=設定網絡設置 +Comment[zh_TW]=設定網路 Terminal=false Name=Network Settings Name[bg]=Мрежови настройки @@ -81,6 +84,8 @@ Name[pt]=Configuração da Rede Name[pt_BR]=Configurações de Rede Name[ru]=Настройка сети +Name[se]=Fierpmádatheivehusat +Name[sk]=Sieťové nastavenia Name[sl]=Omrežne nastavitve Name[sr]=Поставке мреже Name[sr@Latn]=Postavke mreže @@ -88,6 +93,7 @@ Name[uk]=Мережні параметри Name[zh_CN]=网络设置 Name[zh_HK]=網絡設置 +Name[zh_TW]=網路設定 Keywords=Network,DNS,routes,interfaces Keywords[bg]=мрежа, рутер, интерфейс, мрежова, карта, Network, DNS, routes, interfaces Keywords[br]=Rouedad,DNS,hentoù,etrefasoù @@ -116,6 +122,7 @@ Keywords[pl]=sieć,Internet,DNS,trasy,routowanie,rutowanie,interfejsy Keywords[pt]=rede,DNS,rotas,interfaces Keywords[pt_BR]=Rede,DNS,rotas,interfaces +Keywords[se]=Fierpmádat,DNS,routes,lavttat Keywords[sl]=Network,DNS,routes,interfaces,omrežje,vmesniki,poti,usmerjanje Keywords[sr]=Мрежа,DNS,руте,интерфејси Keywords[sr@Latn]=Mreža,DNS,rute,interfejsi @@ -123,3 +130,4 @@ Keywords[uk]=Network,DNS,routes,interfaces,мережа,інтерфейси Keywords[zh_CN]=Network,DNS,routes,interfaces,网络,路由,接口 Keywords[zh_HK]=Network,DNS,routes,interfaces,網絡,路由,介面 +Keywords[zh_TW]=網路,DNS,路由,介面 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/knetworkconf/knetworkconf.cpp new/kdeadmin-3.5.4/knetworkconf/knetworkconf/knetworkconf.cpp --- old/kdeadmin-3.5.3/knetworkconf/knetworkconf/knetworkconf.cpp 2006-01-19 17:20:14.000000000 +0100 +++ new/kdeadmin-3.5.4/knetworkconf/knetworkconf/knetworkconf.cpp 2006-07-22 10:08:14.000000000 +0200 @@ -352,7 +352,7 @@ //If the interface is wireless, then save the wireless configuration options if (dev->getType() == WIRELESS_IFACE_TYPE){ wifiDev->setEssid(configDlg.extDlg->kleEssid->text()); - wifiDev->setWepKey(configDlg.extDlg->kleWepKey->text()); + wifiDev->setWepKey(configDlg.extDlg->kleWepKey->password()); wifiDev->setKeyType(configDlg.extDlg->qcbKeyType->currentText()); dev = wifiDev; } @@ -824,6 +824,16 @@ void KNetworkConf::enableInterfaceSlot() { + if (modified) { + if (KMessageBox::warningContinueCancel(this, + i18n("The new configuration has not been saved.\nApply changes?"), + i18n("New Configuration Not Saved"), + KStdGuiItem::apply()) == KMessageBox::Continue) + saveInfoSlot(); + else + return; + } + KNetworkInterface *dev = getDeviceInfo(klvCardList->currentItem()->text(0)); if (dev->isActive()) changeDeviceState(dev->getDeviceName(),DEVICE_DOWN); @@ -833,6 +843,16 @@ void KNetworkConf::disableInterfaceSlot() { + if (modified) { + if (KMessageBox::warningContinueCancel(this, + i18n("The new configuration has not been saved.\nApply changes?"), + i18n("New Configuration Not Saved"), + KStdGuiItem::apply()) == KMessageBox::Continue) + saveInfoSlot(); + else + return; + } + KNetworkInterface *dev = getDeviceInfo(klvCardList->currentItem()->text(0)); if (dev->isActive()) changeDeviceState(dev->getDeviceName(),DEVICE_DOWN); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/knetworkconf/knetworkconf.desktop new/kdeadmin-3.5.4/knetworkconf/knetworkconf/knetworkconf.desktop --- old/kdeadmin-3.5.3/knetworkconf/knetworkconf/knetworkconf.desktop 2006-05-22 20:00:32.000000000 +0200 +++ new/kdeadmin-3.5.4/knetworkconf/knetworkconf/knetworkconf.desktop 2006-07-22 10:08:14.000000000 +0200 @@ -36,6 +36,8 @@ Comment[pt]=Configurar opções TCP/IP Comment[pt_BR]=Configura os ajustes TCP/IP Comment[ru]=Настройка параметров TCP/IP +Comment[se]=Heivet TCP/IP:a +Comment[sk]=Konfigurácia nastavení TCP/IP Comment[sl]=Nastavite TCP/IP nastavitve Comment[sr]=Подесите TCP/IP поставке Comment[sr@Latn]=Podesite TCP/IP postavke @@ -43,6 +45,7 @@ Comment[uk]=Налаштувати параметри TCP/IP Comment[zh_CN]=配置 TCP/IP 设置 Comment[zh_HK]=設定 TCP/IP 設置 +Comment[zh_TW]=設定 TCP/IP Terminal=false Name=KNetworkConf Name[bn]=কে-নেটওয়ার্ক-কন্ফ @@ -80,6 +83,8 @@ GenericName[pt]=Configurar opções TCP/IP GenericName[pt_BR]=Configura os ajustes TCP/IP GenericName[ru]=Конфигурация TCP/IP +GenericName[se]=Heivet TCP/IP:a +GenericName[sk]=Konfigurácia nastavení TCP/IP GenericName[sl]=Nastavite TCP/IP nastavitve GenericName[sr]=Подеси TCP/IP поставке GenericName[sr@Latn]=Podesi TCP/IP postavke @@ -87,3 +92,4 @@ GenericName[uk]=Налаштувати параметри TCP/IP GenericName[zh_CN]=配置 TCP/IP 设置 GenericName[zh_HK]=設定 TCP/IP 設置 +GenericName[zh_TW]=設定 TCP/IP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/knetworkconf/knetworkconf/knetworkconfigparser.cpp new/kdeadmin-3.5.4/knetworkconf/knetworkconf/knetworkconfigparser.cpp --- old/kdeadmin-3.5.3/knetworkconf/knetworkconf/knetworkconfigparser.cpp 2006-01-19 17:20:14.000000000 +0100 +++ new/kdeadmin-3.5.4/knetworkconf/knetworkconf/knetworkconfigparser.cpp 2006-07-22 10:08:14.000000000 +0200 @@ -220,6 +220,8 @@ QString dec2 = ""; QString temp = ""; QString temp2 = ""; + +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN temp = hex.mid(6,2); temp2 = temp2.setNum(temp.toInt(&ok,16)); dec.append(temp2); @@ -235,6 +237,23 @@ temp = hex.mid(0,2); temp2 = temp2.setNum(temp.toInt(&ok,16)); dec.append(temp2); +#else + temp = hex.mid(0,2); + temp2 = temp2.setNum(temp.toInt(&ok,16)); + dec.append(temp2); + dec.append('.'); + temp = hex.mid(2,2); + temp2 = temp2.setNum(temp.toInt(&ok,16)); + dec.append(temp2); + dec.append('.'); + temp = hex.mid(4,2); + temp2 = temp2.setNum(temp.toInt(&ok,16)); + dec.append(temp2); + dec.append('.'); + temp = hex.mid(6,2); + temp2 = temp2.setNum(temp.toInt(&ok,16)); + dec.append(temp2); +#endif dec2 = dec; if (ok) @@ -355,6 +374,10 @@ while ( (device = devIt.current()) != 0 ) { ++devIt; + // if protocol is not specified, then should not have entry in config + if (device->getBootProto().isEmpty()) + continue; + QDomElement tag = doc->createElement( "interface" ); tag.setAttribute("type",device->getType()); root->appendChild( tag ); @@ -741,12 +764,6 @@ tempDevice->setDescription(i18n("Wireless Network Device")); } - //If the backend reports that the interface is up (even if it isn't true), - //and the interface doesn't have an IP address assgined it means that effectively - //the interface is down and should be marked as inactive. - if (tempDevice->isActive() && tempDevice->getIpAddress().isEmpty()) - tempDevice->setActive(false); - //Clear IP address settings if boot protocol is dhcp or bootp, in case that they are //setted in the config files. if ((tempDevice->getBootProto().lower() == "dhcp") || (tempDevice->getBootProto().lower() == "bootp")) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/ksysv/ksysv.desktop new/kdeadmin-3.5.4/ksysv/ksysv.desktop --- old/kdeadmin-3.5.3/ksysv/ksysv.desktop 2006-05-22 20:00:31.000000000 +0200 +++ new/kdeadmin-3.5.4/ksysv/ksysv.desktop 2006-07-22 10:08:13.000000000 +0200 @@ -34,6 +34,8 @@ GenericName[pt_BR]=Editor do SysV-Init GenericName[ro]=Manager de servicii SysV GenericName[ru]=Редактор сценариев SysV +GenericName[se]=Sysv-init-doaimmaheapmi +GenericName[sk]=SysV-Init editor GenericName[sl]=Urejevalnik začetnih nastavitev SysV GenericName[sr]=Уређивач SysV-init-а GenericName[sr@Latn]=Uređivač SysV-init-a @@ -42,6 +44,7 @@ GenericName[uk]=Редактор KSysV-Init GenericName[zh_CN]=SysV Init 编辑器 GenericName[zh_HK]=SysV-Init 編輯器 +GenericName[zh_TW]=SysV-Init 編輯器 MimeType= Exec=ksysv -caption "%c" %i %m Icon=ksysv diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/ksysv/x-ksysv-log.desktop new/kdeadmin-3.5.4/ksysv/x-ksysv-log.desktop --- old/kdeadmin-3.5.3/ksysv/x-ksysv-log.desktop 2006-05-22 20:00:31.000000000 +0200 +++ new/kdeadmin-3.5.4/ksysv/x-ksysv-log.desktop 2006-07-22 10:08:13.000000000 +0200 @@ -53,6 +53,7 @@ Comment[wa]=Fitchî djournå di l' aspougneu po SysV-Init Comment[zh_CN]=SysV-Init 编辑器记录文件 Comment[zh_HK]=SysV-Init 編輯器記錄檔案 +Comment[zh_TW]=SysV Init 編輯器記錄檔案 Icon=ksysv Type=MimeType MimeType=text/x-ksysv-log diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.5.3/lilo-config/kde/lilo.desktop new/kdeadmin-3.5.4/lilo-config/kde/lilo.desktop --- old/kdeadmin-3.5.3/lilo-config/kde/lilo.desktop 2006-05-22 20:00:31.000000000 +0200 +++ new/kdeadmin-3.5.4/lilo-config/kde/lilo.desktop 2006-07-22 10:08:13.000000000 +0200 @@ -131,6 +131,7 @@ Comment[xh]=Qwalalsela LILO (umphathi we boot ye Linux) Comment[zh_CN]=配置 LILO (Linux 启动管理程序) Comment[zh_HK]=設定 LILO (Linux 的開機管理員) +Comment[zh_TW]=你可在此設定 LILO (Linux 的開機管理程式) Keywords=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start Keywords[az]=lilo,açılış,başlanğıc,açılış idarəçisi,linuks,digər əməliyyat sistemləri, MBR ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de