[SCM] charmtimetracker packaging branch, master, updated. debian/1.10.0-1-8-g436330c

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat May 14 11:56:41 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/charmtimetracker.git;a=commitdiff;h=7343204

The following commit has been merged in the master branch:
commit 734320462ed84aad7a75eeab51afb75ca2f999b6
Merge: dad26123b6cc6c6609a71a6579c7aaee388baa51 16712c128f88b8c46d6d66fb8c414a11e1bc6263
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat May 14 13:27:21 2016 +0200

    Merge tag 'upstream/1.11.1'
    
    Upstream version 1.11.1
    
    # gpg: Unterschrift vom Sa 14 Mai 2016 13:27:08 CEST mittels RSA-Schlüssel ID 50605636
    # gpg: Korrekte Unterschrift von "Sandro Knauß <bugs at sandroknauss.de>"
    # gpg: WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!
    # gpg:          Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen Besitzer gehört.
    # Haupt-Fingerabdruck  = 39EC 11A0 2016 B729 2649  1A06 E3AD B008 5060 5636

 .krazy                                             |   2 +-
 BUILD                                              |  66 +++++
 CMakeLists.txt                                     |  96 ++++---
 COPYING                                            |   1 +
 Charm.pro                                          |   4 -
 Charm/ApplicationCore.cpp                          | 257 +++++++++--------
 Charm/ApplicationCore.h                            |  48 ++--
 Charm/CI/CharmCommandInterface.cpp                 |   2 +-
 Charm/CI/CharmCommandInterface.h                   |   2 +-
 Charm/CI/CharmCommandProtocol.h                    |   2 +-
 Charm/CI/CharmCommandServer.cpp                    |   2 +-
 Charm/CI/CharmCommandServer.h                      |   2 +-
 Charm/CI/CharmCommandSession.cpp                   |   2 +-
 Charm/CI/CharmCommandSession.h                     |   2 +-
 Charm/CI/CharmLocalCommandServer.cpp               |   2 +-
 Charm/CI/CharmLocalCommandServer.h                 |   2 +-
 Charm/CI/CharmTCPCommandServer.cpp                 |   2 +-
 Charm/CI/CharmTCPCommandServer.h                   |   2 +-
 Charm/CMake/Modules/FindXCB.cmake                  |  57 ++++
 Charm/CMakeLists.txt                               |  82 +++---
 Charm/Charm.cpp                                    |  35 ++-
 Charm/Commands/CommandAddTask.cpp                  |   3 +-
 Charm/Commands/CommandAddTask.h                    |   6 +-
 Charm/Commands/CommandDeleteEvent.cpp              |   4 +-
 Charm/Commands/CommandDeleteEvent.h                |   4 +-
 Charm/Commands/CommandDeleteTask.cpp               |   3 +-
 Charm/Commands/CommandDeleteTask.h                 |   6 +-
 Charm/Commands/CommandExportToXml.cpp              |   3 +-
 Charm/Commands/CommandExportToXml.h                |   6 +-
 Charm/Commands/CommandImportFromXml.cpp            |   2 +-
 Charm/Commands/CommandImportFromXml.h              |   4 +-
 Charm/Commands/CommandMakeAndActivateEvent.cpp     |   2 +-
 Charm/Commands/CommandMakeAndActivateEvent.h       |   4 +-
 Charm/Commands/CommandMakeEvent.cpp                |   4 +-
 Charm/Commands/CommandMakeEvent.h                  |   6 +-
 Charm/Commands/CommandModifyEvent.cpp              |   4 +-
 Charm/Commands/CommandModifyEvent.h                |   4 +-
 Charm/Commands/CommandModifyTask.cpp               |   3 +-
 Charm/Commands/CommandModifyTask.h                 |   6 +-
 Charm/Commands/CommandRelayCommand.cpp             |   3 +-
 Charm/Commands/CommandRelayCommand.h               |   6 +-
 Charm/Commands/CommandSetAllTasks.cpp              |   3 +-
 Charm/Commands/CommandSetAllTasks.h                |   6 +-
 Charm/Data.cpp                                     |   2 +-
 Charm/Data.h                                       |   2 +-
 Charm/EventModelAdapter.cpp                        |   2 +-
 Charm/EventModelAdapter.h                          |   4 +-
 Charm/EventModelFilter.cpp                         |   9 +-
 Charm/EventModelFilter.h                           |   6 +-
 Charm/GUIState.cpp                                 |   5 +-
 Charm/GUIState.h                                   |   8 +-
 Charm/HttpClient/CheckForUpdatesJob.cpp            |   2 +-
 Charm/HttpClient/CheckForUpdatesJob.h              |   4 +-
 Charm/HttpClient/GetProjectCodesJob.cpp            |   7 +-
 Charm/HttpClient/GetProjectCodesJob.h              |   6 +-
 Charm/HttpClient/GetUserInfoJob.cpp                |   6 +-
 Charm/HttpClient/GetUserInfoJob.h                  |   5 +-
 Charm/HttpClient/HttpJob.cpp                       |  34 ++-
 Charm/HttpClient/HttpJob.h                         |  18 +-
 Charm/HttpClient/UploadTimesheetJob.cpp            |   8 +-
 Charm/HttpClient/UploadTimesheetJob.h              |   4 +-
 Charm/Idle/IdleDetector.cpp                        |   7 +-
 Charm/Idle/IdleDetector.h                          |   6 +-
 Charm/Idle/MacIdleDetector.h                       |   2 +-
 Charm/Idle/MacIdleDetector.mm                      |  23 ++
 Charm/Idle/WindowsIdleDetector.cpp                 |   2 +-
 Charm/Idle/WindowsIdleDetector.h                   |   2 +-
 Charm/Idle/X11IdleDetector.cpp                     |  36 ++-
 Charm/Idle/X11IdleDetector.h                       |  16 +-
 Charm/Keychain/gnomekeyring.cpp                    |  25 +-
 Charm/Keychain/gnomekeyring_p.h                    |  27 +-
 Charm/MacApplicationCore.h                         |   4 +-
 Charm/MacApplicationCore.mm                        |  36 ++-
 Charm/ModelConnector.cpp                           |   8 +-
 Charm/ModelConnector.h                             |   2 +-
 Charm/QtQuick/Charm.cpp                            |   2 +-
 Charm/QtQuick/qml/main.qml                         |   2 +-
 Charm/Reports/MonthlyTimesheetXmlWriter.cpp        |  12 +-
 Charm/Reports/MonthlyTimesheetXmlWriter.h          |  12 +-
 Charm/Reports/TimesheetInfo.cpp                    |   7 +-
 Charm/Reports/TimesheetInfo.h                      |   8 +-
 Charm/Reports/WeeklyTimesheetXmlWriter.cpp         |   9 +-
 Charm/Reports/WeeklyTimesheetXmlWriter.h           |  10 +-
 Charm/TaskModelAdapter.cpp                         |   6 +-
 Charm/TaskModelAdapter.h                           |  10 +-
 .../UpdateCheckerTests.h => Charm/TemporaryValue.h |  28 +-
 Charm/UndoCharmCommandWrapper.cpp                  |   2 +-
 Charm/UndoCharmCommandWrapper.h                    |   2 +-
 Charm/Uniquifier.h                                 |  48 ----
 Charm/ViewFilter.cpp                               |  24 +-
 Charm/ViewFilter.h                                 |  15 +-
 Charm/ViewHelpers.cpp                              |   6 +-
 Charm/ViewHelpers.h                                |   2 +-
 Charm/WeeklySummary.cpp                            |   6 +-
 Charm/WeeklySummary.h                              |   4 +-
 Charm/Widgets/ActivityReport.cpp                   | 132 ++++-----
 Charm/Widgets/ActivityReport.h                     |  24 +-
 Charm/Widgets/ActivityReportConfigurationDialog.ui | 228 ++++-----------
 Charm/Widgets/BillDialog.cpp                       |   4 +-
 Charm/Widgets/BillDialog.h                         |   6 +-
 Charm/Widgets/CharmAboutDialog.cpp                 |   2 +-
 Charm/Widgets/CharmAboutDialog.h                   |   4 +-
 Charm/Widgets/CharmAboutDialog.ui                  |   4 +-
 Charm/Widgets/CharmNewReleaseDialog.cpp            |   2 +-
 Charm/Widgets/CharmNewReleaseDialog.h              |   4 +-
 Charm/Widgets/CharmPreferences.cpp                 |   4 +-
 Charm/Widgets/CharmPreferences.h                   |   4 +-
 Charm/Widgets/CharmWindow.cpp                      |  77 ++---
 Charm/Widgets/CharmWindow.h                        |  25 +-
 Charm/Widgets/CommentEditorPopup.cpp               |   3 +-
 Charm/Widgets/CommentEditorPopup.h                 |   6 +-
 Charm/Widgets/ConfigurationDialog.cpp              |   2 +-
 Charm/Widgets/ConfigurationDialog.h                |   2 +-
 Charm/Widgets/DateEntrySyncer.cpp                  |   2 +-
 Charm/Widgets/DateEntrySyncer.h                    |   2 +-
 Charm/Widgets/EnterVacationDialog.cpp              |   7 +-
 Charm/Widgets/EnterVacationDialog.h                |   6 +-
 Charm/Widgets/EventEditor.cpp                      |   5 +-
 Charm/Widgets/EventEditor.h                        |   8 +-
 Charm/Widgets/EventEditorDelegate.cpp              | 101 ++++---
 Charm/Widgets/EventEditorDelegate.h                |  11 +-
 Charm/Widgets/EventView.cpp                        | 115 +++++---
 Charm/Widgets/EventView.h                          |  42 ++-
 Charm/Widgets/EventWindow.cpp                      |  75 -----
 Charm/Widgets/EventWindow.h                        |  59 ----
 Charm/Widgets/ExpandStatesHelper.cpp               |   2 +-
 Charm/Widgets/ExpandStatesHelper.h                 |   2 +-
 Charm/Widgets/FindAndReplaceEventsDialog.cpp       |  13 +-
 Charm/Widgets/FindAndReplaceEventsDialog.h         |   8 +-
 Charm/Widgets/HttpJobProgressDialog.cpp            |   2 +-
 Charm/Widgets/HttpJobProgressDialog.h              |   2 +-
 Charm/Widgets/IdleCorrectionDialog.cpp             |   2 +-
 Charm/Widgets/IdleCorrectionDialog.h               |   4 +-
 Charm/Widgets/MakeTemporarilyVisible.h             |   7 +-
 Charm/Widgets/MessageBox.cpp                       |   2 +-
 Charm/Widgets/MessageBox.h                         |   2 +-
 Charm/Widgets/MonthlyTimesheet.cpp                 |   5 +-
 Charm/Widgets/MonthlyTimesheet.h                   |  10 +-
 .../MonthlyTimesheetConfigurationDialog.cpp        |   6 +-
 .../Widgets/MonthlyTimesheetConfigurationDialog.h  |   6 +-
 Charm/Widgets/NotificationPopup.cpp                |   2 +-
 Charm/Widgets/NotificationPopup.h                  |   4 +-
 Charm/Widgets/ReportConfigurationDialog.cpp        |   2 +-
 Charm/Widgets/ReportConfigurationDialog.h          |   4 +-
 Charm/Widgets/ReportPreviewWindow.cpp              |   9 +-
 Charm/Widgets/ReportPreviewWindow.h                |   7 +-
 Charm/Widgets/SelectTaskDialog.cpp                 |  16 +-
 Charm/Widgets/SelectTaskDialog.h                   |  10 +-
 Charm/Widgets/TaskEditor.cpp                       |   2 +-
 Charm/Widgets/TaskEditor.h                         |   4 +-
 Charm/Widgets/TaskIdDialog.cpp                     |   2 +-
 Charm/Widgets/TaskIdDialog.h                       |   4 +-
 Charm/Widgets/TasksView.cpp                        |  49 ++--
 Charm/Widgets/TasksView.h                          |  35 +--
 Charm/Widgets/TasksViewDelegate.cpp                |   3 +-
 Charm/Widgets/TasksViewDelegate.h                  |   4 +-
 Charm/Widgets/TasksWindow.cpp                      |  91 ------
 Charm/Widgets/TasksWindow.h                        |  62 -----
 Charm/Widgets/TimeTrackingTaskSelector.cpp         |  49 +++-
 Charm/Widgets/TimeTrackingTaskSelector.h           |  19 +-
 Charm/Widgets/TimeTrackingView.cpp                 |   3 +-
 Charm/Widgets/TimeTrackingView.h                   |   9 +-
 Charm/Widgets/TimeTrackingWindow.cpp               |  84 +++---
 Charm/Widgets/TimeTrackingWindow.h                 |  30 +-
 Charm/Widgets/Timesheet.cpp                        |   6 +-
 Charm/Widgets/Timesheet.h                          |   8 +-
 Charm/Widgets/TrayIcon.cpp                         |   4 +-
 Charm/Widgets/TrayIcon.h                           |   4 +-
 Charm/Widgets/WeeklyTimesheet.cpp                  |   9 +-
 Charm/Widgets/WeeklyTimesheet.h                    |  14 +-
 Charm/Widgets/WidgetUtils.cpp                      |  54 ++++
 .../TimeSpanTests.h => Charm/Widgets/WidgetUtils.h |  23 +-
 Charm/qt.conf.in.windows                           |   2 +
 CharmCMake.h.cmake                                 |   6 +-
 Core/CharmCommand.cpp                              |   3 +-
 Core/CharmCommand.h                                |   6 +-
 Core/CharmConstants.cpp                            |   4 +-
 Core/CharmConstants.h                              |   4 +-
 Core/CharmDataModel.cpp                            |  10 +-
 Core/CharmDataModel.h                              |   4 +-
 Core/CharmDataModelAdapterInterface.h              |   2 +-
 Core/CharmExceptions.cpp                           |   2 +-
 Core/CharmExceptions.h                             |   2 +-
 Core/CommandEmitterInterface.h                     |   2 +-
 Core/Configuration.cpp                             |  24 +-
 Core/Configuration.h                               |  31 +--
 Core/Controller.cpp                                |  15 +-
 Core/Controller.h                                  |  24 +-
 Core/ControllerInterface.h                         |   2 +-
 Core/Dates.cpp                                     |   2 +-
 Core/Dates.h                                       |   2 +-
 Core/Event.cpp                                     |   7 +-
 Core/Event.h                                       |  12 +-
 Core/EventModelInterface.h                         |   2 +-
 Core/Installation.h                                |   2 +-
 Core/MySqlStorage.cpp                              |   2 +-
 Core/MySqlStorage.h                                |   2 +-
 Core/SmartNameCache.cpp                            |   8 +-
 Core/SmartNameCache.h                              |   2 +-
 Core/SqLiteStorage.cpp                             |  11 +-
 Core/SqLiteStorage.h                               |   4 +-
 Core/SqlRaiiTransactor.cpp                         |   5 +-
 Core/SqlRaiiTransactor.h                           |   4 +-
 Core/SqlStorage.cpp                                |   9 +-
 Core/SqlStorage.h                                  |   2 +-
 Core/State.cpp                                     |   2 +-
 Core/State.h                                       |   2 +-
 Core/StorageInterface.h                            |   2 +-
 Core/Task.cpp                                      |   7 +-
 Core/Task.h                                        |  10 +-
 Core/TaskListMerger.cpp                            |   3 +-
 Core/TaskListMerger.h                              |   4 +-
 Core/TaskModelInterface.h                          |   2 +-
 Core/TaskTreeItem.cpp                              |   3 +-
 Core/TaskTreeItem.h                                |   4 +-
 Core/TimeSpans.cpp                                 |   2 +-
 Core/TimeSpans.h                                   |   2 +-
 .../ViewModeInterface.h => Core/UIStateInterface.h |  21 +-
 Core/User.h                                        |   5 +-
 Core/ViewInterface.h                               |  27 +-
 Core/XmlSerialization.cpp                          |   3 +-
 Core/XmlSerialization.h                            |   2 +-
 Tests/BackendIntegrationTests.cpp                  |   2 +-
 Tests/BackendIntegrationTests.h                    |   2 +-
 Tests/CMakeLists.txt                               |   8 +
 Tests/CharmDataModelTests.cpp                      |   3 +-
 Tests/CharmDataModelTests.h                        |   4 +-
 Tests/ControllerTests.cpp                          |  13 +-
 Tests/ControllerTests.h                            |   8 +-
 Tests/DatesTests.cpp                               |   2 +-
 Tests/DatesTests.h                                 |   2 +-
 Tests/EventModelFilterTests.cpp                    | 310 +++++++++++++++++++++
 Tests/EventModelFilterTests.h                      |  68 +++++
 Tests/ImportExportTests.cpp                        |   2 +-
 Tests/ImportExportTests.h                          |   2 +-
 Tests/SmartNameCacheTests.cpp                      |   2 +-
 Tests/SmartNameCacheTests.h                        |   2 +-
 Tests/SqLiteStorageTests.cpp                       |   2 +-
 Tests/SqLiteStorageTests.h                         |   4 +-
 Tests/SqlTransactionTests.cpp                      |   2 +-
 Tests/SqlTransactionTests.h                        |   2 +-
 Tests/TaskStructureTests.cpp                       |   2 +-
 Tests/TaskStructureTests.h                         |   2 +-
 Tests/TestApplication.cpp                          |   4 +-
 Tests/TestApplication.h                            |   6 +-
 Tests/TestHelpers.h                                |   2 +-
 Tests/TimeSheetProcessorTests.cpp                  |   2 +-
 Tests/TimeSheetProcessorTests.h                    |   2 +-
 Tests/TimeSpanTests.cpp                            |   4 +-
 Tests/TimeSpanTests.h                              |   2 +-
 Tests/UpdateCheckerTests.cpp                       |   2 +-
 Tests/UpdateCheckerTests.h                         |   2 +-
 Tests/XmlSerializationTests.cpp                    |   9 +-
 Tests/XmlSerializationTests.h                      |   2 +-
 Tools/Anonymizer/Anonymizer.cpp                    |   2 +-
 Tools/TimesheetGenerator/Exceptions.h              |   2 +-
 Tools/TimesheetGenerator/Options.cpp               |   2 +-
 Tools/TimesheetGenerator/Options.h                 |   2 +-
 Tools/TimesheetGenerator/main.cpp                  |   2 +-
 Tools/TimesheetProcessor/CommandLine.cpp           |   2 +-
 Tools/TimesheetProcessor/CommandLine.h             |   2 +-
 Tools/TimesheetProcessor/Database.cpp              |   2 +-
 Tools/TimesheetProcessor/Database.h                |   2 +-
 Tools/TimesheetProcessor/Exceptions.h              |   2 +-
 Tools/TimesheetProcessor/Operations.cpp            |   2 +-
 Tools/TimesheetProcessor/Operations.h              |   2 +-
 Tools/TimesheetProcessor/main.cpp                  |   2 +-
 charmtimetracker.dsc                               |   6 +-
 charmtimetracker.spec                              |   4 +-
 debian.changelog                                   |   9 +-
 debian.rules                                       |   2 +-
 271 files changed, 2078 insertions(+), 1740 deletions(-)

-- 
charmtimetracker packaging



More information about the pkg-kde-commits mailing list