rev 9933 - in branches/kde4/packages: kdebase-runtime/debian kdebase-workspace/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2008-03-31 22:08:17 +0000 (Mon, 31 Mar 2008)
New Revision: 9933

Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/not-installed
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
Log:
move some files around for newer snapshots

Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-03-30 13:50:23 UTC (rev 9932)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-03-31 22:08:17 UTC (rev 9933)
@@ -1,3 +1,11 @@
+kdebase-runtime (4:4.0.66+svn791114-2) experimental; urgency=low
+
+  * Some files conflicting with kde3 kdebase-data moved in from -workspace.
+    They also don't belong in runtime, but windows don't have workspace. Put
+    them in not-installed so far. This is post revision 792360.
+
+ -- Sune Vuorela <debian at pusling.com>  Tue, 01 Apr 2008 00:02:20 +0200
+
 kdebase-runtime (4:4.0.66+svn791114-1) experimental; urgency=low
 
   * First KDE 4.1 snapshot packaged, this goes to experimental.

Modified: branches/kde4/packages/kdebase-runtime/debian/not-installed
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/not-installed	2008-03-30 13:50:23 UTC (rev 9932)
+++ branches/kde4/packages/kdebase-runtime/debian/not-installed	2008-03-31 22:08:17 UTC (rev 9933)
@@ -4,3 +4,40 @@
 # Do not ship khelpcenter for now, KDE 4 does not contain any help anyway,
 # and it is updating KDE 3's khelpcenter.
 
+./usr/share/desktop-directories/kde-development.directory
+./usr/share/desktop-directories/kde-development-translation.directory
+./usr/share/desktop-directories/kde-development-webdevelopment.directory
+./usr/share/desktop-directories/kde-editors.directory
+./usr/share/desktop-directories/kde-education.directory
+./usr/share/desktop-directories/kde-edu-languages.directory
+./usr/share/desktop-directories/kde-edu-mathematics.directory
+./usr/share/desktop-directories/kde-edu-miscellaneous.directory
+./usr/share/desktop-directories/kde-edu-science.directory
+./usr/share/desktop-directories/kde-edu-tools.directory
+./usr/share/desktop-directories/kde-games-arcade.directory
+./usr/share/desktop-directories/kde-games-board.directory
+./usr/share/desktop-directories/kde-games-card.directory
+./usr/share/desktop-directories/kde-games.directory
+./usr/share/desktop-directories/kde-games-kids.directory
+./usr/share/desktop-directories/kde-games-roguelikes.directory
+./usr/share/desktop-directories/kde-games-strategy.directory
+./usr/share/desktop-directories/kde-graphics.directory
+./usr/share/desktop-directories/kde-internet.directory
+./usr/share/desktop-directories/kde-internet-terminal.directory
+./usr/share/desktop-directories/kde-main.directory
+./usr/share/desktop-directories/kde-more.directory
+./usr/share/desktop-directories/kde-multimedia.directory
+./usr/share/desktop-directories/kde-office.directory
+./usr/share/desktop-directories/kde-science.directory
+./usr/share/desktop-directories/kde-settingsmenu.directory
+./usr/share/desktop-directories/kde-system.directory
+./usr/share/desktop-directories/kde-system-terminal.directory
+./usr/share/desktop-directories/kde-toys.directory
+./usr/share/desktop-directories/kde-unknown.directory
+./usr/share/desktop-directories/kde-utilities-accessibility.directory
+./usr/share/desktop-directories/kde-utilities-desktop.directory
+./usr/share/desktop-directories/kde-utilities.directory
+./usr/share/desktop-directories/kde-utilities-file.directory
+./usr/share/desktop-directories/kde-utilities-peripherals.directory
+./usr/share/desktop-directories/kde-utilities-pim.directory
+./usr/share/desktop-directories/kde-utilities-xutils.directory

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-03-30 13:50:23 UTC (rev 9932)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-03-31 22:08:17 UTC (rev 9933)
@@ -1,3 +1,10 @@
+kdebase-workspace (4:4.0.66+svn791114-4) experimental; urgency=low
+
+  * Move some files to -runtime/not-installed. Moved upstream. This is post 
+    revision 792360.
+
+ -- Sune Vuorela <debian at pusling.com>  Tue, 01 Apr 2008 00:01:04 +0200
+
 kdebase-workspace (4:4.0.66+svn791114-3) experimental; urgency=low
 
   * Remove accidentally added kgreet_classic from kdebase-workspace-bin.

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-03-30 13:50:23 UTC (rev 9932)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-03-31 22:08:17 UTC (rev 9933)
@@ -14,43 +14,6 @@
 usr/share/dbus-1/interfaces/org.kde.krunner.Interface.xml
 usr/share/dbus-1/interfaces/org.kde.KSMServerInterface.xml
 usr/share/dbus-1/interfaces/org.kde.screensaver.xml
-usr/share/desktop-directories/kde-development.directory
-usr/share/desktop-directories/kde-development-translation.directory
-usr/share/desktop-directories/kde-development-webdevelopment.directory
-usr/share/desktop-directories/kde-editors.directory
-usr/share/desktop-directories/kde-education.directory
-usr/share/desktop-directories/kde-edu-languages.directory
-usr/share/desktop-directories/kde-edu-mathematics.directory
-usr/share/desktop-directories/kde-edu-miscellaneous.directory
-usr/share/desktop-directories/kde-edu-science.directory
-usr/share/desktop-directories/kde-edu-tools.directory
-usr/share/desktop-directories/kde-games-arcade.directory
-usr/share/desktop-directories/kde-games-board.directory
-usr/share/desktop-directories/kde-games-card.directory
-usr/share/desktop-directories/kde-games.directory
-usr/share/desktop-directories/kde-games-kids.directory
-usr/share/desktop-directories/kde-games-roguelikes.directory
-usr/share/desktop-directories/kde-games-strategy.directory
-usr/share/desktop-directories/kde-graphics.directory
-usr/share/desktop-directories/kde-internet.directory
-usr/share/desktop-directories/kde-internet-terminal.directory
-usr/share/desktop-directories/kde-main.directory
-usr/share/desktop-directories/kde-more.directory
-usr/share/desktop-directories/kde-multimedia.directory
-usr/share/desktop-directories/kde-office.directory
-usr/share/desktop-directories/kde-science.directory
-usr/share/desktop-directories/kde-settingsmenu.directory
-usr/share/desktop-directories/kde-system.directory
-usr/share/desktop-directories/kde-system-terminal.directory
-usr/share/desktop-directories/kde-toys.directory
-usr/share/desktop-directories/kde-unknown.directory
-usr/share/desktop-directories/kde-utilities-accessibility.directory
-usr/share/desktop-directories/kde-utilities-desktop.directory
-usr/share/desktop-directories/kde-utilities.directory
-usr/share/desktop-directories/kde-utilities-file.directory
-usr/share/desktop-directories/kde-utilities-peripherals.directory
-usr/share/desktop-directories/kde-utilities-pim.directory
-usr/share/desktop-directories/kde-utilities-xutils.directory
 usr/share/doc/kde4/HTML/en/klipper/index.cache.bz2
 usr/share/doc/kde4/HTML/en/klipper/index.docbook
 usr/share/doc/kde4/HTML/en/klipper/screenshot.png