[Pkg-kde-commits] rev 1056 - in branches/kde-3.4.0/packages: kdebase/debian kdebase/debian/patches kdelibs/debian kdelibs/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Sun, 08 May 2005 14:54:59 +0000
Author: chrsmrtn-guest
Date: 2005-05-08 14:54:57 +0000 (Sun, 08 May 2005)
New Revision: 1056
Added:
branches/kde-3.4.0/packages/kdebase/debian/patches/20_applications_menu_move.diff
branches/kde-3.4.0/packages/kdelibs/debian/patches/18_applications_menu_rename.diff
Modified:
branches/kde-3.4.0/packages/kdebase/debian/kdebase-data.install
branches/kde-3.4.0/packages/kdelibs/debian/changelog
branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.install
branches/kde-3.4.0/packages/kdelibs/debian/rules
Log:
Move applications.menu to kde-applications.menu, and applications-merged
becomes kde-applications-merged. Fixes the GNOME conflict.
Modified: branches/kde-3.4.0/packages/kdebase/debian/kdebase-data.install
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdebase-data.install 2005-05-07 20:57:26 UTC (rev 1055)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdebase-data.install 2005-05-08 14:54:57 UTC (rev 1056)
@@ -1,4 +1,4 @@
-debian/tmp/etc/xdg/menus/applications-merged/kde-essential.menu
+debian/tmp/etc/xdg/menus/kde-applications-merged/kde-essential.menu
debian/tmp/etc/xdg/menus/kde-information.menu
debian/tmp/etc/xdg/menus/kde-screensavers.menu
debian/tmp/etc/xdg/menus/kde-settings.menu
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/20_applications_menu_move.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/20_applications_menu_move.diff 2005-05-07 20:57:26 UTC (rev 1055)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/20_applications_menu_move.diff 2005-05-08 14:54:57 UTC (rev 1056)
@@ -0,0 +1,40 @@
+--- kde.orig/applnk/Makefile.am
++++ kde.patched/applnk/Makefile.am
+@@ -3,7 +3,7 @@
+ xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
+
+ xdg_mergedmenu_DATA = kde-essential.menu
+-xdg_mergedmenudir = $(xdg_menudir)/applications-merged
++xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
+
+ xdg_directory_DATA = \
+ kde-main.directory \
+--- kde.orig/doc/userguide/kde-for-admins.docbook
++++ kde.patched/doc/userguide/kde-for-admins.docbook
+@@ -1614,7 +1614,7 @@
+ </para>
+
+ <informalexample>
+-<para>Example from <filename>applications.menu</filename>:
++<para>Example from <filename>kde-applications.menu</filename>:
+ <programlisting>
+ <markup>
+ <Menu>
+@@ -1688,7 +1688,7 @@
+ information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para>
+
+ <informalexample>
+-<para>Example from <filename>applications.menu</filename>:
++<para>Example from <filename>kde-applications.menu</filename>:
+ <programlisting>
+ <markup>
+ <Menu>
+@@ -1740,7 +1740,7 @@
+ <title>Essential Menus</title>
+
+ <para><filename
+-class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/applications-merged/</filename>
++class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/kde-applications-merged/</filename>
+ contains <filename>kde-essential.menu</filename> which includes some
+ essential menus that are normally not shown in the &kde; menu itself:
+ <itemizedlist>
Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog 2005-05-07 20:57:26 UTC (rev 1055)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog 2005-05-08 14:54:57 UTC (rev 1056)
@@ -34,6 +34,9 @@
applications.menu. Oddly enough, this seems to work around some issues
with io slaves and remote file access.
+ * Rename applications.menu to kde-applications.menu, avoiding a conflict
+ with the new GNOME xdg menu files. (Closes: #307098)
+
* Tighten libart-2.0-dev build dependency. (Closes: #285882)
* Clean out useless manpages. New or better ones welcome...
Modified: branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.install
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.install 2005-05-07 20:57:26 UTC (rev 1055)
+++ branches/kde-3.4.0/packages/kdelibs/debian/kdelibs-data.install 2005-05-08 14:54:57 UTC (rev 1056)
@@ -11,7 +11,6 @@
debian/tmp/etc/kde3/language.codes
debian/tmp/etc/kde3/ui/kprintpreviewui.rc
debian/tmp/etc/kde3/ui/ui_standards.rc
-debian/tmp/etc/xdg/menus/applications.menu
debian/tmp/usr/share/applications/kde/kresources.desktop
debian/tmp/usr/share/apps/LICENSES/ARTISTIC
debian/tmp/usr/share/apps/LICENSES/BSD
Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/18_applications_menu_rename.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/18_applications_menu_rename.diff 2005-05-07 20:57:26 UTC (rev 1055)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/18_applications_menu_rename.diff 2005-05-08 14:54:57 UTC (rev 1056)
@@ -0,0 +1,11 @@
+--- kde.orig/kded/kbuildsycoca.cpp
++++ kde.patched/kded/kbuildsycoca.cpp
+@@ -378,7 +378,7 @@
+ connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
+ this, SLOT(slotCreateEntry(const QString &, KService **)));
+
+- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+
+ KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
Modified: branches/kde-3.4.0/packages/kdelibs/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/rules 2005-05-07 20:57:26 UTC (rev 1055)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules 2005-05-08 14:54:57 UTC (rev 1056)
@@ -23,3 +23,6 @@
#shlibs_ver = 4:3.4.0-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
+
+binary-install/kdelibs-data::
+ install -p -D -m644 kded/applications.menu debian/kdelibs-data/etc/xdg/menus/kde-applications.menu