[libfolia] 32/53: debian/controol: Added Conflicts: libfolia1-dev and Replaces: libfolia1-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 libfolia.

commit 99d6d1a0b6ff3528fb10309329eb7f59f0a38cef
Author: Ko van der Sloot <ko.vandersloot at uvt.nl>
Date:   Thu Apr 18 14:59:06 2013 +0000

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

diff --git a/debian/changelog b/debian/changelog
index af37cb5..db78262 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libfolia (0.10-1ubuntu1) UNRELEASED; urgency=low
+libfolia (0.10-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * debian/controol: Added Conflicts: libfolia1-dev and 
+      Replaces: libfolia1-dev
 
- -- Ko van der Sloot <ko.vandersloot at uvt.nl>  Thu, 04 Apr 2013 13:01:41 +0200
+ -- Ko van der Sloot <ko.vandersloot at uvt.nl>  Thu, 18 Apr 2013 16:55:41 +0200
 
 libfolia (0.10-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f4648ae..32ed37d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@ Package: libfolia2-dev
 Section: libdevel
 Architecture: any
 Depends: libfolia2 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libfolia1-dev
+Replaces: libfolia1-dev
 Description: implementation of the FoLiA document format
  FoLiA is an XML-based format for Linguistic Annotation suitable for 
  representing written language resources such as corpora. 

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