[SCM] KDE SDK module packaging branch, master, updated. debian/4.6.2-2

Modestas Vainius modax at alioth.debian.org
Mon May 2 01:28:25 UTC 2011


The following commit has been merged in the master branch:
commit b9d84b0ab0a09170188a3ef13139544b44ce774d
Author: Modestas Vainius <modax at debian.org>
Date:   Mon May 2 03:51:00 2011 +0300

    Do not export private classes in libkastencore
    
    (patch dont_export_private_classes.diff).
---
 debian/changelog                                |    2 +
 debian/libkastencore4.symbols                   |   24 --------------
 debian/patches/dont_export_private_classes.diff |   39 +++++++++++++++++++++++
 debian/patches/series                           |    1 +
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27e6fd6..4c2cc6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kdesdk (4:4.6.2-2) UNRELEASED; urgency=low
   * Confirm symbol files on more debian arches.
   * Pass -c0 to dpkg-gensymbols.
   * Do not use wildcards in okteta-dev.install.
+  * Do not export private classes in libkastencore (patch
+    dont_export_private_classes.diff).
 
  -- Modestas Vainius <modax at debian.org>  Mon, 02 May 2011 02:40:04 +0300
 
diff --git a/debian/libkastencore4.symbols b/debian/libkastencore4.symbols
index 3132e02..632db6e 100644
--- a/debian/libkastencore4.symbols
+++ b/debian/libkastencore4.symbols
@@ -320,11 +320,6 @@ libkastencore.so.4 libkastencore4 #MINVER#
  _ZN6Kasten33AbstractFileSystemSyncToRemoteJobD0Ev at ABI_4_0 4:4.6.1
  _ZN6Kasten33AbstractFileSystemSyncToRemoteJobD1Ev at ABI_4_0 4:4.6.1
  _ZN6Kasten33AbstractFileSystemSyncToRemoteJobD2Ev at ABI_4_0 4:4.6.1
- _ZN6Kasten35AbstractFileSystemConnectJobPrivate15connectWithFileEv at ABI_4_0 4:4.6.1
- _ZN6Kasten35AbstractFileSystemConnectJobPrivate8completeEb at ABI_4_0 4:4.6.1
- _ZN6Kasten35AbstractFileSystemConnectJobPrivateD0Ev at ABI_4_0 4:4.6.1
- _ZN6Kasten35AbstractFileSystemConnectJobPrivateD1Ev at ABI_4_0 4:4.6.1
- (arch=!ia64 !s390 !sparc)_ZN6Kasten35AbstractFileSystemConnectJobPrivateD2Ev at ABI_4_0 4:4.6.2
  _ZN6Kasten35AbstractFileSystemSyncFromRemoteJob11qt_metacallEN11QMetaObject4CallEiPPv at ABI_4_0 4:4.6.1
  _ZN6Kasten35AbstractFileSystemSyncFromRemoteJob11qt_metacastEPKc at ABI_4_0 4:4.6.1
  _ZN6Kasten35AbstractFileSystemSyncFromRemoteJob12completeReadEb at ABI_4_0 4:4.6.1
@@ -363,16 +358,6 @@ libkastencore.so.4 libkastencore4 #MINVER#
  _ZN6Kasten35AbstractModelFileSystemSynchronizerD0Ev at ABI_4_0 4:4.6.1
  _ZN6Kasten35AbstractModelFileSystemSynchronizerD1Ev at ABI_4_0 4:4.6.1
  _ZN6Kasten35AbstractModelFileSystemSynchronizerD2Ev at ABI_4_0 4:4.6.1
- _ZN6Kasten42AbstractFileSystemSyncFromRemoteJobPrivate12completeReadEb at ABI_4_0 4:4.6.1
- _ZN6Kasten42AbstractFileSystemSyncFromRemoteJobPrivate14syncFromRemoteEv at ABI_4_0 4:4.6.1
- _ZN6Kasten42AbstractFileSystemSyncFromRemoteJobPrivateD0Ev at ABI_4_0 4:4.6.1
- _ZN6Kasten42AbstractFileSystemSyncFromRemoteJobPrivateD1Ev at ABI_4_0 4:4.6.1
- (arch=!ia64 !s390 !sparc)_ZN6Kasten42AbstractFileSystemSyncFromRemoteJobPrivateD2Ev at ABI_4_0 4:4.6.2
- _ZN6Kasten42AbstractFileSystemSyncWithRemoteJobPrivate12completeSyncEb at ABI_4_0 4:4.6.1
- _ZN6Kasten42AbstractFileSystemSyncWithRemoteJobPrivate14syncWithRemoteEv at ABI_4_0 4:4.6.1
- _ZN6Kasten42AbstractFileSystemSyncWithRemoteJobPrivateD0Ev at ABI_4_0 4:4.6.1
- _ZN6Kasten42AbstractFileSystemSyncWithRemoteJobPrivateD1Ev at ABI_4_0 4:4.6.1
- (arch=!ia64 !s390 !sparc)_ZN6Kasten42AbstractFileSystemSyncWithRemoteJobPrivateD2Ev at ABI_4_0 4:4.6.2
  _ZN6Kasten6Person8setEgoIdEi at ABI_4_0 4:4.6.1
  _ZN6Kasten6Person9createEgoEv at ABI_4_0 4:4.6.1
  _ZN6Kasten6PersonC1ERK7QStringRK5KIcon at ABI_4_0 4:4.6.1
@@ -501,12 +486,9 @@ libkastencore.so.4 libkastencore4 #MINVER#
  _ZTIN6Kasten31ModelEncoderFileSystemExportJobE at ABI_4_0 4:4.6.1
  _ZTIN6Kasten32AbstractModelSynchronizerFactoryE at ABI_4_0 4:4.6.1
  _ZTIN6Kasten33AbstractFileSystemSyncToRemoteJobE at ABI_4_0 4:4.6.1
- _ZTIN6Kasten35AbstractFileSystemConnectJobPrivateE at ABI_4_0 4:4.6.1
  _ZTIN6Kasten35AbstractFileSystemSyncFromRemoteJobE at ABI_4_0 4:4.6.1
  _ZTIN6Kasten35AbstractFileSystemSyncWithRemoteJobE at ABI_4_0 4:4.6.1
  _ZTIN6Kasten35AbstractModelFileSystemSynchronizerE at ABI_4_0 4:4.6.1
- _ZTIN6Kasten42AbstractFileSystemSyncFromRemoteJobPrivateE at ABI_4_0 4:4.6.1
- _ZTIN6Kasten42AbstractFileSystemSyncWithRemoteJobPrivateE at ABI_4_0 4:4.6.1
  _ZTSN6Kasten12AbstractToolE at ABI_4_0 4:4.6.1
  _ZTSN6Kasten13AbstractModelE at ABI_4_0 4:4.6.1
  _ZTSN6Kasten15AbstractLoadJobE at ABI_4_0 4:4.6.1
@@ -535,12 +517,9 @@ libkastencore.so.4 libkastencore4 #MINVER#
  _ZTSN6Kasten31ModelEncoderFileSystemExportJobE at ABI_4_0 4:4.6.1
  _ZTSN6Kasten32AbstractModelSynchronizerFactoryE at ABI_4_0 4:4.6.1
  _ZTSN6Kasten33AbstractFileSystemSyncToRemoteJobE at ABI_4_0 4:4.6.1
- _ZTSN6Kasten35AbstractFileSystemConnectJobPrivateE at ABI_4_0 4:4.6.1
  _ZTSN6Kasten35AbstractFileSystemSyncFromRemoteJobE at ABI_4_0 4:4.6.1
  _ZTSN6Kasten35AbstractFileSystemSyncWithRemoteJobE at ABI_4_0 4:4.6.1
  _ZTSN6Kasten35AbstractModelFileSystemSynchronizerE at ABI_4_0 4:4.6.1
- _ZTSN6Kasten42AbstractFileSystemSyncFromRemoteJobPrivateE at ABI_4_0 4:4.6.1
- _ZTSN6Kasten42AbstractFileSystemSyncWithRemoteJobPrivateE at ABI_4_0 4:4.6.1
  _ZTVN6Kasten12AbstractToolE at ABI_4_0 4:4.6.1
  _ZTVN6Kasten13AbstractModelE at ABI_4_0 4:4.6.1
  _ZTVN6Kasten15AbstractLoadJobE at ABI_4_0 4:4.6.1
@@ -569,9 +548,6 @@ libkastencore.so.4 libkastencore4 #MINVER#
  _ZTVN6Kasten31ModelEncoderFileSystemExportJobE at ABI_4_0 4:4.6.1
  _ZTVN6Kasten32AbstractModelSynchronizerFactoryE at ABI_4_0 4:4.6.1
  _ZTVN6Kasten33AbstractFileSystemSyncToRemoteJobE at ABI_4_0 4:4.6.1
- _ZTVN6Kasten35AbstractFileSystemConnectJobPrivateE at ABI_4_0 4:4.6.1
  _ZTVN6Kasten35AbstractFileSystemSyncFromRemoteJobE at ABI_4_0 4:4.6.1
  _ZTVN6Kasten35AbstractFileSystemSyncWithRemoteJobE at ABI_4_0 4:4.6.1
  _ZTVN6Kasten35AbstractModelFileSystemSynchronizerE at ABI_4_0 4:4.6.1
- _ZTVN6Kasten42AbstractFileSystemSyncFromRemoteJobPrivateE at ABI_4_0 4:4.6.1
- _ZTVN6Kasten42AbstractFileSystemSyncWithRemoteJobPrivateE at ABI_4_0 4:4.6.1
diff --git a/debian/patches/dont_export_private_classes.diff b/debian/patches/dont_export_private_classes.diff
new file mode 100644
index 0000000..5bface1
--- /dev/null
+++ b/debian/patches/dont_export_private_classes.diff
@@ -0,0 +1,39 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Do not export private classes
+Last-Update: 2011-05-02
+Forwarded: no
+Origin: vendor
+
+--- a/okteta/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.h
++++ b/okteta/libs/kasten/core/io/filesystem/abstractfilesystemconnectjob_p.h
+@@ -36,7 +36,7 @@
+ namespace Kasten
+ {
+ 
+-class KASTENCORE_EXPORT AbstractFileSystemConnectJobPrivate : public AbstractConnectJobPrivate
++class AbstractFileSystemConnectJobPrivate : public AbstractConnectJobPrivate
+ {
+   public:
+     AbstractFileSystemConnectJobPrivate( AbstractFileSystemConnectJob* parent,
+--- a/okteta/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.h
++++ b/okteta/libs/kasten/core/io/filesystem/abstractfilesystemsyncfromremotejob_p.h
+@@ -38,7 +38,7 @@ namespace Kasten
+ class AbstractModelFileSystemSynchronizer;
+ 
+ 
+-class KASTENCORE_EXPORT AbstractFileSystemSyncFromRemoteJobPrivate : public AbstractSyncFromRemoteJobPrivate
++class AbstractFileSystemSyncFromRemoteJobPrivate : public AbstractSyncFromRemoteJobPrivate
+ {
+   public:
+     AbstractFileSystemSyncFromRemoteJobPrivate( AbstractFileSystemSyncFromRemoteJob* parent,
+--- a/okteta/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.h
++++ b/okteta/libs/kasten/core/io/filesystem/abstractfilesystemsyncwithremotejob_p.h
+@@ -35,7 +35,7 @@
+ namespace Kasten
+ {
+ 
+-class KASTENCORE_EXPORT AbstractFileSystemSyncWithRemoteJobPrivate : public AbstractSyncWithRemoteJobPrivate
++class AbstractFileSystemSyncWithRemoteJobPrivate : public AbstractSyncWithRemoteJobPrivate
+ {
+   public:
+     AbstractFileSystemSyncWithRemoteJobPrivate( AbstractFileSystemSyncWithRemoteJob* parent,
diff --git a/debian/patches/series b/debian/patches/series
index ec3e7e6..3bb9214 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 append_kde.diff
 enable_debianabimanager.diff
+dont_export_private_classes.diff

-- 
KDE SDK module packaging



More information about the pkg-kde-commits mailing list