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

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-11-11 11:19:43 +0000 (Sun, 11 Nov 2007)
New Revision: 7850

Added:
   branches/kde4/packages/kdebase-runtime/debian/patches/
   branches/kde4/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff
   branches/kde4/packages/kdebase-runtime/debian/patches/series
Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install
Log:
* Add 01_kde4_information_menu: prepend kde4 to information.menu.


Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2007-11-10 22:41:14 UTC (rev 7849)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2007-11-11 11:19:43 UTC (rev 7850)
@@ -9,6 +9,7 @@
   * Add libclucene-dev, libsoprano-dev and libstrigiqtdbusclient-dev build
     dependencies for nepomuk.
   * Update installed files.
+  * Add 01_kde4_information_menu: prepend kde4 to information.menu.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Nov 2007 00:13:11 +0100
 

Modified: branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install	2007-11-10 22:41:14 UTC (rev 7849)
+++ branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install	2007-11-11 11:19:43 UTC (rev 7850)
@@ -1,10 +1,10 @@
 etc/kde4/khotnewstuffrc
 etc/kde4/kshorturifilterrc
-etc/xdg/menus/kde-information.menu
+etc/xdg/menus/kde4-information.menu
 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/kde-information.directory
+usr/share/desktop-directories/kde4-information.directory
 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/index.cache.bz2

Added: branches/kde4/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff	2007-11-11 11:19:43 UTC (rev 7850)
@@ -0,0 +1,47 @@
+--- a/doc/userguide/kde-for-admins.docbook
++++ b/doc/userguide/kde-for-admins.docbook
+@@ -1765,8 +1765,8 @@
+ whose icon and name are defined by <filename>kde-settings.directory</filename></para>
+ </listitem>
+ <listitem><para>Info Center has a hidden Information menu whose
+-contents are defined by <filename>kde-information.menu</filename> and
+-whose icon and  name are  defined by <filename>kde-information.directory</filename>.</para>
++contents are defined by <filename>kde4-information.menu</filename> and
++whose icon and  name are  defined by <filename>kde4-information.directory</filename>.</para>
+ </listitem>
+ 
+ <listitem><para>Screensavers contains a hidden System/Screensavers menu,
+--- a/kcontrol/menus/CMakeLists.txt
++++ b/kcontrol/menus/CMakeLists.txt
+@@ -4,5 +4,5 @@
+ ########### install files ###############
+ 
+ install( FILES kde-information.menu
+-    DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus/)
+-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
+@@ -3,7 +3,7 @@
+ 
+ <Menu>
+ 	<Name>Information</Name>
+-	<Directory>kde-information.directory</Directory>
++	<Directory>kde4-information.directory</Directory>
+ 	<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>

Added: branches/kde4/packages/kdebase-runtime/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/series	                        (rev 0)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/series	2007-11-11 11:19:43 UTC (rev 7850)
@@ -0,0 +1 @@
+01_kde4_information_menu.diff