rev 9894 - in branches/kde4/packages/kdebase-runtime/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Fri Mar 28 17:38:03 UTC 2008


Author: ana
Date: 2008-03-28 17:38:03 +0000 (Fri, 28 Mar 2008)
New Revision: 9894

Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/control
   branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install
   branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.install
   branches/kde4/packages/kdebase-runtime/debian/khelpcenter.install
   branches/kde4/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff
   branches/kde4/packages/kdebase-runtime/debian/rules
Log:
kdebase-runtime 4.1


Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-03-28 17:36:40 UTC (rev 9893)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-03-28 17:38:03 UTC (rev 9894)
@@ -1,3 +1,13 @@
+kdebase-runtime (4:4.0.66+svn791114-1) experimental; urgency=low
+
+  * First KDE 4.1 snapshot packaged, this goes to experimental.
+  * Update installed files.
+  * Bump build depends on >= 4.0.66
+  * Build depends on strigi >= 0.5.8-2 built against Qt 4.4 on experimental
+    and soprano >= 2.0.97~.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 28 Mar 2008 15:05:35 +0100
+
 kdebase-runtime (4:4.0.2-1) unstable; urgency=low
 
   * New upstream release. 

Modified: branches/kde4/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/control	2008-03-28 17:36:40 UTC (rev 9893)
+++ branches/kde4/packages/kdebase-runtime/debian/control	2008-03-28 17:38:03 UTC (rev 9894)
@@ -3,9 +3,10 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake, kdepimlibs5-dev (>= 4:4.0.2),
- libclucene-dev, libphonon-dev, libsmbclient-dev, libsoprano-dev (>= 2.0.0),
- libstrigiqtdbusclient-dev (>= 0.5.7), libxcb1-dev, libxine-dev
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake, 
+ kdepimlibs5-dev (>= 4:4.0.66), libphonon-dev (>= 4:4.0.66), 
+ libclucene-dev, libsmbclient-dev, libsoprano-dev (>= 2.0.97~),
+ libstrigiqtdbusclient-dev (>= 0.5.7-2), libxcb1-dev, libxine-dev
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-runtime

Modified: branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install	2008-03-28 17:36:40 UTC (rev 9893)
+++ branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install	2008-03-28 17:38:03 UTC (rev 9894)
@@ -1,145 +1,147 @@
+etc/kde4/emoticons.knsrc
 etc/kde4/khotnewstuff.knsrc
 etc/kde4/kshorturifilterrc
 etc/xdg/menus/kde4-information.menu
+usr/share/applications/kde4/Help.desktop
 usr/share/applications/kde4/knetattach.desktop
 usr/share/dbus-1/interfaces/org.kde.KTimeZoned.xml
 usr/share/dbus-1/services/org.kde.knotify.service
 usr/share/desktop-directories/kde4-information.directory
 usr/share/doc/kde4/HTML/en/kcontrol/background/common
-usr/share/doc/kde4/HTML/en/kcontrol/bell/common
-usr/share/doc/kde4/HTML/en/kcontrol/cache/common
-usr/share/doc/kde4/HTML/en/kcontrol/clock/common
-usr/share/doc/kde4/HTML/en/kcontrol/colors/common
-usr/share/doc/kde4/HTML/en/kcontrol/common
-usr/share/doc/kde4/HTML/en/kcontrol/cookies/common
-usr/share/doc/kde4/HTML/en/kcontrol/crypto/common
-usr/share/doc/kde4/HTML/en/kcontrol/desktop/common
-usr/share/doc/kde4/HTML/en/kcontrol/desktopbehavior/common
-usr/share/doc/kde4/HTML/en/kcontrol/ebrowsing/common
-usr/share/doc/kde4/HTML/en/kcontrol/email/common
-usr/share/doc/kde4/HTML/en/kcontrol/energy/common
-usr/share/doc/kde4/HTML/en/kcontrol/filemanager/common
-usr/share/doc/kde4/HTML/en/kcontrol/filetypes/common
-usr/share/doc/kde4/HTML/en/kcontrol/fontinst/common
-usr/share/doc/kde4/HTML/en/kcontrol/fonts/common
-usr/share/doc/kde4/HTML/en/kcontrol/helpindex/common
-usr/share/doc/kde4/HTML/en/kcontrol/icons/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmcss/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmkonsole/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmlaunch/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmnotify/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmsmserver/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmstyle/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmtaskbar/common
-usr/share/doc/kde4/HTML/en/kcontrol/kdm/common
-usr/share/doc/kde4/HTML/en/kcontrol/keyboard/common
-usr/share/doc/kde4/HTML/en/kcontrol/keys/common
-usr/share/doc/kde4/HTML/en/kcontrol/khtml/common
-usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/common
-usr/share/doc/kde4/HTML/en/kcontrol/language/common
-usr/share/doc/kde4/HTML/en/kcontrol/mouse/common
-usr/share/doc/kde4/HTML/en/kcontrol/netpref/common
-usr/share/doc/kde4/HTML/en/kcontrol/panel/common
-usr/share/doc/kde4/HTML/en/kcontrol/panelappearance/common
-usr/share/doc/kde4/HTML/en/kcontrol/passwords/common
-usr/share/doc/kde4/HTML/en/kcontrol/performance/common
-usr/share/doc/kde4/HTML/en/kcontrol/proxy/common
-usr/share/doc/kde4/HTML/en/kcontrol/screensaver/common
-usr/share/doc/kde4/HTML/en/kcontrol/smb/common
-usr/share/doc/kde4/HTML/en/kcontrol/useragent/common
-usr/share/doc/kde4/HTML/en/kcontrol/windowmanagement/common
 usr/share/doc/kde4/HTML/en/kcontrol/background/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/background/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/bell/common
 usr/share/doc/kde4/HTML/en/kcontrol/bell/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/bell/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/cache/common
 usr/share/doc/kde4/HTML/en/kcontrol/cache/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/cache/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/clock/common
 usr/share/doc/kde4/HTML/en/kcontrol/clock/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/clock/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/colors/common
 usr/share/doc/kde4/HTML/en/kcontrol/colors/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/colors/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/common
+usr/share/doc/kde4/HTML/en/kcontrol/cookies/common
 usr/share/doc/kde4/HTML/en/kcontrol/cookies/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/cookies/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/crypto/common
 usr/share/doc/kde4/HTML/en/kcontrol/crypto/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/crypto/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/desktopbehavior/common
 usr/share/doc/kde4/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/desktopbehavior/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/desktop/common
 usr/share/doc/kde4/HTML/en/kcontrol/desktop/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/desktop/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/ebrowsing/common
 usr/share/doc/kde4/HTML/en/kcontrol/ebrowsing/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/ebrowsing/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/email/common
 usr/share/doc/kde4/HTML/en/kcontrol/email/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/email/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/energy/common
 usr/share/doc/kde4/HTML/en/kcontrol/energy/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/energy/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/filemanager/common
 usr/share/doc/kde4/HTML/en/kcontrol/filemanager/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/filemanager/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/filemanager/kfileman1.png
 usr/share/doc/kde4/HTML/en/kcontrol/filemanager/kfileman2.png
+usr/share/doc/kde4/HTML/en/kcontrol/filetypes/common
 usr/share/doc/kde4/HTML/en/kcontrol/filetypes/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/filetypes/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/fontinst/common
 usr/share/doc/kde4/HTML/en/kcontrol/fontinst/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/fontinst/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/fonts/common
 usr/share/doc/kde4/HTML/en/kcontrol/fonts/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/fonts/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/helpindex/common
 usr/share/doc/kde4/HTML/en/kcontrol/helpindex/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/helpindex/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/icons/common
 usr/share/doc/kde4/HTML/en/kcontrol/icons/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/icons/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kcmcss/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmcss/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmcss/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kcmkonsole/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmkonsole/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmkonsole/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kcmlaunch/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmlaunch/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kcmnotify/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmnotify/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmnotify/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kcmsmserver/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmsmserver/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kcmstyle/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmstyle/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmstyle/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kcmtaskbar/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmtaskbar/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kdm/common
 usr/share/doc/kde4/HTML/en/kcontrol/kdm/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kdm/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/keyboard/common
 usr/share/doc/kde4/HTML/en/kcontrol/keyboard/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/keyboard/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/keys/common
 usr/share/doc/kde4/HTML/en/kcontrol/keys/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/keys/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/khtml/common
 usr/share/doc/kde4/HTML/en/kcontrol/khtml/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/khtml/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/khtml/nsplugin.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/common
 usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/language/common
 usr/share/doc/kde4/HTML/en/kcontrol/language/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/language/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/mouse/common
 usr/share/doc/kde4/HTML/en/kcontrol/mouse/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/mouse/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/netpref/common
 usr/share/doc/kde4/HTML/en/kcontrol/netpref/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/netpref/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/panelappearance/common
 usr/share/doc/kde4/HTML/en/kcontrol/panelappearance/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/panelappearance/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/panel/common
 usr/share/doc/kde4/HTML/en/kcontrol/panel/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/panel/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/passwords/common
 usr/share/doc/kde4/HTML/en/kcontrol/passwords/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/passwords/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/performance/common
 usr/share/doc/kde4/HTML/en/kcontrol/performance/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/performance/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/proxy/common
 usr/share/doc/kde4/HTML/en/kcontrol/proxy/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/proxy/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/proxy/socks.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/screensaver/common
 usr/share/doc/kde4/HTML/en/kcontrol/screensaver/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/screensaver/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/screenshot.png
+usr/share/doc/kde4/HTML/en/kcontrol/smb/common
 usr/share/doc/kde4/HTML/en/kcontrol/smb/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/smb/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/useragent/common
 usr/share/doc/kde4/HTML/en/kcontrol/useragent/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/useragent/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/windowmanagement/common
 usr/share/doc/kde4/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/windowmanagement/index.docbook
 usr/share/doc/kde4/HTML/en/kdebugdialog/common
@@ -149,10 +151,10 @@
 usr/share/doc/kde4/HTML/en/kdesu/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kdesu/index.docbook
 usr/share/doc/kde4/HTML/en/kdesu/man-kdesu.1.docbook
-usr/share/doc/kde4/HTML/en/kioslave/common
 usr/share/doc/kde4/HTML/en/kioslave/bzip2.docbook
 usr/share/doc/kde4/HTML/en/kioslave/bzip.docbook
 usr/share/doc/kde4/HTML/en/kioslave/cgi.docbook
+usr/share/doc/kde4/HTML/en/kioslave/common
 usr/share/doc/kde4/HTML/en/kioslave/data.docbook
 usr/share/doc/kde4/HTML/en/kioslave/file.docbook
 usr/share/doc/kde4/HTML/en/kioslave/finger.docbook
@@ -242,7 +244,6 @@
 usr/share/emoticons/kde4/wink.png
 usr/share/kde4/apps/cmake/modules/FindCLucene.cmake
 usr/share/kde4/apps/cmake/modules/FindXCB.cmake
-usr/share/kde4/apps/cmake/modules/FindXine.cmake
 usr/share/kde4/apps/drkonqi/debuggers/gdbrc
 usr/share/kde4/apps/drkonqi/pics/konqi.png
 usr/share/kde4/apps/drkonqi/presets/developerrc
@@ -270,6 +271,7 @@
 usr/share/kde4/services/componentchooser.desktop
 usr/share/kde4/services/cursorthumbnail.desktop
 usr/share/kde4/services/djvuthumbnail.desktop
+usr/share/kde4/services/emoticons.desktop
 usr/share/kde4/services/exrthumbnail.desktop
 usr/share/kde4/services/finger.protocol
 usr/share/kde4/services/fish.protocol
@@ -369,12 +371,19 @@
 usr/share/kde4/services/searchproviders/mamma.desktop
 usr/share/kde4/services/searchproviders/metacrawler.desktop
 usr/share/kde4/services/searchproviders/msdn.desktop
+usr/share/kde4/services/searchproviders/multitran-deru.desktop
+usr/share/kde4/services/searchproviders/multitran-enru.desktop
+usr/share/kde4/services/searchproviders/multitran-esru.desktop
+usr/share/kde4/services/searchproviders/multitran-frru.desktop
+usr/share/kde4/services/searchproviders/multitran-itru.desktop
+usr/share/kde4/services/searchproviders/multitran-nlru.desktop
 usr/share/kde4/services/searchproviders/netcraft.desktop
 usr/share/kde4/services/searchproviders/nl-telephone.desktop
 usr/share/kde4/services/searchproviders/nl-teletekst.desktop
 usr/share/kde4/services/searchproviders/pgpkeys.desktop
 usr/share/kde4/services/searchproviders/php.desktop
 usr/share/kde4/services/searchproviders/python.desktop
+usr/share/kde4/services/searchproviders/qt3.desktop
 usr/share/kde4/services/searchproviders/qt.desktop
 usr/share/kde4/services/searchproviders/rae.desktop
 usr/share/kde4/services/searchproviders/rfc.desktop

Modified: branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.install
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.install	2008-03-28 17:36:40 UTC (rev 9893)
+++ branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.install	2008-03-28 17:38:03 UTC (rev 9894)
@@ -5,6 +5,7 @@
 usr/bin/kde-open
 usr/bin/kfile4
 usr/bin/khotnewstuff4
+usr/bin/kiconfinder
 usr/bin/kioclient
 usr/bin/kmimetypefinder
 usr/bin/knotify4
@@ -13,6 +14,7 @@
 usr/bin/ktraderclient
 usr/bin/ktrash4
 usr/bin/kuiserver
+usr/bin/solid-hardware
 usr/lib/kde4/cursorthumbnail.so
 usr/lib/kde4/djvuthumbnail.so
 usr/lib/kde4/exrthumbnail.so
@@ -20,6 +22,7 @@
 usr/lib/kde4/imagethumbnail.so
 usr/lib/kde4/kcm_cgi.so
 usr/lib/kde4/kcm_componentchooser.so
+usr/lib/kde4/kcm_emoticons.so
 usr/lib/kde4/kcm_icons.so
 usr/lib/kde4/kcm_ioslaveinfo.so
 usr/lib/kde4/kcm_kded.so
@@ -76,5 +79,6 @@
 usr/lib/kde4/svgthumbnail.so
 usr/lib/kde4/textthumbnail.so
 usr/lib/libkdeinit4_kcmshell4.so
+usr/lib/libkdeinit4_khelpcenter.so
 usr/lib/libkdeinit4_kuiserver.so
 usr/lib/strigi/strigiindex_sopranobackend.so

Modified: branches/kde4/packages/kdebase-runtime/debian/khelpcenter.install
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/khelpcenter.install	2008-03-28 17:36:40 UTC (rev 9893)
+++ branches/kde4/packages/kdebase-runtime/debian/khelpcenter.install	2008-03-28 17:38:03 UTC (rev 9894)
@@ -4,6 +4,7 @@
 usr/share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
 usr/share/doc/kde4/HTML/en/khelpcenter/background.png
 usr/share/doc/kde4/HTML/en/khelpcenter/bgtable.png
+usr/share/doc/kde4/HTML/en/khelpcenter/contact.docbook
 usr/share/doc/kde4/HTML/en/khelpcenter/faq/about.docbook
 usr/share/doc/kde4/HTML/en/khelpcenter/faq/configkde.docbook
 usr/share/doc/kde4/HTML/en/khelpcenter/faq/contrib.docbook
@@ -29,6 +30,8 @@
 usr/share/doc/kde4/HTML/en/khelpcenter/glossary/index.cache.bz2
 usr/share/doc/kde4/HTML/en/khelpcenter/glossary/index.docbook
 usr/share/doc/kde4/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/help.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/index.cache.bz2
 usr/share/doc/kde4/HTML/en/khelpcenter/index.docbook
 usr/share/doc/kde4/HTML/en/khelpcenter/kdelogo2.png
 usr/share/doc/kde4/HTML/en/khelpcenter/khelpcenter.png
@@ -38,6 +41,7 @@
 usr/share/doc/kde4/HTML/en/khelpcenter/quickstart/index.cache.bz2
 usr/share/doc/kde4/HTML/en/khelpcenter/quickstart/index.docbook
 usr/share/doc/kde4/HTML/en/khelpcenter/shadow1.png
+usr/share/doc/kde4/HTML/en/khelpcenter/support.docbook
 usr/share/doc/kde4/HTML/en/khelpcenter/userguide/accessibility.docbook
 usr/share/doc/kde4/HTML/en/khelpcenter/userguide/amarok-icon.png
 usr/share/doc/kde4/HTML/en/khelpcenter/userguide/amarok.png
@@ -146,6 +150,8 @@
 usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict7.png
 usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict8.png
 usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict9.png
+usr/share/doc/kde4/HTML/en/khelpcenter/welcome.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/whatiskde.docbook
 usr/share/icons/hicolor/128x128/apps/khelpcenter.png
 usr/share/icons/hicolor/16x16/apps/khelpcenter.png
 usr/share/icons/hicolor/22x22/apps/khelpcenter.png
@@ -193,10 +199,3 @@
 usr/share/kde4/apps/khelpcenter/table-of-contents.xslt
 usr/share/kde4/config.kcfg/khelpcenter.kcfg
 usr/share/kde4/services/khelpcenter.desktop
-usr/share/doc/kde4/HTML/en/khelpcenter/contact.docbook
-usr/share/doc/kde4/HTML/en/khelpcenter/help.docbook
-usr/share/doc/kde4/HTML/en/khelpcenter/index.cache.bz2
-usr/share/doc/kde4/HTML/en/khelpcenter/support.docbook
-usr/share/doc/kde4/HTML/en/khelpcenter/welcome.docbook
-usr/share/doc/kde4/HTML/en/khelpcenter/whatiskde.docbook
-

Modified: branches/kde4/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff	2008-03-28 17:36:40 UTC (rev 9893)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff	2008-03-28 17:38:03 UTC (rev 9894)
@@ -1,5 +1,5 @@
---- a/doc/userguide/kde-for-admins.docbook
-+++ b/doc/userguide/kde-for-admins.docbook
+--- kdebase-runtime-4.0.10~svn783501.orig/doc/userguide/kde-for-admins.docbook
++++ kdebase-runtime-4.0.10~svn783501/doc/userguide/kde-for-admins.docbook
 @@ -1765,8 +1765,8 @@
  whose icon and name are defined by <filename>kde-settings.directory</filename></para>
  </listitem>
@@ -11,8 +11,8 @@
  </listitem>
  
  <listitem><para>Screensavers contains a hidden System/Screensavers menu,
---- a/kcontrol/menus/CMakeLists.txt
-+++ b/kcontrol/menus/CMakeLists.txt
+--- kdebase-runtime-4.0.10~svn783501.orig/kcontrol/menus/CMakeLists.txt
++++ kdebase-runtime-4.0.10~svn783501/kcontrol/menus/CMakeLists.txt
 @@ -4,5 +4,5 @@
  ########### install files ###############
  
@@ -21,8 +21,8 @@
 -install( FILES kde-information.directory  DESTINATION  ${XDG_DIRECTORY_INSTALL_DIR} )
 +    DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus/ RENAME kde4-information.menu )
 +install( FILES kde-information.directory  DESTINATION  ${XDG_DIRECTORY_INSTALL_DIR} RENAME kde4-information.directory )
---- a/kcontrol/menus/kde-information.menu
-+++ b/kcontrol/menus/kde-information.menu
+--- kdebase-runtime-4.0.10~svn783501.orig/kcontrol/menus/kde-information.menu
++++ kdebase-runtime-4.0.10~svn783501/kcontrol/menus/kde-information.menu
 @@ -3,7 +3,7 @@
  
  <Menu>
@@ -32,16 +32,3 @@
  	<Include>
  		<Category>X-KDE-information</Category>
  	</Include>
---- a/kcontrol/menus/kde-kcontrol.menu
-+++ b/kcontrol/menus/kde-kcontrol.menu
-@@ -10,8 +10,8 @@
- 	</Menu>
- 	<Menu>
- 		<Name>Information</Name>
--		<Directory>kde-information.directory</Directory>
--                <MergeFile>../kde-information.menu</MergeFile>
-+		<Directory>kde4-information.directory</Directory>
-+                <MergeFile>../kde4-information.menu</MergeFile>
- 	</Menu>
-         <Move>
-            <Old>Settings/Information</Old><New>Information</New>

Modified: branches/kde4/packages/kdebase-runtime/debian/rules
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/rules	2008-03-28 17:36:40 UTC (rev 9893)
+++ branches/kde4/packages/kdebase-runtime/debian/rules	2008-03-28 17:38:03 UTC (rev 9894)
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-THIS_SHOULD_GO_TO_UNSTABLE := 1
-
 # don'tuse the debugging symbols from kdebase-runtime-kde4. othwerwise we have a conflict with kdebase-dbg from KDE 3
 DEB_DBG_PACKAGE_kdebase-runtime := kdebase-runtime-dbg
 




More information about the pkg-kde-commits mailing list