[libticcutils] 27/47: * debian/control: added Conflicts: libticcutils1-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 libticcutils.

commit 9d596eee5a9c7f01c13f37c8513ba5187065755a
Author: Ko van der Sloot <ko.vandersloot at uvt.nl>
Date:   Thu Apr 18 12:54:06 2013 +0000

    * debian/control: added Conflicts: libticcutils1-dev
    *
---
 debian/changelog | 7 ++++---
 debian/control   | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 455940d..f48dd6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-ticcutils (0.4-2) UNRELEASED; urgency=low
+ticcutils (0.4-2) unstable; urgency=low
 
- * UNRELEASED
+  * debian/control: added Conflicts: libticcutils1-dev
+  * 
 
- -- Ko van der Sloot <ko.vandersloot at uvt.nl>  Thu, 04 Apr 2013 10:38:02 +0200
+ -- Ko van der Sloot <ko.vandersloot at uvt.nl>  Thu, 18 Apr 2013 14:52:22 +0200
 
 ticcutils (0.4-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index eb0ea4e..658a201 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Package: libticcutils2-dev
 Section: libdevel
 Architecture: any
 Depends: libticcutils2 (= ${binary:Version}),${misc:Depends}
+Conflicts: libticcutils1-dev
 Description: library for TiCC software
  The TiCC utils C++ library contains useful functions and other goodies for
  general use in TiMBL and other parts of the TiCC software stack and beyond.

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