r10970 - in /packages/unstable/pidgin/trunk/debian: changelog control

[ari at users.alioth.debian.org]

Author: ari
Date: Mon May 14 18:26:52 2007
New Revision: 10970

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10970
Log:
* Add appropriate Conflicts in addition to Replaces

Modified:
    packages/unstable/pidgin/trunk/debian/changelog
    packages/unstable/pidgin/trunk/debian/control

Modified: packages/unstable/pidgin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/changelog?rev=10970&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/changelog (original)
+++ packages/unstable/pidgin/trunk/debian/changelog Mon May 14 18:26:52 2007
@@ -1,6 +1,7 @@
 pidgin (2.0.0+dfsg.1-5) UNRELEASED; urgency=low
 
   * Fix gevolution dependency exclusion
+  * Add appropriate Conflicts in addition to Replaces
 
  -- Ari Pollak <ari at debian.org>  Sun, 13 May 2007 17:05:37 -0400
 

Modified: packages/unstable/pidgin/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pidgin/trunk/debian/control?rev=10970&op=diff
==============================================================================
--- packages/unstable/pidgin/trunk/debian/control (original)
+++ packages/unstable/pidgin/trunk/debian/control Mon May 14 18:26:52 2007
@@ -18,6 +18,7 @@
 Package: pidgin
 Architecture: any
 Depends: pidgin-data (>= ${source:Upstream-Version}), pidgin-data (<< ${source:Upstream-Version}-z) (${shlibs:Depends}, libsasl2-modules
+Conflicts: gaim (<< 1:2.0.0+beta6-3)
 Replaces: gaim (<< 1:2.0.0+beta6-3)
 Recommends: gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, python-dbus
 Suggests: gnome-panel (>= 2.1) | kicker (>= 3.1) | docker, evolution-data-server (>= 1.10.0), ${shlibs:Suggests}
@@ -63,6 +64,7 @@
 Section: devel
 Architecture: all
 Depends: pidgin (= ${source:Version}), pidgin-data (= ${source:Version}), pkg-config, libgtk2.0-dev
+Conflicts: gaim-dev (<< 1:2.0.0+beta6-3)
 Replaces: gaim-dev (<< 1:2.0.0+beta6-3)
 Description: multi-protocol instant messaging client - development files
  This package contains the headers and other development files not included in
@@ -76,6 +78,7 @@
 Priority: extra
 Architecture: any
 Depends: pidgin (= ${source:Version}), pidgin-data (= ${source:Version}), ${shlibs:Depends}
+Conflicts: gaim-dbg (<< 1:2.0.0+beta6-3)
 Replaces: gaim-dbg (<< 1:2.0.0+beta6-3)
 Description: Debugging symbols for Pidgin 
  This package includes the debugging symbols useful for debugging Pidgin