[SCM] ci-tooling packaging branch, master, updated. 2d1570af16cb7962b0784d2f84b51a818acff8bb

Harald Sitter apachelogger-guest at moszumanska.debian.org
Thu Oct 8 09:15:46 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=2d1570a

The following commit has been merged in the master branch:
commit 2d1570af16cb7962b0784d2f84b51a818acff8bb
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 8 11:15:14 2015 +0200

    fix symbol retraction. now that retraction detection works this fails xD
---
 test/data/test_kci_builder/test_update_symbols/log               | 9 ---------
 .../test_update_symbols/ref/libkf5akonadicore5.symbols           | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/test/data/test_kci_builder/test_update_symbols/log b/test/data/test_kci_builder/test_update_symbols/log
index ff491c0..a23814a 100644
--- a/test/data/test_kci_builder/test_update_symbols/log
+++ b/test/data/test_kci_builder/test_update_symbols/log
@@ -26,15 +26,6 @@ dpkg-gensymbols: warning: debian/libkf5akonadicore5/DEBIAN/symbols doesn't match
   _ZNK7Akonadi4Item10hasPayloadEv at Base 15.07.90
   _ZNK7Akonadi4Item11payloadBaseEv at Base 15.07.90
   _ZNK7Akonadi4Item11payloadDataEv at Base 15.07.90
-@@ -2191,7 +2193,7 @@
-  _ZNK7Akonadi4Item9relationsEv at Base 15.07.90
-  _ZNK7Akonadi6Entity10attributesEv at Base 15.07.90
-  _ZNK7Akonadi6Entity12hasAttributeERK10QByteArray at Base 15.07.90
-- (optional=templinst)_ZNK7Akonadi6Entity12hasAttributeINS_22EntityDisplayAttributeEEEbv at Base 15.07.90
-+#MISSING: 4:15.08.1+git20150917.2243+15.10-0# (optional=templinst)_ZNK7Akonadi6Entity12hasAttributeINS_22EntityDisplayAttributeEEEbv at Base 15.07.90
-  _ZNK7Akonadi6Entity14remoteRevisionEv at Base 15.07.90
-  _ZNK7Akonadi6Entity16parentCollectionEv at Base 15.07.90
-  _ZNK7Akonadi6Entity2idEv at Base 15.07.90
 @@ -2222,6 +2224,7 @@
   _ZNK7Akonadi7Session9sessionIdEv at Base 15.07.90
   _ZNK7Akonadi8ItemSync10metaObjectEv at Base 15.07.90
diff --git a/test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadicore5.symbols b/test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadicore5.symbols
index 60ac460..f72047f 100644
--- a/test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadicore5.symbols
+++ b/test/data/test_kci_builder/test_update_symbols/ref/libkf5akonadicore5.symbols
@@ -2194,7 +2194,7 @@ libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#
  _ZNK7Akonadi4Item9relationsEv at Base 15.07.90
  _ZNK7Akonadi6Entity10attributesEv at Base 15.07.90
  _ZNK7Akonadi6Entity12hasAttributeERK10QByteArray at Base 15.07.90
-#MISSING: 4:15.08.0+git20150717.1756+15.04# (optional=templinst)_ZNK7Akonadi6Entity12hasAttributeINS_22EntityDisplayAttributeEEEbv at Base 15.07.90
+ (optional=templinst)_ZNK7Akonadi6Entity12hasAttributeINS_22EntityDisplayAttributeEEEbv at Base 15.07.90
  _ZNK7Akonadi6Entity14remoteRevisionEv at Base 15.07.90
  _ZNK7Akonadi6Entity16parentCollectionEv at Base 15.07.90
  _ZNK7Akonadi6Entity2idEv at Base 15.07.90

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list