[timblserver] 36/76: debian/control: added conflict timblserver 1.2-4, now that we ship separate libtimblserver and libtimblserver-dev packages.

[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 f53e3557712b29039612566fd0030b020deb6a89
Author: Joost van Baal-Ilić <joostvb at debian.org>
Date:   Thu Dec 29 07:59:11 2011 +0000

    debian/control: added conflict timblserver 1.2-4, now that we ship
    separate libtimblserver and libtimblserver-dev packages.
---
 debian/changelog | 4 +++-
 debian/control   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 033f64f..28ffb79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 timblserver (1.4-2) UNRELEASED; urgency=low
 
   * debian/source: added; updated package to use 3.0 source format.
+  * debian/control: added conflict timblserver 1.2-4, now that we ship
+    separate libtimblserver and libtimblserver-dev packages.
 
- -- Joost van Baal-Ilić <joostvb at debian.org>  Thu, 29 Dec 2011 08:48:41 +0100
+ -- Joost van Baal-Ilić <joostvb at debian.org>  Thu, 29 Dec 2011 08:57:26 +0100
 
 timblserver (1.4-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e413df2..43dec1e 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Package: libtimblserver
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libtimbl3 (>= 6.4.2)
+Conflicts: timblserver (<= 1.2-4)
 Description: Server extensions for Timbl - runtime
  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.
@@ -48,6 +49,7 @@ Package: libtimblserver-dev
 Section: libdevel
 Architecture: any
 Depends: libtimblserver (= ${binary:Version}), ${misc:Depends}, libtimbl3 (>= 6.4.2)
+Conflicts: timblserver (<= 1.2-4)
 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