[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.3-2-368-g6843e2f

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=cb68168

The following commit has been merged in the tip branch:
commit cb68168751b9f3acb25d3983305ce949b43602b7
Author: Pino Toscano <pino at debian.org>
Date:   Sat Aug 13 01:18:19 2011 +0200

    calligrawords-data: remove conflict with kword-data
    
    they have no more files in common
---
 debian/control |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 5a9317e..91f0011 100644
--- a/debian/control
+++ b/debian/control
@@ -313,8 +313,6 @@ Package: calligrawords-data
 Architecture: all
 Section: text
 Depends: ${misc:Depends}
-Replaces: kword-data
-Conflicts: kword-data
 Homepage: http://www.calligra-suite.org/words/
 Description: data files for Words word processor
  This package contains architecture-independent data files for Words,

-- 
Calligra suite packaging