DEB tdebase: Add kdf-trinity (<< 4:14.0.6~) to Conflicts

for tdebase-data-trinity to ensure smooth upgrade.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

debian/lenny/tdebase/debian/control

@@ -126,7 +126,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-data-trinity (<< 4:14.0.0~)
 Breaks: kdebase-data-trinity (<< 4:14.0.0~)
-Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1)
+Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1), kdf-trinity (<< 4:14.0.6~)
 Description: shared data files for the TDE base module
  This package contains the architecture-independent shared data files
  needed for a basic Trinity desktop installation.

debian/squeeze/tdebase/debian/control

@@ -126,7 +126,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-data-trinity (<< 4:14.0.0~)
 Breaks: kdebase-data-trinity (<< 4:14.0.0~)
-Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1)
+Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1), kdf-trinity (<< 4:14.0.6~)
 Description: shared data files for the TDE base module
  This package contains the architecture-independent shared data files
  needed for a basic Trinity desktop installation.

ubuntu/maverick/tdebase/debian/control

@@ -126,7 +126,7 @@ Section: tde
 Architecture: all
 Replaces: kdebase-data-kde3 (<< 4:14.0.0~), kdebase-data-trinity (<< 4:14.0.0~)
 Breaks: kdebase-data-kde3 (<< 4:14.0.0~), kdebase-data-trinity (<< 4:14.0.0~)
-Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1)
+Conflicts: kcontrol-trinity (<< 4:3.4.2-1), twin-trinity (<< 4:3.4.2-1), kicker-trinity (<< 4:3.4.2-1), kdf-trinity (<< 4:14.0.6~)
 Description: shared data files for the TDE base module
  This package contains the architecture-independent shared data files
  needed for a basic Trinity desktop installation.