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

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-01-28 16:51:04 +0100 (Fri, 28 Jan 2005)
New Revision: 446

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/kdelibs-data.install
Log:
Commit for the post-OO.org-1.1.3-in-Sarge upload.
Re-add .desktop files, add Replaces/Conflicts,
etc.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2005-01-26 14:31:22 UTC (rev 445)
+++ trunk/packages/kdelibs/debian/changelog	2005-01-28 15:51:04 UTC (rev 446)
@@ -1,12 +1,24 @@
-kdelibs (4:3.3.2-2) unstable; urgency=low
+kdelibs (4:3.3.2-2) unstable; urgency=medium
 
   +++ Changes by Christopher Martin:
 
+  * !!! TODO, will pull in some nice fixes: KDE_3_3_BRANCH update.
+
   * Add patch from upstream that solves the problem wherein programs whose
     .desktop entry contained their full path, rather than just the binary
     to be executed (mainly games), confused kdeinit.
     (Closes: #270592, #290323)
 
+  * Now that openoffice.org 1.1.3 is in Sarge, re-adding to
+    debian/kdelibs-data.install:
+    - usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.draw.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.impress.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
+
+  * Also add necessary Conflicts/Replaces for old OO.org packages.
+    Since this is RC, urgency set to medium. (Closes: #292569)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
 
 kdelibs (4:3.3.2-1) unstable; urgency=medium

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2005-01-26 14:31:22 UTC (rev 445)
+++ trunk/packages/kdelibs/debian/control	2005-01-28 15:51:04 UTC (rev 446)
@@ -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)
-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)
+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)
 Description: KDE core shared data
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary

Modified: trunk/packages/kdelibs/debian/kdelibs-data.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs-data.install	2005-01-26 14:31:22 UTC (rev 445)
+++ trunk/packages/kdelibs/debian/kdelibs-data.install	2005-01-28 15:51:04 UTC (rev 446)
@@ -3333,10 +3333,14 @@
 debian/tmp/usr/share/mimelnk/application/vnd.palm.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.rn-realmedia.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.calc.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.draw.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.draw.template.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.impress.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.impress.template.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.writer.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.writer.master.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
 debian/tmp/usr/share/mimelnk/application/wordperfect.desktop
 debian/tmp/usr/share/mimelnk/application/x-abiword.desktop
 debian/tmp/usr/share/mimelnk/application/x-ace.desktop