[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-5-18-g6c01c0a

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=26c6367

The following commit has been merged in the kubuntu_unstable branch:
commit 26c63673f2d5e77ece7b7bf357a6ce2d87f83305
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Feb 19 15:42:27 2015 -0300

    Revert "Unmark new public symbols."
    
    This reverts commit 789a6de9039b133e9dc54e17397eb5053f156fd2.
    
    This is actually  private symbol not found by our script.
---
 debian/changelog            | 1 -
 debian/libqt5core5a.symbols | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 01b90f0..0a8fcdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,6 @@ qtbase-opensource-src (5.4.0+dfsg-6) UNRELEASED; urgency=medium
     always start with 5 during Qt 5's lifetime.
   * Make mark_private_symbols.sh unmark private symbols before processing them.
     This will help us detect symbols that became public.
-    - Unmark new public symbols.
   * Mark libinput-dev as a linux-any build dependency. It is not available on
     hurd or kfreebsd.
   * Update symbols files with buildds' logs.
diff --git a/debian/libqt5core5a.symbols b/debian/libqt5core5a.symbols
index 0e06b55..6c0abb8 100644
--- a/debian/libqt5core5a.symbols
+++ b/debian/libqt5core5a.symbols
@@ -2962,7 +2962,7 @@ libQt5Core.so.5 libqt5core5a #MINVER#
  _ZN9QCollator14setNumericModeEb at Base 5.0.2
  _ZN9QCollator18setCaseSensitivityEN2Qt15CaseSensitivityE at Base 5.2.0~alpha1
  _ZN9QCollator20setIgnorePunctuationEb at Base 5.0.2
- _ZN9QCollator6detachEv at Base 5.0.2
+ _ZN9QCollator6detachEv at Base 5.0.2 1
  _ZN9QCollator9setLocaleERK7QLocale at Base 5.0.2
  _ZN9QCollatorC1ERK7QLocale at Base 5.2.0~alpha1
  _ZN9QCollatorC1ERKS_ at Base 5.0.2

-- 
qtbase packaging