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

[Adeodato Simó]

Author: dato-guest
Date: 2005-02-12 16:13:54 +0100 (Sat, 12 Feb 2005)
New Revision: 459

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/kdelibs-data.install
Log:
Revert openoffice.org 1.1.3 compatible changes since we're uploading
kdelibs before 1.1.3 enters testing.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2005-02-12 15:06:20 UTC (rev 458)
+++ trunk/packages/kdelibs/debian/changelog	2005-02-12 15:13:54 UTC (rev 459)
@@ -16,16 +16,8 @@
     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
+  * Add necessary Conflicts/Replaces for old OO.org packages. (Closes: #292569)
 
-  * Also add necessary Conflicts/Replaces for old OO.org packages.
-    (Closes: #292569)
-
   * Add better manpage for lnusertemp. Thanks to Javier Fernández-Sanguino
     Peña. (Closes: #292081)
 

Modified: trunk/packages/kdelibs/debian/kdelibs-data.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs-data.install	2005-02-12 15:06:20 UTC (rev 458)
+++ trunk/packages/kdelibs/debian/kdelibs-data.install	2005-02-12 15:13:54 UTC (rev 459)
@@ -3333,14 +3333,10 @@
 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