rev 8233 - branches/kde4/packages/kdebase/debian

[Armin Berres]

Author: trigger-guest
Date: 2007-12-14 21:51:40 +0000 (Fri, 14 Dec 2007)
New Revision: 8233

Modified:
   branches/kde4/packages/kdebase/debian/changelog
   branches/kde4/packages/kdebase/debian/control
   branches/kde4/packages/kdebase/debian/libkonq5.install
Log:
* Split some files from libkonq5 out into libkonq5-templates which conflict
  with KDE 3's kdesktop.


Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2007-12-14 08:45:49 UTC (rev 8232)
+++ branches/kde4/packages/kdebase/debian/changelog	2007-12-14 21:51:40 UTC (rev 8233)
@@ -1,3 +1,10 @@
+kdebase (4:3.97.0-2) experimental; urgency=low
+
+  * Split some files from libkonq5 out into libkonq5-templates which conflict
+    with KDE 3's kdesktop.
+
+ -- Armin Berres <trigger+debian at space-based.de>  Fri, 14 Dec 2007 19:14:00 +0100
+
 kdebase (4:3.97.0-1) experimental; urgency=low
 
   +++ Changes by Ana Beatriz Guerrero Lopez:

Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2007-12-14 08:45:49 UTC (rev 8232)
+++ branches/kde4/packages/kdebase/debian/control	2007-12-14 21:51:40 UTC (rev 8233)
@@ -189,7 +189,7 @@
 Package: libkonq5
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libkonq5-templates | kdesktop
 Description: core libraries for Konqueror
  These libraries are used by several KDE applications, most notably Konqueror
  and the kdesktop package.
@@ -197,6 +197,17 @@
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'kdebase' packages for more information.
 
+Package: libkonq5-templates
+Section: kde
+Architecture: all
+Replaces: libkonq5 (<= 4:3.97.0-1) 
+Description: data files needed by core libraries for Konqueror
+ Some data files which are used by the Konqueror core libraries. These
+ files are also provided by KDE 3's kdesktop package.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
 Package: libkonq5-dev
 Section: libdevel
 Architecture: any

Modified: branches/kde4/packages/kdebase/debian/libkonq5.install
===================================================================
--- branches/kde4/packages/kdebase/debian/libkonq5.install	2007-12-14 08:45:49 UTC (rev 8232)
+++ branches/kde4/packages/kdebase/debian/libkonq5.install	2007-12-14 21:51:40 UTC (rev 8233)
@@ -6,30 +6,3 @@
 usr/share/kde4/apps/konqueror/pics/arrow_bottomright.png
 usr/share/kde4/apps/konqueror/pics/arrow_topleft.png
 usr/share/kde4/apps/konqueror/pics/arrow_topright.png
-usr/share/templates/Directory.desktop
-usr/share/templates/HTMLFile.desktop
-usr/share/templates/linkCAMERA.desktop
-usr/share/templates/linkCDROM.desktop
-usr/share/templates/linkCDWRITER.desktop
-usr/share/templates/linkDVDROM.desktop
-usr/share/templates/linkFloppy.desktop
-usr/share/templates/linkHD.desktop
-usr/share/templates/linkMO.desktop
-usr/share/templates/linkNFS.desktop
-usr/share/templates/linkProgram.desktop
-usr/share/templates/linkURL.desktop
-usr/share/templates/linkZIP.desktop
-usr/share/templates/.source/CAMERA-Device.desktop
-usr/share/templates/.source/CDROM-Device.desktop
-usr/share/templates/.source/CDWRITER-Device.desktop
-usr/share/templates/.source/DVDROM-Device.desktop
-usr/share/templates/.source/Floppy.desktop
-usr/share/templates/.source/HD.desktop
-usr/share/templates/.source/HTMLFile.html
-usr/share/templates/.source/MO-Device.desktop
-usr/share/templates/.source/NFS.desktop
-usr/share/templates/.source/Program.desktop
-usr/share/templates/.source/TextFile.txt
-usr/share/templates/.source/URL.desktop
-usr/share/templates/.source/ZIP-Device.desktop
-usr/share/templates/TextFile.desktop