r44266 - in /packages/timblserver/trunk/debian: changelog control

[joostvb at users.alioth.debian.org]

Author: joostvb
Date: Thu Dec 29 07:59:11 2011
New Revision: 44266

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44266
Log:
debian/control: added conflict timblserver 1.2-4, now that we ship
separate libtimblserver and libtimblserver-dev packages.

Modified:
    packages/timblserver/trunk/debian/changelog
    packages/timblserver/trunk/debian/control

Modified: packages/timblserver/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/timblserver/trunk/debian/changelog?rev=44266&op=diff
==============================================================================
--- packages/timblserver/trunk/debian/changelog (original)
+++ packages/timblserver/trunk/debian/changelog Thu Dec 29 07:59:11 2011
@@ -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
 

Modified: packages/timblserver/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/timblserver/trunk/debian/control?rev=44266&op=diff
==============================================================================
--- packages/timblserver/trunk/debian/control (original)
+++ packages/timblserver/trunk/debian/control Thu Dec 29 07:59:11 2011
@@ -30,6 +30,7 @@
 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 @@
 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.