[Pkg-cli-libs-commits] [flickrnet] 11/24: Add Replaces libflickrnet2.1.5-cil

[Christopher Stuart Hoskin]

This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository flickrnet.

commit 6b5bd611855beb2f22053075a3fe281a3fbd3aaa
Author: Varun Hiremath <varun at debian.org>
Date:   Fri Aug 21 00:54:21 2009 +0000

    Add Replaces libflickrnet2.1.5-cil
---
 debian/changelog | 2 +-
 debian/control   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8fcb88b..84fc7b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ libflickrnet (1:2.2.0-1) unstable; urgency=low
   * Don't use svn version in package version
   * debian/control:
     - Set the binary package name to libflickrnet2.2-cil
-    - Add Conflicts & Replaces libflickrnet2.1.5-cil
+    - Add Replaces libflickrnet2.1.5-cil
     - Set Section to cli-mono
     - Bump Standards-Version to 3.8.2
   * Update debian/patches and add descriptions
diff --git a/debian/control b/debian/control
index 8604e1d..7d86e9b 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/libflickrnet/trunk
 Package: libflickrnet2.2-cil
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
-Conflicts: libflickrnet2.1.5-cil (<= 25277-8)
 Replaces: libflickrnet2.1.5-cil (<= 25277-8)
 Description: Flickr.Net API Library
  The Flickr.Net API is a .Net Library for accessing the Flickr

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/flickrnet.git