[SCM] kcalutils packaging branch, kubuntu_xenial_archive, updated. debian/15.08.1-1-26-g044eee6

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 044eee668393213a9e5a5e59b4455bf357d46d77
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 4 17:26:54 2016 -0800

    Fiixng install file
    
    * Fiixng install file
    * Refresh symbols
    * Fix merge.
    * Fix merger.
    * Refreshing symbols and removing merge marker
    * Fixing symbols file
    * Fun with mergers. Weeeee.
    * Fun with symbols. Weeeee.
---
 debian/changelog                    | 33 +++++++++++++++++++++++++--------
 debian/libkf5calendarutils5.symbols | 14 +++++++-------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b224bf9..67c335b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,32 @@
 kcalutils (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release.
-  * Debian merge: No remaining changes. 
+  * Debian merge: No remaining changes.
   * Fix changelog.
-  * Refresh symbols. 
-  * Refresh symbols again - rebuild pim stack. 
-  * Symbols - again - pim stack rebuild. 
-  * Symbols? again? really? 
-  * Manually add new symbols in. 
-  * Refresh symbols. 
-  * Bump build depend version on pim*. 
+  * Refresh symbols.
+  * Refresh symbols again - rebuild pim stack.
+  * Symbols - again - pim stack rebuild.
+  * Symbols? again? really?
+  * Manually add new symbols in.
+  * Refresh symbols.
+  * Bump build depend version on pim*.
+
+  [ Clive Johnston ]
+  * Fiixng install file
+  * Refresh symbols
+
+  [ Scarlett Clark ]
+  * Fix merge.
+  * Fix merger.
+
+  [ Clive Johnston ]
+  * Refreshing symbols and removing merge marker
+  * Fixing symbols file
+
+  [ Scarlett Clark ]
+  * Fun with mergers. Weeeee.
+  * Fun with symbols. Weeeee.
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 29 Jan 2016 13:22:09 -0800
 
diff --git a/debian/libkf5calendarutils5.symbols b/debian/libkf5calendarutils5.symbols
index e2a87fa..ef8a4e5 100644
--- a/debian/libkf5calendarutils5.symbols
+++ b/debian/libkf5calendarutils5.symbols
@@ -16,10 +16,10 @@ libKF5CalendarUtils.so.5 libkf5calendarutils5 #MINVER#
  _ZN9KCalUtils10DndFactory14createDropTodoEPK9QMimeData at Base 4:15.07.90
  _ZN9KCalUtils10DndFactory14createMimeDataERK14QSharedPointerIN8KCalCore9IncidenceEE at Base 4:15.07.90
  _ZN9KCalUtils10DndFactory14createMimeDataEv at Base 4:15.07.90
- _ZN9KCalUtils10DndFactory14pasteIncidenceERK9KDateTime6QFlagsINS0_9PasteFlagEE at Base 4:15.12.1
+ _ZN9KCalUtils10DndFactory14pasteIncidenceERK9KDateTimeRK6QFlagsINS0_9PasteFlagEE at Base 4:15.12.1
  _ZN9KCalUtils10DndFactory15createDropEventEP10QDropEvent at Base 4:15.07.90
  _ZN9KCalUtils10DndFactory15createDropEventEPK9QMimeData at Base 4:15.07.90
- _ZN9KCalUtils10DndFactory15pasteIncidencesERK9KDateTime6QFlagsINS0_9PasteFlagEE at Base 4:15.12.1
+ _ZN9KCalUtils10DndFactory15pasteIncidencesERK9KDateTimeRK6QFlagsINS0_9PasteFlagEE at Base 4:15.12.1
  _ZN9KCalUtils10DndFactory18createDropCalendarEP10QDropEvent at Base 4:15.07.90
  _ZN9KCalUtils10DndFactory18createDropCalendarEPK9QMimeData at Base 4:15.07.90
  _ZN9KCalUtils10DndFactory18createDropCalendarEPK9QMimeDataRKN9KDateTime4SpecE at Base 4:15.07.90
@@ -27,10 +27,10 @@ libKF5CalendarUtils.so.5 libkf5calendarutils5 #MINVER#
  _ZN9KCalUtils10DndFactoryC2ERK14QSharedPointerIN8KCalCore14MemoryCalendarEE at Base 4:15.07.90
  _ZN9KCalUtils10DndFactoryD1Ev at Base 4:15.07.90
  _ZN9KCalUtils10DndFactoryD2Ev at Base 4:15.07.90
- _ZN9KCalUtils10HtmlExport10addHolidayE5QDateRK7QString at Base 4:15.12.1
+ _ZN9KCalUtils10HtmlExport10addHolidayERK5QDateRK7QString at Base 4:15.12.1
  _ZN9KCalUtils10HtmlExport10createTodoEP11QTextStreamRK14QSharedPointerIN8KCalCore4TodoEE at Base 4:15.07.90
  _ZN9KCalUtils10HtmlExport11breakStringERK7QString at Base 4:15.07.90
- _ZN9KCalUtils10HtmlExport11createEventEP11QTextStreamRK14QSharedPointerIN8KCalCore5EventEE5QDateb at Base 4:15.12.1
+ _ZN9KCalUtils10HtmlExport11createEventEP11QTextStreamRK14QSharedPointerIN8KCalCore5EventEERK5QDateb at Base 4:15.12.1
  _ZN9KCalUtils10HtmlExport12checkSecrecyERK14QSharedPointerIN8KCalCore9IncidenceEE at Base 4:15.07.90
  _ZN9KCalUtils10HtmlExport12createFooterEP11QTextStream at Base 4:15.07.90
  _ZN9KCalUtils10HtmlExport14createTodoListEP11QTextStream at Base 4:15.07.90
@@ -58,7 +58,7 @@ libKF5CalendarUtils.so.5 libkf5calendarutils5 #MINVER#
  _ZN9KCalUtils18HTMLExportSettingsD0Ev at Base 4:15.07.90
  _ZN9KCalUtils18HTMLExportSettingsD1Ev at Base 4:15.07.90
  _ZN9KCalUtils18HTMLExportSettingsD2Ev at Base 4:15.07.90
- _ZN9KCalUtils18IncidenceFormatter10toolTipStrERK7QStringRK14QSharedPointerIN8KCalCore13IncidenceBaseEE5QDatebRKN9KDateTime4SpecE at Base 4:15.12.1
+ _ZN9KCalUtils18IncidenceFormatter10toolTipStrERK7QStringRK14QSharedPointerIN8KCalCore13IncidenceBaseEERK5QDatebRKN9KDateTime4SpecE at Base 4:15.12.1
  _ZN9KCalUtils18IncidenceFormatter11mailBodyStrERK14QSharedPointerIN8KCalCore13IncidenceBaseEERKN9KDateTime4SpecE at Base 4:15.07.90
  _ZN9KCalUtils18IncidenceFormatter12dateToStringERK9KDateTimebRKNS1_4SpecE at Base 4:15.07.90
  _ZN9KCalUtils18IncidenceFormatter12timeToStringERK9KDateTimebRKNS1_4SpecE at Base 4:15.07.90
@@ -67,8 +67,8 @@ libKF5CalendarUtils.so.5 libkf5calendarutils5 #MINVER#
  _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
- _ZN9KCalUtils18IncidenceFormatter19extensiveDisplayStrERK7QStringRK14QSharedPointerIN8KCalCore13IncidenceBaseEE5QDateRKN9KDateTime4SpecE at Base 4:15.12.1
+ _ZN9KCalUtils18IncidenceFormatter19extensiveDisplayStrERK14QSharedPointerIN8KCalCore8CalendarEERKS1_INS2_13IncidenceBaseEERK5QDateRKN9KDateTime4SpecE at Base 4:15.12.1
+ _ZN9KCalUtils18IncidenceFormatter19extensiveDisplayStrERK7QStringRK14QSharedPointerIN8KCalCore13IncidenceBaseEERK5QDateRKN9KDateTime4SpecE at Base 4:15.12.1
  _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