[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-3-89-g82b67c2

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Tue Feb 1 12:26:05 UTC 2011


The following commit has been merged in the master branch:
commit 82b67c2d80386c5d72fc2746bed7afd259f91205
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Feb 1 13:20:37 2011 +0100

    Revert rename of libnepomuk4.
    
    It's not needed since all KRating(Widget|Painter) symbols are in libkdeui and
    old and new libnepomuk are linked against libkdeui.
---
 debian/changelog                                   |    1 -
 debian/control                                     |   11 ++++-------
 .../{libnepomuk4a.install => libnepomuk4.install}  |    0
 .../{libnepomuk4a.symbols => libnepomuk4.symbols}  |    0
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 879707a..e1f7fbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,7 +70,6 @@ kde4libs (4:4.6.0-0r1) UNRELEASED; urgency=low
   * Moved Qt Designer plugins to kdelibs5-plugins, they could be used by plasma
     js bindings to dynamically create ui files. Thanks to Pino Toscano for
     pointing the problem.
-  * Rename libnepomuk4 as libnepomuk4a due to binary incompatible changes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Dec 2010 14:54:10 +0100
 
diff --git a/debian/control b/debian/control
index ba49371..0256d5a 100644
--- a/debian/control
+++ b/debian/control
@@ -344,14 +344,11 @@ Description: the Kross UI Library
  This package is part of the KDE Development Platform libraries module.
 Homepage: http://kross.dipe.org
 
-Package: libnepomuk4a
+Package: libnepomuk4
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libnepomuk4-api
-Replaces: kdelibs5 (<< 4:4.4.0), kdelibs5-data (<< 4:4.4.0), libnepomuk4,
- libnepomuk4-api
-Breaks: kdelibs5 (<< 4:4.4.0), kdelibs5-data (<< 4:4.4.0), libnepomuk4
-Conflicts: libnepomuk4-api
+Replaces: kdelibs5 (<< 4:4.4.0), kdelibs5-data (<< 4:4.4.0)
+Breaks: kdelibs5 (<< 4:4.4.0), kdelibs5-data (<< 4:4.4.0)
 Description: the Nepomuk Meta Data Library
  Nepomuk aims to provide the basis to handle all kinds of metadata on the KDE
  desktop in a generic fashion. This ranges from simple information such as tags
@@ -564,7 +561,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${allLibraries},
  kdoctools (= ${binary:Version}), kdelibs-bin (= ${binary:Version}),
  automoc (>= 1.0~version-0.9.88),
- ${sameVersionDep:libqt4-dev:kdelibs5-plugins}, ${sameVersionDep:libsoprano-dev:libnepomuk4a},
+ ${sameVersionDep:libqt4-dev:kdelibs5-plugins}, ${sameVersionDep:libsoprano-dev:libnepomuk4},
  ${sameVersionDep:libphonon-dev:libkhtml5}
 Recommends: ${sameVersionDep:libqt4-opengl-dev:libplasma3-Depends}
 Replaces: kdebase-runtime-data (<< 4:4.2.90), kdepimlibs5-dev (<< 4:4.1.81+svn891439),
diff --git a/debian/libnepomuk4a.install b/debian/libnepomuk4.install
similarity index 100%
rename from debian/libnepomuk4a.install
rename to debian/libnepomuk4.install
diff --git a/debian/libnepomuk4a.symbols b/debian/libnepomuk4.symbols
similarity index 100%
rename from debian/libnepomuk4a.symbols
rename to debian/libnepomuk4.symbols

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list