[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kdenetwork/FC-3 kdenetwork-3.3-cvs.patch, 1.1, 1.2 kdenetwork.spec, 1.46, 1.47 kdenetwork-3.3.1-kopete-gadu.patch, 1.1, NONE



Author: than

Update of /cvs/dist/rpms/kdenetwork/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv25796

Modified Files:
	kdenetwork-3.3-cvs.patch kdenetwork.spec 
Removed Files:
	kdenetwork-3.3.1-kopete-gadu.patch 
Log Message:
clean patch files


kdenetwork-3.3-cvs.patch:
 dcoprss/rssservice.desktop                                           |    3 
 filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop              |   11 -
 filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop |   12 +
 filesharing/simple/fileshare.desktop                                 |   16 +
 kdict/applet/kdictapplet.desktop                                     |    4 
 kdict/kdict.desktop                                                  |    1 
 kget/kget.desktop                                                    |    3 
 kget/kmainwidget.cpp                                                 |    5 
 kget/x-kgetlist.desktop                                              |    1 
 knewsticker/eventsrc                                                 |    6 
 knewsticker/knewsticker-standalone.desktop                           |    1 
 knewsticker/knewsticker.cpp                                          |    2 
 knewsticker/knewsticker.desktop                                      |    1 
 knewsticker/knewstickerstub/knewstickerstub.desktop                  |   10 -
 knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop            |    1 
 kopete/kopete/chatwindow/chatview.cpp                                |    8 
 kopete/kopete/chatwindow/chatwindow.desktop                          |    4 
 kopete/kopete/chatwindow/kopetechatwindow.cpp                        |    2 
 kopete/kopete/chatwindow/kopeteemailwindow.cpp                       |    3 
 kopete/kopete/config/accounts/kopete_accountconfig.desktop           |    5 
 kopete/kopete/config/appearance/appearanceconfig.cpp                 |    6 
 kopete/kopete/config/appearance/kopete_appearanceconfig.desktop      |    5 
 kopete/kopete/config/behavior/kopete_behaviorconfig.desktop          |    5 
 kopete/kopete/config/plugins/kopetepluginconfig.cpp                  |    5 
 kopete/kopete/config/plugins/kopetepluginconfig.h                    |    2 
 kopete/kopete/contactlist/kopetelistview.cpp                         |   13 -
 kopete/kopete/eventsrc                                               |   90 +++++++--
 kopete/kopete/kopete.desktop                                         |    6 
 kopete/kopete/kopetewindow.cpp                                       |    5 
 kopete/kopete/main.cpp                                               |    2 
 kopete/kopete/x-kopete-emoticons.desktop                             |    5 
 kopete/libkopete/compat/kresolver.cpp                                |    3 
 kopete/libkopete/compat/kresolvermanager.cpp                         |    2 
 kopete/libkopete/compat/ksockssocketdevice.cpp                       |    8 
 kopete/libkopete/kopetecontactlist.cpp                               |    9 
 kopete/libkopete/kopetegroup.cpp                                     |    5 
 kopete/libkopete/kopetemessagemanagerfactory.cpp                     |    5 
 kopete/libkopete/kopetemessagemanagerfactory.h                       |    3 
 kopete/libkopete/kopeteplugin.desktop                                |    4 
 kopete/libkopete/kopeteprotocol.desktop                              |    4 
 kopete/libkopete/kopeteui.desktop                                    |    4 
 kopete/libkopete/kopetexsl.cpp                                       |   27 ++
 kopete/libkopete/ui/accountselector.cpp                              |    1 
 kopete/libkopete/ui/kopetefileconfirmdialog.cpp                      |    6 
 kopete/plugins/alias/kopete_alias.desktop                            |    5 
 kopete/plugins/alias/kopete_alias_config.desktop                     |    5 
 kopete/plugins/autoreplace/kopete_autoreplace.desktop                |    8 
 kopete/plugins/autoreplace/kopete_autoreplace_config.desktop         |    8 
 kopete/plugins/connectionstatus/kopete_connectionstatus.desktop      |    4 
 kopete/plugins/contactnotes/kopete_contactnotes.desktop              |    4 
 kopete/plugins/cryptography/kopete_cryptography.desktop              |    4 
 kopete/plugins/cryptography/kopete_cryptography_config.desktop       |    4 
 kopete/plugins/highlight/kopete_highlight.desktop                    |    6 
 kopete/plugins/highlight/kopete_highlight_config.desktop             |    6 
 kopete/plugins/history/kopete_history.desktop                        |    5 
 kopete/plugins/history/kopete_history_config.desktop                 |    7 
 kopete/plugins/latex/kopete_latex.desktop                            |    6 
 kopete/plugins/latex/kopete_latex_config.desktop                     |    4 
 kopete/plugins/motionautoaway/kopete_motionaway.desktop              |    2 
 kopete/plugins/motionautoaway/kopete_motionaway_config.desktop       |    2 
 kopete/plugins/msginfo/kopete_msginfo.desktop                        |    5 
 kopete/plugins/netmeeting/kopete_netmeeting.desktop                  |    3 
 kopete/plugins/nowlistening/kopete_nowlistening.desktop              |    4 
 kopete/plugins/nowlistening/kopete_nowlistening_config.desktop       |    4 
 kopete/plugins/texteffect/kopete_texteffect.desktop                  |    6 
 kopete/plugins/texteffect/kopete_texteffect_config.desktop           |    6 
 kopete/plugins/translator/kopete_translator.desktop                  |    6 
 kopete/plugins/translator/kopete_translator_config.desktop           |    4 
 kopete/plugins/webpresence/kopete_webpresence.desktop                |    4 
 kopete/plugins/webpresence/kopete_webpresence_config.desktop         |    4 
 kopete/protocols/gadu/kopete_gadu.desktop                            |    2 
 kopete/protocols/gadu/libgadu/common.c                               |   89 +++++++-
 kopete/protocols/gadu/libgadu/compat.h                               |    2 
 kopete/protocols/gadu/libgadu/dcc.c                                  |    2 
 kopete/protocols/gadu/libgadu/events.c                               |   85 +++++---
 kopete/protocols/gadu/libgadu/http.c                                 |   13 -
 kopete/protocols/gadu/libgadu/libgadu.c                              |   99 +++++++---
 kopete/protocols/gadu/libgadu/libgadu.h                              |    6 
 kopete/protocols/gadu/libgadu/pubdir.c                               |    6 
 kopete/protocols/gadu/libgadu/pubdir50.c                             |    2 
 kopete/protocols/groupwise/kopete_groupwise.desktop                  |    6 
 kopete/protocols/irc/kopete_irc.desktop                              |    2 
 kopete/protocols/irc/ui/channellist.cpp                              |    1 
 kopete/protocols/jabber/kopete_jabber.desktop                        |    2 
 kopete/protocols/msn/config/kopete_msn_config.desktop                |    6 
 kopete/protocols/msn/kopete_msn.desktop                              |    4 
 kopete/protocols/oscar/aim/kopete_aim.desktop                        |    2 
 kopete/protocols/oscar/icq/kopete_icq.desktop                        |    2 
 kopete/protocols/oscar/icq/x-icq.desktop                             |    4 
 kopete/protocols/oscar/oscarsocket/oscarconnection.cpp               |    7 
 kopete/protocols/oscar/oscarsocket/oscarsocket.aim.cpp               |    2 
 kopete/protocols/sms/kopete_sms.desktop                              |    2 
 kopete/protocols/testbed/kopete_testbed.desktop                      |    3 
 kopete/protocols/winpopup/config/kopete_wp_config.desktop            |    5 
 kopete/protocols/winpopup/kopete_wp.desktop                          |    3 
 kopete/protocols/yahoo/kopete_yahoo.desktop                          |    2 
 kpf/kpfapplet.desktop                                                |    1 
 kpf/kpfpropertiesdialogplugin.desktop                                |    6 
 kppp/ChangeLog                                                       |    4 
 kppp/DB/Provider/Belarus/.directory                                  |    2 
 kppp/DB/Provider/France/.directory                                   |    1 
 kppp/DB/Provider/Ireland/.directory                                  |    2 
 kppp/DB/Provider/Slovenia/.directory                                 |    1 
 kppp/DB/Provider/Switzerland/.directory                              |    1 
 kppp/DB/Provider/United_Kingdom/.directory                           |    1 
 kppp/DB/Provider/Yugoslavia/.directory                               |    1 
 kppp/Kppp.desktop                                                    |    6 
 kppp/Rules/Italy/Wind_Urbana_1088_Light.rst                          |    2 
 kppp/edit.cpp                                                        |    3 
 kppp/general.h                                                       |    3 
 kppp/logview/export.cpp                                              |    2 
 kppp/logview/kppplogview.desktop                                     |    1 
 kppp/modems.cpp                                                      |    7 
 kppp/modems.h                                                        |    1 
 krdc/krdc.desktop                                                    |    1 
 krfb/kcm_krfb/kcmkrfb.desktop                                        |    5 
 krfb/kinetd/eventsrc                                                 |    5 
 krfb/kinetd/kinetd.desktop                                           |    2 
 krfb/kinetd/kinetdmodule.desktop                                     |    1 
 krfb/krfb/eventsrc                                                   |   23 ++
 krfb/krfb/kinetd_krfb.desktop                                        |    2 
 krfb/krfb/krfb.desktop                                               |    3 
 krfb/krfb_httpd/kinetd_krfb_httpd.desktop                            |    1 
 ksirc/KSOpenkSirc/open_ksirc.cpp                                     |    9 
 ksirc/eventsrc                                                       |    6 
 ksirc/ksirc.desktop                                                  |    1 
 ktalkd/kcmktalkd/kcmktalkd.desktop                                   |    4 
 lanbrowsing/kcmlisa/kcmkiolan.desktop                                |    1 
 lanbrowsing/kcmlisa/kcmlisa.desktop                                  |    4 
 lanbrowsing/kcmlisa/kcmreslisa.desktop                               |    4 
 lanbrowsing/kio_lan/lan.desktop                                      |    2 
 lanbrowsing/kio_lan/lisa.desktop                                     |    4 
 wifi/Makefile.am                                                     |    7 
 wifi/interface_wireless.cpp                                          |    8 
 wifi/interface_wireless.h                                            |    9 
 wifi/interface_wireless_wirelessextensions.cpp                       |    5 
 wifi/interface_wireless_wirelessextensions.h                         |    5 
 wifi/kcmwifi/kcmwifi.desktop                                         |    5 
 wifi/kwifimanager.cpp                                                |    7 
 wifi/kwifimanager.desktop                                            |    5 
 wifi/kwireless/kwireless.desktop                                     |    2 
 wifi/status.cpp                                                      |    6 
 142 files changed, 790 insertions(+), 201 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 kdenetwork-3.3-cvs.patch
Index: kdenetwork-3.3-cvs.patch
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-3/kdenetwork-3.3-cvs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdenetwork-3.3-cvs.patch	15 Mar 2005 11:48:42 -0000	1.1
+++ kdenetwork-3.3-cvs.patch	22 Jul 2005 09:59:28 -0000	1.2
@@ -1,85 +1,6 @@
-diff -Nur kdenetwork-3.3.1/admin/acinclude.m4.in kdenetwork-3.3-cvs/admin/acinclude.m4.in
---- kdenetwork-3.3.1/admin/acinclude.m4.in	2004-10-03 09:42:56.000000000 +0200
-+++ kdenetwork-3.3-cvs/admin/acinclude.m4.in	2005-03-15 11:36:19.982809000 +0100
-@@ -3983,14 +3983,49 @@
- 
- AC_DEFUN([KDE_CHECK_LIBPTHREAD],
- [
--  AC_MSG_CHECKING([for pthread_create in -lpthread])
--  kde_safe_libs=$LIBS
--  LIBS="$LIBS -lpthread"
--  AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
--      AC_MSG_RESULT(yes)
--      LIBPTHREAD="-lpthread"],[
--      AC_MSG_RESULT(no)])
--  LIBS=$kde_safe_libs
-+  dnl This code is here specifically to handle the
-+  dnl various flavors of threading library on FreeBSD
-+  dnl 4-, 5-, and 6-, and the (weird) rules around it.
-+  dnl There may be an environment PTHREAD_LIBS that 
-+  dnl specifies what to use; otherwise, search for it.
-+  dnl -pthread is special cased and unsets LIBPTHREAD
-+  dnl below if found.
-+  LIBPTHREAD=""
-+
-+  if test -n "$PTHREAD_LIBS"; then
-+    if test "x$PTHREAD_LIBS" = "x-pthread" ; then
-+      LIBPTHREAD="PTHREAD"
-+    else
-+      PTHREAD_LIBS_save="$PTHREAD_LIBS"
-+      PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-+      AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS])
-+      KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [
-+          LIBPTHREAD="$PTHREAD_LIBS_save"])
-+      PTHREAD_LIBS="$PTHREAD_LIBS_save"
-+    fi
-+  fi
-+
-+  dnl Is this test really needed, in the face of the Tru64 test below?
-+  if test -z "$LIBPTHREAD"; then
-+    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
-+  fi
-+
-+  dnl This is a special Tru64 check, see BR 76171 issue #18.
-+  if test -z "$LIBPTHREAD" ; then
-+    AC_MSG_CHECKING([for pthread_create in -lpthread])
-+    kde_safe_libs=$LIBS
-+    LIBS="$LIBS -lpthread"
-+    AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
-+        AC_MSG_RESULT(yes)
-+        LIBPTHREAD="-lpthread"],[
-+	AC_MSG_RESULT(no)])
-+    LIBS=$kde_safe_libs
-+  fi
-+
-+  dnl Un-special-case for FreeBSD.
-+  if test "x$LIBPTHREAD" = "xPTHREAD" ; then
-+    LIBPTHREAD=""
-+  fi
- 
-   AC_SUBST(LIBPTHREAD)
- ])
-@@ -4219,7 +4254,8 @@
- 
- AC_DEFUN([KDE_CHECK_PYTHON],
- [
--  KDE_CHECK_PYTHON_INTERN("2.3", 
-+  KDE_CHECK_PYTHON_INTERN("2.4",
-+   [KDE_CHECK_PYTHON_INTERN("2.3", 
-    [KDE_CHECK_PYTHON_INTERN("2.2", 
-      [KDE_CHECK_PYTHON_INTERN("2.1", 
-        [KDE_CHECK_PYTHON_INTERN("2.0", 
-@@ -4227,6 +4263,7 @@
-        ])
-      ])
-    ])
-+  ])
- ])
- 
- AC_DEFUN([KDE_CHECK_STL],
-diff -Nur kdenetwork-3.3.1/dcoprss/rssservice.desktop kdenetwork-3.3-cvs/dcoprss/rssservice.desktop
+diff -Nur kdenetwork-3.3.1/dcoprss/rssservice.desktop kdenetwork-3.3.1-cvs/dcoprss/rssservice.desktop
 --- kdenetwork-3.3.1/dcoprss/rssservice.desktop	2004-10-03 09:42:59.000000000 +0200
-+++ kdenetwork-3.3-cvs/dcoprss/rssservice.desktop	2005-03-15 11:36:20.277761000 +0100
++++ kdenetwork-3.3.1-cvs/dcoprss/rssservice.desktop	2004-11-28 18:09:14.000000000 +0100
 @@ -19,10 +19,12 @@
  Name[ro]=Serviciu RSS
  Name[sv]=RSS-tjänst
@@ -93,18 +14,7 @@
  Comment[be]=RSS DCOP сэрвісы
  Comment[bs]=RSS DCOP servisi
  Comment[ca]=Serveis RSS de DCOP
-@@ -33,8 +35,10 @@
- Comment[el]=Υπηρεσίες RSS DCOP
- Comment[es]=Servicios RSS de dcop
- Comment[et]=RSS DCOP teenused
-+Comment[eu]=RSS DCOP zerbitzuak
- Comment[fi]=RSS-DCOP-palvelut
- Comment[fr]=Services DCOP RSS
-+Comment[ga]=Seirbhísí DCOP RSS
- Comment[gl]=Servicios RSS de DCOP
- Comment[he]=שרותי RSS DCOP
- Comment[hi]=आरएसएस डीकॉप सेवाएँ
-@@ -43,6 +47,7 @@
+@@ -43,6 +45,7 @@
  Comment[is]=RSS DCOP þjónustur
  Comment[it]=Servizi DCOP RSS
  Comment[ja]=RSS DCOPサービス
@@ -112,30 +22,26 @@
  Comment[nb]=RSS DCOP -tjenester
  Comment[nl]=RSS DCOP-diensten
  Comment[nn]=RSS DCOP-tenester
-@@ -50,6 +55,7 @@
- Comment[pt]=Serviços DCOP de RSS
- Comment[pt_BR]=Serviços DCOP RSS
- Comment[ru]=Службы RSS DCOP
-+Comment[se]=RSS DCOP-bálvalusat
- Comment[sk]=RSS DCOP služby
- Comment[sl]=Storitve RSS DCOP
- Comment[sr]=RSS DCOP сервиси
-diff -Nur kdenetwork-3.3.1/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop kdenetwork-3.3-cvs/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
+Binärdateien kdenetwork-3.3.1/doc/kcontrol/kcmktalkd/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/kcontrol/kcmktalkd/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/kdict/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/kdict/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/kget/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/kget/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/knewsticker/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/knewsticker/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/kopete/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/kopete/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/kpf/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/kpf/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/kppp/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/kppp/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/krdc/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/krdc/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/krfb/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/krfb/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/ksirc/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/ksirc/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/ktalkd/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/ktalkd/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/kwifimanager/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/kwifimanager/index.cache.bz2 sind verschieden.
+Binärdateien kdenetwork-3.3.1/doc/lisa/index.cache.bz2 and kdenetwork-3.3.1-cvs/doc/lisa/index.cache.bz2 sind verschieden.
+diff -Nur kdenetwork-3.3.1/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop kdenetwork-3.3.1-cvs/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
 --- kdenetwork-3.3.1/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop	2004-10-03 09:43:04.000000000 +0200
-+++ kdenetwork-3.3-cvs/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop	2005-03-15 11:36:20.720687000 +0100
-@@ -16,6 +16,7 @@
- OnlyShowIn=KDE
- 
- Comment=KcmSambaConf - a KControl module for configuring a samba server
-+Comment[ar]=KcmSambaConf- وحدة KControlمن أجل تهيئة مخدم samba
- Comment[bg]=Настройки на Самба
- Comment[bs]=KcmSambaConf - KControl modul za podešavanje Samba servera
- Comment[ca]=KcmSambaConf - un mòdul de KControl per configurar un servidor samba
-@@ -23,29 +24,35 @@
++++ kdenetwork-3.3.1-cvs/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop	2004-11-28 18:09:34.000000000 +0100
+@@ -23,11 +23,13 @@
  Comment[de]=KcmSambaConf - ein Kontrollzentrummodul zur Einrichtung eines Samba-Servers
  Comment[es]=KcmSambaConf - un módulo de KControl para configurar el servidor samba
  Comment[et]=KcmSambaConf - KDE juhtimiskeskuse moodul Samba serveri seadistamiseks
-+Comment[eu]=KcmSambaConf - samba zerbitzaria konfiguratzeko KControl modulu bat
 +Comment[fi]=KcmSambaConf - Ohjauskeskuksen moduuli, jossa voi muokata samba-palvelinta
  Comment[fr]=KcmSambaConf -un module de KControl pour configurer un serveur Samba
  Comment[hu]=KcmSambaConf - beállítómodul a Samba-kiszolgáló beállításához
@@ -146,10 +52,7 @@
  Comment[nb]=KcmSambaConf - en KControl-modul for å sette opp en Samba-tjener
  Comment[nl]=KcmSambaConf - Een KControl-module om een Samba-server in te stellen
  Comment[nn]=KcmSambaConf - ein kontrollmodul for oppsett av samba-tenarar
- Comment[pl]=KcmSambaConf - moduł Centrum Sterowania do konfiguracji serwera Samby
- Comment[pt]=KcmSambaConf - um módulo do KControl para configurar um servidor samba
- Comment[pt_BR]=KcmSambaConf - um módulo do Centro de Controle para a configuração do servidor Samba
-+Comment[se]=KcmSambaConf - a KControl moduvlla mainna heiveha samba bálvvá
+@@ -37,15 +39,17 @@
  Comment[sk]=KcmSambaConf - ovládací modul pre nastavenie serveru samba
  Comment[sl]=KcmSambaConf - Modul za KControl za nastavljanje strežnika Samba
  Comment[sr]=KcmSambaConf — модула KControl-а за подешавање Samba сервера
@@ -168,11 +71,10 @@
  Keywords[nl]=KcmSambaConf,kcmsambaconf,samba
  Keywords[pl]=KcmSambaConf,kcmsambaconf,samba,Samba,serwer,SMB,smb
  Keywords[pt_BR]=samba,kcmsambaconf
-@@ -54,17 +61,21 @@
+@@ -54,17 +58,20 @@
  Name=Samba Configuration
  Name[be]=Канфігурацыя Samba
  Name[bg]=Самба
-+Name[br]=Kefluniadur Samba
 +Name[bs]=Podešavanje Sambe
  Name[ca]=Configuració de Samba
  Name[cs]=Nastavení Samby
@@ -190,11 +92,7 @@
  Name[nb]=Samba-oppsett
  Name[nl]=Instellingen voor Samba
  Name[nn]=Samba-oppsett
-@@ -72,10 +83,11 @@
- Name[pt]=Configuração do Samba
- Name[pt_BR]=Configuração do Samba
- Name[ru]=Параметры Samba
-+Name[se]=Samba heivehus
+@@ -75,7 +82,7 @@
  Name[sk]=Nastavenie Samba
  Name[sl]=Nastavitve Sambe
[...8659 lines suppressed...]
  Comment[nb]=Passer på det trådløse nettverket
  Comment[nl]=Een programma voor het observeren van een draadloos lokaal netwerk
  Comment[nn]=Passar på det trådlause nettverket
- Comment[pl]=Program monitorujący połączenia w sieci bezprzewodowej
- Comment[pt]=Um monitor de ligações na rede local sem-fios ('wireless')
- Comment[pt_BR]=Um monitor de conexões LAN sem fio
-+Comment[se]=Jođaskeahttes LAN-oktavuohta goziheaddji
- Comment[sk]=Sledovanie bezdrôtového pripojenia LAN
- Comment[sl]=Nadzornik brezžične povezave LAN
- Comment[sr]=Надгледач бежичне LAN везе
-@@ -42,6 +46,7 @@
+@@ -42,6 +44,7 @@
  Comment[zh_CN]=无线局域网连接监视器
  Terminal=0
  Name=KWiFiManager
@@ -9066,7 +4628,7 @@
  Name[cs]=Správce WIFI
  Name[cy]=KRheolyddDiWi
  Name[de]=KWiFi-Verwaltung
-@@ -52,6 +57,7 @@
+@@ -52,6 +55,7 @@
  Name[nb]=KWiFiHÃ¥ndterer
  Name[nn]=KWiFiHandterar
  GenericName=Wireless LAN Manager
@@ -9074,17 +4636,7 @@
  GenericName[bg]=Безжична мрежа
  GenericName[bs]=Upravitelj bežčnim LANom
  GenericName[ca]=Gestor LAN sense fils
-@@ -62,14 +68,17 @@
- GenericName[el]=Διαχειριστής ασύρματου LAN
- GenericName[es]=Gestor de red inalámbrica
- GenericName[et]=Traadita võrgu haldur
-+GenericName[eu]=Kablerik gabeko LAN kudeatzailea
- GenericName[fi]=Langattoman lähiverkon hallinta
- GenericName[fr]=Gestionnaire de réseau sans fil
-+GenericName[ga]=Bainisteoir Ghréasáin gan sreang
- GenericName[hi]= बेतार लैन मैनेजर
- GenericName[hr]=Upravitelj bežičnog LAN-a
- GenericName[hu]=WiFi-kezelő
+@@ -70,6 +74,7 @@
  GenericName[is]=Fylgist með staðarneti
  GenericName[it]=Gestione LAN senza fili
  GenericName[ja]=ワイヤレスLANマネージャ
@@ -9092,18 +4644,10 @@
  GenericName[nb]=Trådløst nettverksbehandler
  GenericName[nl]=Draadloos netwerkbeheer
  GenericName[nn]=Handsamar for trådlaust nettverk
-diff -Nur kdenetwork-3.3.1/wifi/kwireless/kwireless.desktop kdenetwork-3.3-cvs/wifi/kwireless/kwireless.desktop
+diff -Nur kdenetwork-3.3.1/wifi/kwireless/kwireless.desktop kdenetwork-3.3.1-cvs/wifi/kwireless/kwireless.desktop
 --- kdenetwork-3.3.1/wifi/kwireless/kwireless.desktop	2004-10-03 09:44:08.000000000 +0200
-+++ kdenetwork-3.3-cvs/wifi/kwireless/kwireless.desktop	2005-03-15 11:36:28.290436000 +0100
-@@ -12,6 +12,7 @@
- Comment[el]=Εμφανίζει πληροφορίες για συσκευές ασύρματου δικτύου
- Comment[es]=Muestra información acerca de los dispositivos de la red inalámbrica
- Comment[et]=Näitab infot traadita võrgu seadmete kohta
-+Comment[eu]=Kablerik gabeko sare gailuen informazioa erakusten du
- Comment[fi]=Tietoja langattoman verkon laitteista
- Comment[fr]=Affiche des informations sur les périphériques réseau sans fil
- Comment[gl]=Información sobre os dispositivos de rede inalámbirca
-@@ -22,6 +23,7 @@
++++ kdenetwork-3.3.1-cvs/wifi/kwireless/kwireless.desktop	2004-11-28 18:11:19.000000000 +0100
+@@ -22,6 +22,7 @@
  Comment[is]=Sýnir upplýsingar um tæki fyrir þráðlausar nettengingar
  Comment[it]=Visualizza informazioni sui dispositivi di rete senza fili
  Comment[ja]=ワイヤレスネットワークデバイスの情報を表示
@@ -9111,26 +4655,7 @@
  Comment[ms]=Memaparkan maklumat berkaitan peranti jaringan tanpa wayar
  Comment[nb]=Viser informasjon om enheter for trådløst nettverk
  Comment[nl]=Toont informatie over draadloze netwerkapparaten
-@@ -30,6 +32,7 @@
- Comment[pt]=Mostra informações sobre os dispositivos de rede sem-fios ('wireless')
- Comment[pt_BR]=Mostra informação sobre dispositivos de rede sem fio
- Comment[ru]=Отображает сведения о беспроводных сетевых устройствах
-+Comment[se]=Čájeha dieđuid jođaskeahttes fierpmádatovttadagaid birra
- Comment[sk]=Zobrazí informácie o zariadeniach bezdrôtovej siete
- Comment[sl]=Prikaže informacije o napravah brezžičnega omrežja
- Comment[sr]=Приказује информације о бежичним мрежним уређајима
-@@ -52,8 +55,10 @@
- Name[el]=Πληροφορίες ασύρματου δικτύου
- Name[es]=Información de la red inalámbrica
- Name[et]=Traadita võrgu info
-+Name[eu]=Kablerik gabeko sarearen informazioa
- Name[fi]=Langattoman verkon tiedot
- Name[fr]=Informations sur le réseau sans fil
-+Name[ga]=Eolas faoi Ghréasán gan sreang
- Name[gl]=Información sobre a rede inalámbrica
- Name[he]=נתוני רשת אלחוטית
- Name[hi]=वायरलेस नेटवर्क जानकारी
-@@ -62,6 +67,7 @@
+@@ -62,6 +63,7 @@
  Name[is]=Upplýsingar um þráðlausa netið
  Name[it]=Informazione rete senza fili
  Name[ja]=ワイヤレスネットワーク情報
@@ -9138,30 +4663,9 @@
  Name[ms]=Maklumat Jaringan Tanpa Wayar
  Name[nb]=Informasjon om trådløst nettverk
  Name[nl]=Draadloos netwerk-informatie
-@@ -70,6 +76,7 @@
- Name[pt]=Informação da Rede Sem-Fios ('Wireless')
- Name[pt_BR]=Informação sobre Rede Sem Fio
- Name[ru]=Сведения о беспроводной сети
-+Name[se]=Jođaskeahttes fierpmádatdieđut
- Name[sk]=Informácie o bezdrôtovej sieti
- Name[sl]=Podatki o brezžičnem omrežju
- Name[sr]=Информације о бежичној мрежи
-diff -Nur kdenetwork-3.3.1/wifi/main.cpp kdenetwork-3.3-cvs/wifi/main.cpp
---- kdenetwork-3.3.1/wifi/main.cpp	2004-06-25 11:10:25.000000000 +0200
-+++ kdenetwork-3.3-cvs/wifi/main.cpp	2004-12-07 11:57:38.000000000 +0100
-@@ -42,8 +42,7 @@
- {
-   KAboutData aboutData ("kwifimanager", I18N_NOOP ("KWiFiManager"), VERSION,
- 			description, KAboutData::License_GPL,
--			"(c) 2001-04, Stefan Winter", 0, 0,
--			"mail stefan-winter de");
-+			"(c) 2001-04, Stefan Winter");
-   aboutData.addAuthor ("Stefan Winter", 0, "mail stefan-winter de");
-   KCmdLineArgs::init (argc, argv, &aboutData);
-   KCmdLineArgs::addCmdLineOptions (options);	// Add our own options.
-diff -Nur kdenetwork-3.3.1/wifi/Makefile.am kdenetwork-3.3-cvs/wifi/Makefile.am
+diff -Nur kdenetwork-3.3.1/wifi/Makefile.am kdenetwork-3.3.1-cvs/wifi/Makefile.am
 --- kdenetwork-3.3.1/wifi/Makefile.am	2004-05-22 22:57:36.000000000 +0200
-+++ kdenetwork-3.3-cvs/wifi/Makefile.am	2004-11-18 10:22:28.000000000 +0100
++++ kdenetwork-3.3.1-cvs/wifi/Makefile.am	2004-11-28 18:11:19.000000000 +0100
 @@ -24,7 +24,11 @@
  
  kwifimanager_LDFLAGS = $(all_libraries)
@@ -9180,9 +4684,9 @@
  messages:
  	$(XGETTEXT) *.cpp -o $(podir)/kwifimanager.pot
 -
-diff -Nur kdenetwork-3.3.1/wifi/status.cpp kdenetwork-3.3-cvs/wifi/status.cpp
+diff -Nur kdenetwork-3.3.1/wifi/status.cpp kdenetwork-3.3.1-cvs/wifi/status.cpp
 --- kdenetwork-3.3.1/wifi/status.cpp	2004-05-22 22:57:36.000000000 +0200
-+++ kdenetwork-3.3-cvs/wifi/status.cpp	2005-03-15 11:36:28.256441000 +0100
++++ kdenetwork-3.3.1-cvs/wifi/status.cpp	2004-11-28 18:11:19.000000000 +0100
 @@ -19,6 +19,12 @@
  #include "status.h"
  #include "interface_wireless.h"
@@ -9196,61 +4700,3 @@
  Status::Status (QWidget * parent, Interface_wireless * device):QWidget (parent,
  	 "KWiFiManager status")
  {
-@@ -58,10 +64,55 @@
-     temp3 = "%1";
-   QString
-     temp2 = "%1";
-+  
-   if (freq >= 1000000000)
-     {
--      if (freq / 1000000. > 2474.)
--	{
-+           if (freq / 1000000. >= 5785.)
-+        {
-+          temp3 = temp3.arg(161);
-+        }
-+      else if (freq / 1000000. >= 5765.)
-+        {
-+          temp3 = temp3.arg(157);
-+        }
-+      else if (freq / 1000000. > 5745.)
-+        {
-+          temp3 = temp3.arg(153);
-+        }
-+      else if (freq / 1000000. >= 5320.)
-+        {
-+          temp3 = temp3.arg(149);
-+        }
-+      else if (freq / 1000000. > 5300.)
-+        {
-+          temp3 = temp3.arg(64);
-+        }
-+      else if (freq / 1000000. > 5280.)
-+        {
-+          temp3 = temp3.arg(60);
-+        }
-+      else if (freq / 1000000. > 5260.)
-+        {
-+          temp3 = temp3.arg(56);
-+        }
-+      else if (freq / 1000000. > 5240.)
-+        {
-+          temp3 = temp3.arg(52);
-+        }
-+      else if (freq / 1000000. > 5220.)
-+        {
-+          temp3 = temp3.arg(48);
-+        }
-+      else if (freq / 1000000. > 5200.)
-+        {
-+          temp3 = temp3.arg(44);
-+        }
-+      else if (freq / 1000000. > 5180.)
-+        {
-+          temp3 = temp3.arg(40);
-+        }
-+      else if (freq / 1000000. > 2474.)
-+    	{
- 	  temp3 = temp3.arg (14);
- 	}
-       else if (freq / 1000000. > 2469.)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-3/kdenetwork.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdenetwork.spec	21 Jul 2005 20:08:44 -0000	1.46
+++ kdenetwork.spec	22 Jul 2005 09:59:28 -0000	1.47
@@ -30,8 +30,7 @@
 Patch5: kdenetwork-3.3.0-ksirc.patch
 Patch7: kdenetwork-3.3-cvs.patch
 Patch8: kdenetwork-3.3.1-kopete-msn-login.patch
-Patch9: kdenetwork-3.3.1-kopete-gadu.patch
-Patch10: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
+Patch9: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
 # CVE CAN-2005-1852, libgadu vulnerabilities
 Patch100: post-3.3.2-kdenetwork-libgadu.patch
@@ -84,7 +83,6 @@
 %patch5 -p1 -b .ksirc
 %patch7 -p1 -b .cvs
 %patch8 -p1 -b .msn
-%patch8 -p1 -b .kopete-gadu
 %patch9 -p1 -b .libgadu-va_copy
 %patch100 -p0 -b .CAN-2005-1852
 


--- kdenetwork-3.3.1-kopete-gadu.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]