[pkg-kde-commits] rev 2869 - in trunk/packages: kdelibs/debian kdenetwork/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-01-13 21:56:47 +0000 (Fri, 13 Jan 2006)
New Revision: 2869

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdenetwork/debian/changelog
   trunk/packages/kdenetwork/debian/control
Log:
Minor style fixes. Also beef up the kdnssd description,
add it to the kdenetwork metapackage.

And change Suggests: gpg to gnupg for kopete.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2006-01-13 17:44:19 UTC (rev 2868)
+++ trunk/packages/kdelibs/debian/changelog	2006-01-13 21:56:47 UTC (rev 2869)
@@ -8,10 +8,10 @@
   +++ Changes by Isaac Clerencia:
 
   * Apply patch 27_kdnssd_avahi.diff to replace dummy kdelibs kdnssd
-    implementation with a working one avahi-based
+    implementation with a working avahi-based one.
 
   * Add Build-Depends on libavahi-client-dev and libavahi-qt3-dev to get
-    the patch referenced above working
+    the patch referenced above working.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Jan 2006 08:08:53 -0500
 

Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2006-01-13 17:44:19 UTC (rev 2868)
+++ trunk/packages/kdenetwork/debian/changelog	2006-01-13 21:56:47 UTC (rev 2869)
@@ -2,8 +2,12 @@
 
   +++ Changes by Isaac Clerencia:
 
-  * Put zeroconf kio-slave and other kdnssd stuff in package kdnssd 
+  * Put zeroconf kioslave and other kdnssd stuff in a new package, kdnssd.
 
+  +++ Changes by Christopher Martin:
+
+  * Change kopete's Suggests: gpg to gnupg. (Closes: #347969)
+  
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  
 
 kdenetwork (4:3.5.0-3) unstable; urgency=low

Modified: trunk/packages/kdenetwork/debian/control
===================================================================
--- trunk/packages/kdenetwork/debian/control	2006-01-13 17:44:19 UTC (rev 2868)
+++ trunk/packages/kdenetwork/debian/control	2006-01-13 21:56:47 UTC (rev 2869)
@@ -9,7 +9,7 @@
 Package: kdenetwork
 Section: kde
 Architecture: all
-Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}), librss1 (>= ${Source-Version})
+Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}), librss1 (>= ${Source-Version})
 Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
 Suggests: kdenetwork-doc-html (>= ${Source-Version})
 Description: network-related apps from the official KDE release
@@ -132,7 +132,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: qca-tls
-Suggests: kdeartwork-emoticons, khelpcenter, imagemagick, gpg, gnomemeeting
+Suggests: kdeartwork-emoticons, khelpcenter, imagemagick, gnupg, gnomemeeting
 Replaces: konversation (<= 0.14.0-4), sim (<= 0.9.3-2)
 Description: instant messenger for KDE
  Kopete is an instant messenger program which can communicate with a variety
@@ -304,7 +304,11 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Zeroconf support for KDE
- A kio-slave and kded module for zeroconf support.
+ A kioslave and kded module that provide Zeroconf support. Try
+ "zeroconf:/" in Konqueror.
+ .
+ This package is part of KDE, as a component of the KDE network module.
+ See the 'kde' and 'kdenetwork' packages for more information.
 
 Package: kdenetwork-dbg
 Section: libdevel