[Pkg-kde-commits] rev 1181 - branches/kde-3.4.0/packages/kdenetwork/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-06-02 23:54:30 +0000 (Thu, 02 Jun 2005)
New Revision: 1181

Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/changelog
   branches/kde-3.4.0/packages/kdenetwork/debian/control
Log:
Add Conflicts, as per dato's suggestion. Quick tests show it causes
no problems.


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-06-02 23:19:28 UTC (rev 1180)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-06-02 23:54:30 UTC (rev 1181)
@@ -1,3 +1,10 @@
+kdenetwork (4:3.4.1-1+SVN) UNRELEASED; urgency=low
+
+  * kdenetwork-dev: Add a Conflicts with librss1-dev (in addition to the
+    Replaces) to eliminate potential problems.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Thu,  2 Jun 2005 19:50:08 -0400
+
 kdenetwork (4:3.4.1-1) experimental; urgency=low
 
   * New upstream release 

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-06-02 23:19:28 UTC (rev 1180)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-06-02 23:54:30 UTC (rev 1181)
@@ -276,6 +276,7 @@
 Architecture: any
 Depends: kopete (=${Source-Version}), librss1 (=${Source-Version})
 Replaces: librss1-dev
+Conflicts: librss1-dev
 Description: development files for the KDE network module
  This is the development package which contains the headers for the KDE RSS
  library as well as the Kopete chat client, as well as miscellaneous