[Pkg-kde-commits] rev 460 - trunk/packages/kdelibs/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-02-12 17:18:32 +0100 (Sat, 12 Feb 2005)
New Revision: 460

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
Log:
OK, old oo.org + new-KDE should work - nothing
spectacular changed in the .desktop files that I can
see. So Replaces only - one against pre-mimelnk oo.org,
and one against (<< 1.1.3) oo.org-mimelnk. Hopefully
this is right... peer review would be great :)


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2005-02-12 15:13:54 UTC (rev 459)
+++ trunk/packages/kdelibs/debian/changelog	2005-02-12 16:18:32 UTC (rev 460)
@@ -16,7 +16,8 @@
     to be executed (mainly games), confused kdeinit.
     (Closes: #270592, #290323)
 
-  * Add necessary Conflicts/Replaces for old OO.org packages. (Closes: #292569)
+  * debian/control: Add necessary kdelibs-data Replaces for old
+    openoffice.org packages. (Closes: #292569)
 
   * Add better manpage for lnusertemp. Thanks to Javier Fernández-Sanguino
     Peña. (Closes: #292081)

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2005-02-12 15:13:54 UTC (rev 459)
+++ trunk/packages/kdelibs/debian/control	2005-02-12 16:18:32 UTC (rev 460)
@@ -42,8 +42,8 @@
 Section: libs
 Architecture: all
 Depends: hicolor-icon-theme
-Conflicts: kdelibs3 (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), kontour (<< 1:1.3.0), openoffice.org (<< 1.1.3)
-Replaces: kbabel (<< 4:3.2.0), kchart (<< 1:1.3.0), kcontrol (<< 4:3.3.0), kdeartwork-style (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdetrayproxy (>= 0.2-1),  kformula (<< 1:1.3.0), kivio (<< 1:1.3.0), koffice-data (<< 1:1.3.0-2), koffice-libs (<< 1:1.3.0), kontour (<< 1:1.3.0), korganizer (<< 4:3.3.0), kpresenter (<< 1:1.3.0), krusader (<< 1.30-2), kspread (<< 1:1.3.0), kugar (<< 1:1.3.0), kword (<< 1:1.3.0), kjscmd (<< 4:3.3.0), openoffice.org (<< 1.1.3)
+Conflicts: kdelibs3 (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdetrayproxy (>= 0.2-1), kontour (<< 1:1.3.0)
+Replaces: kbabel (<< 4:3.2.0), kchart (<< 1:1.3.0), kcontrol (<< 4:3.3.0), kdeartwork-style (<< 4:3.0.0), kdelibs3 (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), kdetrayproxy (>= 0.2-1),  kformula (<< 1:1.3.0), kivio (<< 1:1.3.0), koffice-data (<< 1:1.3.0-2), koffice-libs (<< 1:1.3.0), kontour (<< 1:1.3.0), korganizer (<< 4:3.3.0), kpresenter (<< 1:1.3.0), krusader (<< 1.30-2), kspread (<< 1:1.3.0), kugar (<< 1:1.3.0), kword (<< 1:1.3.0), kjscmd (<< 4:3.3.0), openoffice.org (<< 1.0.3-3), openoffice.org-mimelnk (<< 1.1.3)
 Description: KDE core shared data
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary