rev 11995 - in branches/kde4/packages/koffice/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-08-27 15:15:37 +0000 (Wed, 27 Aug 2008)
New Revision: 11995

Removed:
   branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff
Modified:
   branches/kde4/packages/koffice/debian/changelog
   branches/kde4/packages/koffice/debian/control
Log:
another update


Modified: branches/kde4/packages/koffice/debian/changelog
===================================================================
--- branches/kde4/packages/koffice/debian/changelog	2008-08-27 13:18:07 UTC (rev 11994)
+++ branches/kde4/packages/koffice/debian/changelog	2008-08-27 15:15:37 UTC (rev 11995)
@@ -8,9 +8,9 @@
     See the patch for licensing information.
   * Update to Standards-Version 3.8.0, no changes required.
   * Update lintian overrides.
-  * TODO: krita moved files, now?
+  * Some data files got moved from krita to krita-data, add a conflict.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 27 Aug 2008 14:02:13 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 27 Aug 2008 14:21:55 +0200
 
 koffice (1:1.9.96.0~that.is.really.1.9.95.9-2) experimental; urgency=low
 

Modified: branches/kde4/packages/koffice/debian/control
===================================================================
--- branches/kde4/packages/koffice/debian/control	2008-08-27 13:18:07 UTC (rev 11994)
+++ branches/kde4/packages/koffice/debian/control	2008-08-27 15:15:37 UTC (rev 11995)
@@ -165,6 +165,7 @@
 Package: krita-data
 Architecture: all
 Section: kde
+Conflicts: krita (<1:1.9.96.0~that.is.really.1.9.95.10-1)
 Description: data files for Krita painting program
  This package contains architecture-independent data files for Krita,
  the painting program shipped with the KDE Office Suite.

Deleted: branches/kde4/packages/koffice/debian/patches/97_fix_target_link_libraries.diff