[timblserver] 57/76: debian/control: added Conflicts: libtimblserver2-dev and Replaces: libtimblserver2-dev

[Joost van Baal]

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

joostvb pushed a commit to branch master
in repository timblserver.

commit c754f75089388f193e9cb4c28d7cbc1224353a4b
Author: Ko van der Sloot <ko.vandersloot at uvt.nl>
Date:   Thu Apr 18 14:46:54 2013 +0000

    debian/control: added Conflicts: libtimblserver2-dev and
    Replaces: libtimblserver2-dev
---
 debian/changelog | 7 ++++---
 debian/control   | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1337e1c..d881493 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-timblserver (1.7-1ubuntu1) UNRELEASED; urgency=low
+timblserver (1.7-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * debian/control: added Conflicts: libtimblserver2-dev and
+     Replaces: libtimblserver2-dev
 
- -- Ko van der Sloot <ko.vandersloot at uvt.nl>  Thu, 04 Apr 2013 11:20:02 +0200
+ -- Ko van der Sloot <ko.vandersloot at uvt.nl>  Thu, 18 Apr 2013 16:39:03 +0200
 
 timblserver (1.7-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cd8d42c..1dd4b62 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,8 @@ Package: libtimblserver3-dev
 Section: libdevel
 Architecture: any
 Depends: libtimblserver3 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libtimblserver2-dev
+Replaces: libtimblserver2-dev
 Description: Server extensions for Timbl - development
  timblserver is a TiMBL wrapper; it adds server functionality to TiMBL.  It
  allows TiMBL to run multiple experiments as a TCP server, optionally via HTTP.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/timblserver.git