rev 12728 - in branches/kde4.2/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-11-24 23:14:16 +0000 (Mon, 24 Nov 2008)
New Revision: 12728

Added:
   branches/kde4.2/packages/kdelibs/debian/installgen
   branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
Removed:
   branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.installgen
   branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.installgen
   branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.installgen
   branches/kde4.2/packages/kdelibs/debian/kdelibs5.installgen
   branches/kde4.2/packages/kdelibs/debian/libplasma-dev.installgen
   branches/kde4.2/packages/kdelibs/debian/libplasma3.installgen
   branches/kde4.2/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/patches/series
Log:
new kdelibs snapshot, some changes

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-11-24 22:44:26 UTC (rev 12727)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-11-24 23:14:16 UTC (rev 12728)
@@ -1,4 +1,4 @@
-kde4libs (4:4.1.80+svn887492-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.80+svn888554-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -42,8 +42,14 @@
     - libkdeinit4_kio_http_cache_cleaner.so
     - libkdeinit4_kconf_update.so
   * Build depend on soprano >= 2.1.1.
+  * Use better approach to enforcing kde4- prefix to applications.menu. The
+    previous way broken menu spec and made 3rd party applications end up in 
+    Lost&Found menu. 11_kde4_applications_menu.diff patch was replaced by
+    11_default_kde4_xdg_menu_prefix.diff. Thanks to Harald Sitter for the
+    heads up.
+  * Switch to new installgen file format.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Nov 2008 15:47:53 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 25 Nov 2008 00:54:23 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Added: branches/kde4.2/packages/kdelibs/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdelibs/debian/installgen	2008-11-24 23:14:16 UTC (rev 12728)
@@ -0,0 +1,33 @@
+[libplasma-dev]
+dst:usr/lib/libplasma\.so$ link:libplasma\.so[\d.]+$
+dst:/apps/cmake/modules/FindPlasma
+dst:/include/plasma
+dst:/include/KDE/Plasma
+
+[libplasma3]
+dst:usr/lib/libplasma\.so[\d.]+$
+
+[kdelibs5-dev]
+dst:usr/lib/lib[^/]+\.so$ link:usr/lib/[^/]+\.so\.
+dst:apps/cmake/
+dst:/include/
+dst:dbus-\d+/interfaces/
+
+[kdelibs-bin]
+# The following belongs to kdelibs5
+skip dst:usr/lib/libkdeinit4_(klauncher|kio_http_cache_cleaner|kconf_update)\.so$
+dst:usr/bin/
+dst:libkdeinit4_.*\.so
+
+[kdelibs5]
+dst:usr/lib/kde4/libexec/
+mime:application/x-sharedlib.* ! link:
+dst:usr/lib/.+\.so[\d.]+$ link:
+dst:/kconf_update_bin/
+
+[kdelibs5-data]
+missing dst:usr/share/locale/all_languages$
+dst:usr/share/doc/kde4/HTML/
+mime:text/.*
+mime:image/.*
+mime:application/(?!(x-executable|x-sharedlib)).*

Deleted: branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.installgen

Deleted: branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.installgen

Deleted: branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.installgen

Deleted: branches/kde4.2/packages/kdelibs/debian/kdelibs5.installgen

Deleted: branches/kde4.2/packages/kdelibs/debian/libplasma-dev.installgen

Deleted: branches/kde4.2/packages/kdelibs/debian/libplasma3.installgen

Added: branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2008-11-24 23:14:16 UTC (rev 12728)
@@ -0,0 +1,34 @@
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
+@@ -67,7 +67,7 @@
+ 
+ ########### install files ###############
+ 
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde4-applications.menu)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+ 
+--- a/kded/vfolder_menu.cpp
++++ b/kded/vfolder_menu.cpp
+@@ -771,8 +771,10 @@
+    QString result;
+ 
+    QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
+-   if (!xdgMenuPrefix.isEmpty())
+-   {
++   // enforce kde4 prefix unless XDG_MENU_PREFIX is set (LP: #297195)
++   if (xdgMenuPrefix.isEmpty())
++      xdgMenuPrefix = QString("kde4-");
++
+       QFileInfo fileInfo(fileName);
+ 
+       QString fileNameOnly = fileInfo.fileName();
+@@ -782,7 +784,6 @@
+       QString baseName = QDir::cleanPath(m_docInfo.baseDir +
+                                          fileInfo.path() + '/' + fileNameOnly);
+       result = KStandardDirs::locate("xdgconf-menu", baseName);
+-   }
+ 
+    if (result.isEmpty())
+    {

Deleted: branches/kde4.2/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff

Modified: branches/kde4.2/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/series	2008-11-24 22:44:26 UTC (rev 12727)
+++ branches/kde4.2/packages/kdelibs/debian/patches/series	2008-11-24 23:14:16 UTC (rev 12728)
@@ -1,6 +1,6 @@
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff
-11_kde4_applications_menu.diff
+11_default_kde4_xdg_menu_prefix.diff
 13_qt4_designer_plugins_path.diff
 14_hardcode_ptm_device.diff
 15_kfreebsd_support.diff