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

Modestas Vainius modax-guest at alioth.debian.org
Thu Apr 17 00:11:25 UTC 2008 

Author: modax-guest
Date: 2008-04-17 00:11:25 +0000 (Thu, 17 Apr 2008)
New Revision: 10160

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/control
   branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
Log:
* Merge changelog entries of unreleased versions
* libice-dev is implied via libsm-dev
* 17_  update

Still building. Packaging might be incomplete.

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-04-16 23:42:20 UTC (rev 10159)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-04-17 00:11:25 UTC (rev 10160)
@@ -1,19 +1,27 @@
-kde4libs (4:4.0.69-1) experimental; urgency=low
+kde4libs (4:4.0.69+svn797872-1) UNRELEASED; urgency=low
 
+  * New upstream development snapshot:
+    - The latest upstream commit is r797872 by dhaumann
+    - Date: Wed, 16 Apr 2008 23:29:29 -0000
+
+  +++ Changes by Armin Berres:
+
   * New upstream development snapshot.
   * Update and sort *.install files.
 
- -- Armin Berres <trigger+debian at space-based.de>  Sun, 13 Apr 2008 23:02:09 +0200
+  +++ Changes by Ana Beatriz Guerrero Lopez
 
-kde4libs (4:4.0.68+svn796328-1) experimental; urgency=low
-
-  * New upstream development snapshot.
   * Add new build depends after Qt4 have updated its build depends:
-    libpng-dev, libssl-dev, libsm-dev and libice-dev.
+    libpng-dev, libssl-dev, libsm-dev.
   * Add version to the RUNTIME_DEPS in debian/rules.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sun, 13 Apr 2008 12:39:09 +0200
+  +++ Changes by Modestas Vainius:
 
+  * New version of 17_findservicebydesktoppath_try_realfilepath.diff. Still
+    incomplete.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 17 Apr 2008 03:01:59 +0300
+
 kde4libs (4:4.0.68+svn794641-1) experimental; urgency=low
 
    * New upstream development snapshot.

Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control	2008-04-16 23:42:20 UTC (rev 10159)
+++ branches/kde4/packages/kdelibs/debian/control	2008-04-17 00:11:25 UTC (rev 10160)
@@ -7,7 +7,7 @@
  libcupsys2-dev, libdbus-1-dev, libqt4-dev (>= 4.4.0~),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libpng-dev, libssl-dev, libsm-dev, libice-dev,
+ libpng-dev, libssl-dev, libsm-dev,
  libsoprano-dev (>= 2.0.97~), libstreamanalyzer-dev (>= 0.5.8-2),
  libxml2-dev, libxml2-utils,  libxslt1-dev, libxtst-dev, libgif-dev,
  libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,

Modified: branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2008-04-16 23:42:20 UTC (rev 10159)
+++ branches/kde4/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2008-04-17 00:11:25 UTC (rev 10160)
@@ -1,31 +1,59 @@
-diff -uNr kde4libs-4.0.68.o/kdecore/services/kservicefactory.cpp kde4libs-4.0.68/kdecore/services/kservicefactory.cpp
---- kde4libs-4.0.68.o/kdecore/services/kservicefactory.cpp	2008-04-06 13:18:10.000000000 +0300
-+++ kde4libs-4.0.68/kdecore/services/kservicefactory.cpp	2008-04-06 13:27:36.000000000 +0300
-@@ -125,17 +125,24 @@
+--- kde4libs-4.0.68+svn794096/kdecore/services/kservicefactory.cpp	2008-03-19 11:23:39.000000000 +0200
++++ kde4libs-4.0.68+svn794096/kdecore/services/kservicefactory.cpp	2008-04-07 00:42:29.000000000 +0300
+@@ -125,16 +125,10 @@
      return newService;
  }
  
 -KService::Ptr KServiceFactory::findServiceByDesktopPath(const QString &_name)
-+KService::Ptr KServiceFactory::findServiceByDesktopPath(const QString &name)
++KService::Ptr KServiceFactory::serviceFromPath(const QString &_name)
  {
-     if (!m_relNameDict) return KService::Ptr(); // Error!
- 
-     // Warning : this assumes we're NOT building a database
-     // KBuildServiceFactory reimplements it for the case where we are building one
- 
-+    QString _name = name;
+-    if (!m_relNameDict) return KService::Ptr(); // Error!
+-
+-    // Warning : this assumes we're NOT building a database
+-    // KBuildServiceFactory reimplements it for the case where we are building one
+-
      int offset = m_relNameDict->find_string( _name );
      if (!offset) {
 -        qDebug( "findServiceByDesktopPath: %s not found", qPrintable( _name ) );
--        return KService::Ptr(); // Not found
+         return KService::Ptr(); // Not found
+     }
+ 
+@@ -151,6 +145,27 @@
+     return newService;
+ }
+ 
++KService::Ptr KServiceFactory::findServiceByDesktopPath(const QString &_name)
++{
++    if (!m_relNameDict) return KService::Ptr(); // Error!
++
++    // Warning : this assumes we're NOT building a database
++    // KBuildServiceFactory reimplements it for the case where we are building one
++
++    KService::Ptr newService(serviceFromPath( _name ));
++    if ( !newService ) {
 +        // We might have been given a symlink or non-canonical path of some sort.
 +        // Therefore try looking up KStandardDirs::realFilePath'ed path too.
-+        _name = KStandardDirs::realFilePath(_name);
-+        offset = m_relNameDict->find_string(_name);
-+        if (!offset) {
-+            qDebug( "findServiceByDesktopPath: %s not found", qPrintable( name ) );
-+            return KService::Ptr(); // Not found
-+        }
-     }
++        newService = serviceFromPath( KStandardDirs::realFilePath( _name ) );
++    }
++
++    if ( !newService ) {
++        qDebug( "findServiceByDesktopPath: %s not found", qPrintable( _name ) );
++        return KService::Ptr(); // Not found
++    }
++    return newService;
++}
++
+ KService::Ptr KServiceFactory::findServiceByMenuId(const QString &_menuId)
+ {
+     if (!m_menuIdDict) return KService::Ptr(); // Error!
+--- kde4libs-4.0.68+svn794096/kdecore/services/kservicefactory.h	2008-03-26 00:51:27.000000000 +0200
++++ kde4libs-4.0.68+svn794096/kdecore/services/kservicefactory.h	2008-04-07 00:44:00.000000000 +0300
+@@ -123,6 +123,8 @@
+     virtual void virtual_hook( int id, void* data );
+ private:
+     class KServiceFactoryPrivate* d;
++
++    KService::Ptr serviceFromPath(const QString &_name);
+ };
  
-     KService::Ptr newService(createEntry(offset));
+ #endif

More information about the pkg-kde-commits mailing list