Author: arekm Date: Tue Aug 2 06:15:20 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - update
---- Files affected: SOURCES: kdenetwork-branch.diff (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SOURCES/kdenetwork-branch.diff diff -u SOURCES/kdenetwork-branch.diff:1.7 SOURCES/kdenetwork-branch.diff:1.8 --- SOURCES/kdenetwork-branch.diff:1.7 Sun Mar 27 16:02:07 2005 +++ SOURCES/kdenetwork-branch.diff Tue Aug 2 08:15:15 2005 @@ -1,10652 +1,221 @@ -diff -urN -x CVS kdenetwork.orig/admin/acinclude.m4.in kdenetwork/admin/acinclude.m4.in ---- kdenetwork.orig/admin/acinclude.m4.in 2005-02-09 23:21:09.000000000 +0100 -+++ kdenetwork/admin/acinclude.m4.in 2005-03-24 20:18:09.000000000 +0100 -@@ -1644,7 +1644,15 @@ - - AC_MSG_RESULT([$kde_cv_uic_plugins]) - if test "$kde_cv_uic_plugins" != yes; then -- AC_MSG_ERROR([you need to install kdelibs first.]) -+ AC_MSG_ERROR([ -+you need to install kdelibs first. -+ -+If you did install kdelibs, then the Qt version that is picked up by -+this configure is not the same version you used to compile kdelibs. -+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the -+same Qt version, compiled with the same compiler and the same Qt -+configuration settings. -+]) - fi - fi - ]) -@@ -3104,8 +3112,8 @@ - fi - rm -f conftest.h conftest.h.gch - fi -- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") - fi -+ AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") - if test "$CXX" = "KCC"; then - dnl unfortunately we currently cannot disable exception support in KCC - dnl because doing so is binary incompatible and Qt by default links with exceptions :-( -@@ -3194,6 +3202,51 @@ - ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) - ]) - -+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG], -+ [ -+ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug, -+ [ -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ -+ safe_CXXFLAGS=$CXXFLAGS -+ safe_LDFLAGS=$LDFLAGS -+ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0" -+ LDFLAGS="$LDFLAGS -shared -fPIC" -+ -+ AC_TRY_LINK( -+ [ -+ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ -+ template<typename CharT> -+ struct VisTest -+ { -+ inline VisTest (); -+ }; -+ template<typename CharT> -+ inline VisTest<CharT>::VisTest() -+ {} -+ extern template class VisTest<char>; // It works if we drop that line -+ int some_function( int do_something ) __attribute__ ((visibility("default"))); -+ int some_function( int ) -+ { -+ VisTest<char> a; -+ return 0; -+ } -+ ], [/* elvis is alive */], -+ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes) -+ -+ CXXFLAGS=$safe_CXXFLAGS -+ LDFLAGS=$safe_LDFLAGS -+ AC_LANG_RESTORE -+ ] -+ ) -+ -+ if test x$kde_cv_val_gcc_visibility_bug = xno; then -+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" -+ fi -+ ] -+) -+ - AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY], - [ - if test "$GXX" = "yes"; then -@@ -3202,7 +3255,9 @@ - KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) - KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, - [ -- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" -+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden" -+ KDE_CHECK_VISIBILITY_GCC_BUG -+ - HAVE_GCC_VISIBILITY=1 - AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) - ]) -diff -urN -x CVS kdenetwork.orig/admin/am_edit kdenetwork/admin/am_edit ---- kdenetwork.orig/admin/am_edit 2004-12-17 21:18:28.000000000 +0100 -+++ kdenetwork/admin/am_edit 2005-03-01 19:46:09.000000000 +0100 -@@ -483,6 +483,7 @@ - $MakefileData =~ s/$lookup/$replacement/; - $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/; - $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after"; -+ next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/); - substituteLine($lookup, $replacement); - } else { - $found = 0; -@@ -2276,7 +2277,7 @@ - "\t echo \"\$\$i\"; \\\n" . - "\t if ! "; - $t .= $cxxsuffix eq "KKK" ? -- "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " : -+ "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " : - "\$(CXXCOMPILE) "; - $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" . - "\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" . -@@ -2352,7 +2353,7 @@ - $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines - # Append our $progId line, _below_ the "generated by automake" line - # because automake-1.6 relies on the first line to be his own. -- my $progIdLine = "\# $progId - " . '$Revision$ '."\n"; -+ my $progIdLine = "\# $progId - " . '$Revision$ '."\n"; - if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) { - warn "automake line not found in $makefile\n"; - # Fallback: first line -diff -urN -x CVS kdenetwork.orig/dcoprss/rssservice.desktop kdenetwork/dcoprss/rssservice.desktop ---- kdenetwork.orig/dcoprss/rssservice.desktop 2005-02-21 10:17:40.000000000 +0100 -+++ kdenetwork/dcoprss/rssservice.desktop 2005-03-07 15:18:51.000000000 +0100 -@@ -20,7 +20,6 @@ - Name[sv]=RSS-tjänst - Name[ta]=rssŕŽŕŻŕŽľŕŻ - Name[tr]=rssservisi --Name[xx]=xxrssservicexx - Exec=rssservice - X-DCOP-ServiceType=Unique - X-KDE-StartupNotify=false -@@ -67,5 +66,4 @@ - Comment[tr]=RSS DCOP hizmetleri - Comment[uk]=ĐĄĐťŃМйи RSS DCOP - Comment[uz]=RSS DCOP Ń Đ¸ĐˇĐźĐ°ŃНаŃи --Comment[xx]=xxRSS DCOP servicesxx - Comment[zh_CN]=RSS DCOP ćĺĄ -diff -urN -x CVS kdenetwork.orig/debian/changelog kdenetwork/debian/changelog ---- kdenetwork.orig/debian/changelog 2004-08-07 03:16:38.000000000 +0200 -+++ kdenetwork/debian/changelog 2005-03-27 11:51:45.000000000 +0200 -@@ -1,3 +1,111 @@ -+kdenetwork (4:3.4.0-0pre2) experimental; urgency=low -+ -+ * Updated to KDE_3_4_BRANCH as of 20050326 in order to fix some bugs only -+ discovered right after the release (001-kdenetwork-branch_20050326.diff) -+ * Added myself (Martin Loschwitz <[EMAIL PROTECTED]>) to Uploaders-field -+ in debian/control for further uploads of kdenetwork -+ * Added an appropriate Replaces:-entry to debian/control for kdict so that -+ it does not conflict on kdebase-data (via kdict.svgz) -+ -+ -- Debian Qt/KDE Maintainers <[email protected]> Sun, 27 Mar 2005 11:35:00 +0200 -+ -+kdenetwork (4:3.4.0-0pre1) experimental; urgency=low -+ -+ * New upstream release. -+ -+ +++ Changes by Isaac Clerencia: -+ -+ * Switch to CDBS for packaging. -+ -+ * Added new package kdenetwork-kfile-plugins. -+ -+ +++ Changes by Christopher Martin: -+ -+ * Change kopete's section to kde. (Closes: #292398) -+ -+ * Change kopete's dependency on xmms to a Suggests, since only -+ the Now Listening plug-in breaks without it. Added a -+ README.Debian to explain. -+ (Closes: #238368, #276586, #292963, #293191) -+ -+ -- Debian Qt/KDE Maintainers <[email protected]> Fri, 4 Mar 2005 16:30:07 +0100 -+ -+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 <[email protected]> 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Ăł <[EMAIL PROTECTED]> Tue, 21 Dec 2004 00:13:56 +0100 -+ -+kdenetwork (4:3.3.1-2) unstable; urgency=low -+ -+ * reapply kget patch, Closes: #280616 -+ -+ -- Riku Voipio <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> Sat, 28 Aug 2004 17:21:30 +0000 -+ -+kdenetwork (4:3.3.0-1) unstable; urgency=high -+ -+ * New upstream release. -+ -+ -- Christopher L Cheney <[EMAIL PROTECTED]> Sat, 14 Aug 2004 18:00:00 -0500 -+ - kdenetwork (4:3.2.3-1) unstable; urgency=high - - * New upstream release. -diff -urN -x CVS kdenetwork.orig/debian/control kdenetwork/debian/control ---- kdenetwork.orig/debian/control 2004-08-07 03:16:38.000000000 +0200 -+++ kdenetwork/debian/control 2005-03-27 11:51:45.000000000 +0200 -@@ -2,14 +2,14 @@ - Section: kde - Priority: optional - Maintainer: Debian Qt/KDE Maintainers <[email protected]> --Uploaders: Christopher L Cheney <[EMAIL PROTECTED]> --Build-Depends: automake1.8, debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, kdelibs4-dev (>= 4:3.2.3-4), libgadu-dev, libiw-dev, libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, sharutils, valgrind [i386], xlibs-static-pic, xmms-dev --Standards-Version: 3.6.1.0 -+Uploaders: Christopher L Cheney <[EMAIL PROTECTED]>, Riku Voipio <[EMAIL PROTECTED]>, Adeodato SimĂł <[EMAIL PROTECTED]>, Christopher Martin <[EMAIL PROTECTED]>, Isaac Clerencia <[EMAIL PROTECTED]>, Martin Loschwitz <[EMAIL PROTECTED]> -+Build-Depends: cdbs (>= 0.4.26), debhelper (>> 4.2.0), docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>> 4:3.3.2), libgadu-dev, libiw-dev, libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, qt3-doc, sharutils, valgrind [i386], xlibs-static-pic, xmms-dev -+Standards-Version: 3.6.1 - - Package: kdenetwork - Section: kde - Architecture: all --Depends: dcoprss (>=${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}) -+Depends: dcoprss (>=${Source-Version}), kdenetwork-filesharing (>=${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: ktalkd (>=${Source-Version}), lisa (>=${Source-Version}) - Description: KDE Network metapackage - KDE is a powerful Open Source graphical desktop environment for Unix -@@ -34,10 +34,40 @@ - . - This package is part of the official KDE network module. - -+Package: kdenetwork-kfile-plugins -+Section: kde -+Architecture: any -+Depends: ${shlibs:Depends} -+Description: torrent plugin for kfile -+ KDE 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. -+ . -+ torrent plugins for kfile. -+ . -+ This package is part of the official KDE network module. -+ -+Package: kdenetwork-filesharing -+Section: net -+Architecture: any -+Depends: ${shlibs:Depends} -+Replaces: kcontrol (<< 4:3.3.0) -+Description: KDE Network Filesharing Configuration -+ KDE 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. -+ . -+ KControl modules to configure NFS and Samba. -+ . -+ This package is part of the official KDE network module. -+ - Package: kdict - Section: net - Architecture: any - Depends: ${shlibs:Depends} -+Replaces: kdebase (<< 4:3.4.0-0pre1) - Suggests: khelpcenter - Provides: dict-client - Description: KDE Dictionary Client -@@ -83,10 +113,12 @@ - This package is part of the official KDE network module. - - Package: kopete --Section: net -+Section: kde - Architecture: any - Depends: ${shlibs:Depends} --Suggests: khelpcenter -+Recommends: qca-tls -+Suggests: khelpcenter, imagemagick, gpg, gnomemeeting, xmms -+Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2) - Description: Instant messenger program - KDE is a powerful Open Source graphical desktop environment for Unix - workstations. It combines ease of use, contemporary functionality, and -@@ -96,9 +128,14 @@ - Kopete is an instant messenger program which can communicate with a variety - of IM systems, such as 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, and amarok. Note that for this plug-in to function at all, -+ with any player, xmms must be installed. -+ . - Support for more IM protocols can be added through a plugin system. - . -- Homepage: http://kopete.kde.org/ -+ Homepage: http://kopete.kde.org/ - . - This package is part of the official KDE network module. - -@@ -120,8 +157,7 @@ - Package: kppp - Section: net - Architecture: any --Depends: ${shlibs:Depends} --Recommends: ppp -+Depends: ${shlibs:Depends}, ppp - Suggests: khelpcenter - Description: KDE dialer and frontend to pppd - KDE is a powerful Open Source graphical desktop environment for Unix -@@ -137,6 +173,8 @@ - Section: net - Architecture: any - Depends: ${shlibs:Depends} -+Conflicts: rdesktop (<= 1.3.1-1 ) -+Recommends: rdesktop - Suggests: khelpcenter - Description: KDE Remote Desktop Client - KDE is a powerful Open Source graphical desktop environment for Unix -@@ -144,7 +182,9 @@ - outstanding graphical design with the technological superiority of the Unix - operating system. - . -- krdc is an KDE graphical client for the rfb Protocol, used by VNC. -+ 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 the official KDE network module. - -@@ -249,6 +289,7 @@ - Architecture: any - Depends: ${shlibs:Depends}, debconf - Suggests: khelpcenter, samba-common -+Replaces: konqueror (<< 4:3.3.0) - Description: LAN Information Server - KDE is a powerful Open Source graphical desktop environment for Unix - workstations. It combines ease of use, contemporary functionality, and -diff -urN -x CVS kdenetwork.orig/debian/copyright kdenetwork/debian/copyright ---- kdenetwork.orig/debian/copyright 2004-02-28 00:52:50.000000000 +0100 -+++ kdenetwork/debian/copyright 2005-03-27 11:51:45.000000000 +0200 -@@ -1,13 +1,12 @@ - This package was debianized by Christopher L Cheney <[EMAIL PROTECTED]> on - Tue, 16 Apr 2002 22:00:00 -0500. - --It was downloaded via cvs from cvs.kde.org -+It was downloaded via CVS from cvs.kde.org - --Upstream Authors: Stephan Kulow <[EMAIL PROTECTED]> -- and many others... -+Upstream Authors: Stephan Kulow <[EMAIL PROTECTED]> and many others... - - --Copyright: -+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 -diff -urN -x CVS kdenetwork.orig/debian/dcoprss.install kdenetwork/debian/dcoprss.install ---- kdenetwork.orig/debian/dcoprss.install 2004-02-28 00:52:50.000000000 +0100 -+++ kdenetwork/debian/dcoprss.install 2005-03-27 11:51:45.000000000 +0200 -@@ -1,4 +1,4 @@ --debian/tmp/usr/bin/feedbrowser --debian/tmp/usr/bin/rssclient --debian/tmp/usr/bin/rssservice --debian/tmp/usr/share/services/rssservice.desktop -+usr/bin/feedbrowser -+usr/bin/rssclient -+usr/bin/rssservice -+usr/share/services/rssservice.desktop -diff -urN -x CVS kdenetwork.orig/debian/kdict.install kdenetwork/debian/kdict.install ---- kdenetwork.orig/debian/kdict.install 2004-02-28 00:52:50.000000000 +0100 -+++ kdenetwork/debian/kdict.install 2005-03-27 11:51:45.000000000 +0200 -@@ -1,22 +1,23 @@ --debian/tmp/usr/bin/kdict --debian/tmp/usr/lib/kde3/kdict_panelapplet.la --debian/tmp/usr/lib/kde3/kdict_panelapplet.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/crystalsvg/128x128/apps/kdict.png --debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kdict.png --debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kdict.png --debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kdict.png --debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kdict.png -+usr/bin/kdict -+usr/lib/kde3/kdict_panelapplet.la -+usr/lib/kde3/kdict_panelapplet.so -+usr/share/applications/kde/kdict.desktop -+usr/share/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png -+usr/share/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png -+usr/share/apps/kdict/icons/crystalsvg/22x22/actions/define_clip.png -+usr/share/apps/kdict/icons/crystalsvg/32x32/actions/define_clip.png -+usr/share/apps/kdict/kdictui.rc -+usr/share/apps/kicker/applets/kdictapplet.desktop -+usr/share/doc/kde/HTML/en/kdict/applet.png -+usr/share/doc/kde/HTML/en/kdict/common -+usr/share/doc/kde/HTML/en/kdict/conf.png -+usr/share/doc/kde/HTML/en/kdict/index.cache.bz2 -+usr/share/doc/kde/HTML/en/kdict/index.docbook -+usr/share/doc/kde/HTML/en/kdict/mainwin.png -+usr/share/doc/kde/HTML/en/kdict/seteditor.png -+usr/share/icons/crystalsvg/128x128/apps/kdict.png -+usr/share/icons/crystalsvg/16x16/apps/kdict.png -+usr/share/icons/crystalsvg/32x32/apps/kdict.png -+usr/share/icons/crystalsvg/48x48/apps/kdict.png -+usr/share/icons/crystalsvg/64x64/apps/kdict.png -+usr/share/icons/crystalsvg/scalable/apps/kdict.svgz -diff -urN -x CVS kdenetwork.orig/debian/kget.install kdenetwork/debian/kget.install ---- kdenetwork.orig/debian/kget.install 2004-02-28 00:52:50.000000000 +0100 -+++ kdenetwork/debian/kget.install 2005-03-27 11:51:45.000000000 +0200 -@@ -1,89 +1,90 @@ --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/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/dock.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_delete.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_paste.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_preferences.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/kget/sounds/added.wav --debian/tmp/usr/share/apps/kget/sounds/finished.wav --debian/tmp/usr/share/apps/kget/sounds/finishedall.wav --debian/tmp/usr/share/apps/kget/sounds/started.wav --debian/tmp/usr/share/apps/khtml/kpartplugins/kget_plug_in.rc --debian/tmp/usr/share/doc/kde/HTML/en/kget/common --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_delay.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_delete.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_disconnect.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_drop_target.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_expert.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_logwindow.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_offline_mode_off.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_offline_mode_on.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_paste.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_pause.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_queue.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_restart.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_resume.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_shutdown.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_timer.png --debian/tmp/usr/share/doc/kde/HTML/en/kget/cr22-action-tool_uselastdir.png --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/22x22/actions/khtml_kget.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 -+usr/bin/kget -+usr/lib/kde3/khtml_kget.la -+usr/lib/kde3/khtml_kget.so -+usr/share/applications/kde/kget.desktop -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar1.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar2.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar3.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar4.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar5.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/bar6.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/dock.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_clipboard.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_delay.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_delete.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_disconnect.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_dock.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_drop_target.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_expert.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_logwindow.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_normal.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_off.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_on.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_paste.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_pause.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_preferences.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_queue.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_restart.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_resume.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_shutdown.png -+usr/share/apps/kget/icons/crystalsvg/22x22/actions/tool_timer.png <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
