[SCM] KDE Development Platform Libraries module packaging branch, kde4.5, updated. debian/4.4.5-1-38-g01491b6

George Kiagiadakis gkiagia-guest at alioth.debian.org
Sun Aug 22 20:50:15 UTC 2010


The following commit has been merged in the kde4.5 branch:
commit 9620e0c2cd9ea38d29714d82ccfe9b2fd01aedd2
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sun Aug 22 17:55:38 2010 +0300

    Refresh patch 31_relax_plugin_kde_version_check.diff.
---
 .../patches/31_relax_plugin_kde_version_check.diff |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/31_relax_plugin_kde_version_check.diff b/debian/patches/31_relax_plugin_kde_version_check.diff
index aad151d..1a0cd81 100644
--- a/debian/patches/31_relax_plugin_kde_version_check.diff
+++ b/debian/patches/31_relax_plugin_kde_version_check.diff
@@ -18,7 +18,7 @@ Last-Update: 2010-06-22
 
 --- a/kdecore/util/kpluginloader.cpp
 +++ b/kdecore/util/kpluginloader.cpp
-@@ -242,7 +242,6 @@ bool KPluginLoader::load()
+@@ -242,7 +242,6 @@
      d->verificationData = (KDEPluginVerificationData *) lib.resolve("kde_plugin_verification_data");
      if (d->verificationData) {
          if (d->verificationData->dataVersion < KDEPluginVerificationData::PluginVerificationDataVersion
@@ -28,8 +28,8 @@ Last-Update: 2010-06-22
              d->errorString = i18n("The plugin '%1' uses an incompatible KDE library (%2).", d->name, d->verificationData->KDEVersionString);
 --- a/plasma/version.cpp
 +++ b/plasma/version.cpp
-@@ -52,12 +52,11 @@ bool isPluginVersionCompatible(unsigned
- {
+@@ -57,12 +57,11 @@
+ 
      // we require PLASMA_VERSION_MAJOR and PLASMA_VERSION_MINOR
      const quint32 minVersion = PLASMA_MAKE_VERSION(PLASMA_VERSION_MAJOR, 0, 0);
 -    const quint32 maxVersion = PLASMA_MAKE_VERSION(PLASMA_VERSION_MAJOR, PLASMA_VERSION_MINOR, 60);

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list