[Pkg-privacy-commits] [libotr] 157/225: Imported Debian patch 4.0.0-2

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository libotr.

commit 4e628af5eb81e2b1b9f08cf24c93a6556f7bf659
Author: Thibaut VARENE <varenet at debian.org>
Date:   Sat Oct 6 11:51:03 2012 +0200

    Imported Debian patch 4.0.0-2
---
 debian/changelog | 6 ++++++
 debian/control   | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8fbc35a..113c03c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libotr (4.0.0-2) unstable; urgency=low
+
+  * Remove Conflicts with libotr2 (Closes: #689667)
+
+ -- Thibaut VARENE <varenet at debian.org>  Sat, 06 Oct 2012 11:51:03 +0200
+
 libotr (4.0.0-1) unstable; urgency=low
 
   * New upstream release, upload to unstable
diff --git a/debian/control b/debian/control
index 2c91862..ceace4d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,6 @@ Package: libotr5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libotr5-bin (>= ${binary:Version})
-Conflicts: libotr2
-Replaces: libotr0, libotr2
 Description: Off-the-Record Messaging library
  Off-the-Record (OTR) Messaging Library and Toolkit
  .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git