[SCM] kcalutils packaging branch, kubuntu_unstable, updated. debian/15.08.1-1-27-g77f0377

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kcalutils.git;a=commitdiff;h=77f0377

The following commit has been merged in the kubuntu_unstable branch:
commit 77f0377b3a6c047537a7101c5f2a3421c568c454
Merge: 73c22ab8e547fd36a07f6a68e5f52ae23788fa60 0ded2f91926f35379d2e5d7e1af7b41bd36cf6b1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Feb 26 16:57:47 2016 -0800

    Refresh symbols.

 debian/changelog                    |  6 +++++-
 debian/libkf5calendarutils5.symbols | 15 ++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index d7de131,f3312cc..f223864
--- a/debian/changelog
+++ b/debian/changelog
@@@ -9,11 -8,8 +9,15 @@@ kcalutils (4:15.12.1-0ubuntu1) UNRELEAS
    * Symbols - again - pim stack rebuild. 
    * Symbols? again? really? 
    * Manually add new symbols in. 
- 
+   * Refresh symbols. 
++  
 +  [ Clive Johnston ]
 +  * Fiixng install file
 +  * Refresh symbols 
 +
++  [ Scarlett Clark ]
++  * Fix merge. 
+ 
   -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 29 Jan 2016 13:22:09 -0800
  
  kcalutils (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
diff --cc debian/libkf5calendarutils5.symbols
index 5c30eb9,e2a87fa..efb0374
--- a/debian/libkf5calendarutils5.symbols
+++ b/debian/libkf5calendarutils5.symbols
@@@ -67,8 -67,8 +67,9 @@@ libKF5CalendarUtils.so.5 libkf5calendar
   _ZN9KCalUtils18IncidenceFormatter16dateTimeToStringERK9KDateTimebbRKNS1_4SpecE at Base 4:15.07.90
   _ZN9KCalUtils18IncidenceFormatter16recurrenceStringERK14QSharedPointerIN8KCalCore9IncidenceEE at Base 4:15.07.90
   _ZN9KCalUtils18IncidenceFormatter18reminderStringListERK14QSharedPointerIN8KCalCore9IncidenceEEb at Base 4:15.07.90
-  _ZN9KCalUtils18IncidenceFormatter19extensiveDisplayStrERK14QSharedPointerIN8KCalCore8CalendarEERKS1_INS2_13IncidenceBaseEE5QDateRKN9KDateTime4SpecE at Base 4:15.12.1+git20160227.0015+16.04
-  _ZN9KCalUtils18IncidenceFormatter19extensiveDisplayStrERK7QStringRK14QSharedPointerIN8KCalCore13IncidenceBaseEE5QDateRKN9KDateTime4SpecE at Base 4:15.12.1+git20160227.0015+16.04
+  _ZN9KCalUtils18IncidenceFormatter19extensiveDisplayStrERK14QSharedPointerIN8KCalCore8CalendarEERKS1_INS2_13IncidenceBaseEE5QDateRKN9KDateTime4SpecE at Base 4:15.12.1
+  _ZN9KCalUtils18IncidenceFormatter19extensiveDisplayStrERK7QStringRK14QSharedPointerIN8KCalCore13IncidenceBaseEE5QDateRKN9KDateTime4SpecE at Base 4:15.12.1
++>>>>>>> kubuntu_stable
   _ZN9KCalUtils18IncidenceFormatter20formatICalInvitationERK7QStringRK14QSharedPointerIN8KCalCore14MemoryCalendarEEPNS_25InvitationFormatterHelperEb at Base 4:15.07.90
   _ZN9KCalUtils18IncidenceFormatter26formatICalInvitationNoHtmlERK7QStringRK14QSharedPointerIN8KCalCore14MemoryCalendarEEPNS_25InvitationFormatterHelperES3_b at Base 4:15.07.90
   _ZN9KCalUtils25InvitationFormatterHelper15generateLinkURLERK7QString at Base 4:15.07.90

-- 
kcalutils packaging