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

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit b8fc0f16ff5b17cbd1421fa79209e5285fcf86aa
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat May 14 13:54:07 2016 +0200

    Remove upstream applied patches
---
 debian/patches/reset_button.patch          | 13 -----
 debian/patches/series                      |  2 -
 debian/patches/use_system_qtkeychain.patch | 88 ------------------------------
 3 files changed, 103 deletions(-)

diff --git a/debian/patches/reset_button.patch b/debian/patches/reset_button.patch
deleted file mode 100644
index 2cb903a..0000000
--- a/debian/patches/reset_button.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: charmtimetracker/Charm/Widgets/CharmPreferences.cpp
-===================================================================
---- charmtimetracker.orig/Charm/Widgets/CharmPreferences.cpp	2015-10-16 09:14:28.500046513 +0200
-+++ charmtimetracker/Charm/Widgets/CharmPreferences.cpp	2015-10-16 09:27:05.745936007 +0200
-@@ -46,6 +46,8 @@
- 
-     m_ui.lbWarnUnuploadedTimesheets->setVisible( httpJobPossible );
-     m_ui.cbWarnUnuploadedTimesheets->setVisible( httpJobPossible );
-+    m_ui.lbResetPassword->setVisible( httpJobPossible );
-+    m_ui.pbResetPassword->setVisible( httpJobPossible );
-     m_ui.cbIdleDetection->setEnabled( haveIdleDetection );
-     m_ui.lbIdleDetection->setEnabled( haveIdleDetection );
-     m_ui.cbIdleDetection->setChecked( config.detectIdling && m_ui.cbIdleDetection->isEnabled() );
diff --git a/debian/patches/series b/debian/patches/series
index da57cd4..92481e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 notinstall_license.txt.patch
-use_system_qtkeychain.patch
-reset_button.patch
diff --git a/debian/patches/use_system_qtkeychain.patch b/debian/patches/use_system_qtkeychain.patch
deleted file mode 100644
index 0e88cc4..0000000
--- a/debian/patches/use_system_qtkeychain.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Index: charmtimetracker-1.10.0/Charm/CMakeLists.txt
-===================================================================
---- charmtimetracker-1.10.0.orig/Charm/CMakeLists.txt	2015-10-02 09:50:49.000000000 +0200
-+++ charmtimetracker-1.10.0/Charm/CMakeLists.txt	2015-10-06 14:07:13.594126955 +0200
-@@ -110,31 +110,6 @@
-     ENDIF()
- ENDIF()
- 
--LIST( APPEND CharmApplication_SRCS Keychain/keychain.cpp )
--
--IF (APPLE)
--    LIST( APPEND CharmApplication_SRCS Keychain/keychain_mac.cpp MacApplicationCore.mm )
--
--    FIND_LIBRARY( COREFOUNDATION_LIBRARY CoreFoundation )
--    LIST( APPEND CharmApplication_LIBS ${COREFOUNDATION_LIBRARY} )
--
--    FIND_LIBRARY( SECURITY_LIBRARY Security )
--    LIST( APPEND CharmApplication_LIBS ${SECURITY_LIBRARY} )
--
--    FIND_LIBRARY( APPKIT_LIBRARY AppKit )
--    LIST( APPEND CharmApplication_LIBS ${APPKIT_LIBRARY} )
--ELSEIF ( WIN32 )
--    LIST( APPEND CharmApplication_SRCS Keychain/keychain_win.cpp )
--ELSEIF ( UNIX )
--    IF (HAVE_DBUS)
--        LIST( APPEND CharmApplication_SRCS Keychain/gnomekeyring.cpp Keychain/keychain_unix.cpp )
--        QT_ADD_DBUS_INTERFACE( CharmApplication_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/Keychain/org.kde.KWallet.xml kwallet_interface KWalletInterface )
--        LIST( APPEND CharmApplication_LIBS ${QT_QTDBUS_LIBRARY} )
--    ELSE()
--        LIST( APPEND CharmApplication_SRCS Keychain/keychain_unsecure.cpp )
--    ENDIF()
--ENDIF()
--
- QT_WRAP_UI(
-     UiGenerated_SRCS
-     Widgets/CommentEditorPopup.ui
-@@ -192,7 +167,7 @@
- ENDIF()
- 
- ADD_EXECUTABLE( ${Charm_EXECUTABLE} WIN32 MACOSX_BUNDLE ${Charm_SRCS} ${Resources_SRCS} )
--TARGET_LINK_LIBRARIES( ${Charm_EXECUTABLE} CharmApplication CharmCore ${QT_LIBRARIES} )
-+TARGET_LINK_LIBRARIES( ${Charm_EXECUTABLE} CharmApplication CharmCore ${QT_LIBRARIES} ${QTKEYCHAIN_LIBRARIES})
- IF( WIN32 )
-     TARGET_LINK_LIBRARIES( ${Charm_EXECUTABLE} Crypt32 )
- ENDIF()
-Index: charmtimetracker-1.10.0/CMakeLists.txt
-===================================================================
---- charmtimetracker-1.10.0.orig/CMakeLists.txt	2015-10-06 13:54:47.000000000 +0200
-+++ charmtimetracker-1.10.0/CMakeLists.txt	2015-10-06 13:54:47.000000000 +0200
-@@ -50,6 +50,7 @@
-     find_package( Qt5Core QUIET )
- ENDIF()
- 
-+
- IF(Qt5Core_FOUND)
-     find_package(Qt5Widgets REQUIRED)
-     find_package(Qt5Xml REQUIRED)
-@@ -57,6 +58,8 @@
-     find_package(Qt5Sql REQUIRED)
-     find_package(Qt5Test REQUIRED)
- 
-+    find_package(Qt5Keychain REQUIRED)
-+
-     find_package(Qt5PrintSupport)
-     IF(Qt5PrintSupport_FOUND)
-         include_directories(${Qt5PrintSupport_INCLUDE_DIRS})
-@@ -132,6 +135,8 @@
-     find_package(Qt4 COMPONENTS QtMain QtCore QtGui QtSql QtXml QtNetwork REQUIRED)
-     INCLUDE( UseQt4 )
- 
-+    find_package(QtKeychain REQUIRED)
-+
-     SET(CHARM_MAC_HIGHRES_SUPPORT_ENABLED OFF)
- 
-     IF(UNIX AND NOT APPLE)
-Index: charmtimetracker-1.10.0/Charm/HttpClient/HttpJob.cpp
-===================================================================
---- charmtimetracker-1.10.0.orig/Charm/HttpClient/HttpJob.cpp	2015-10-02 09:50:49.000000000 +0200
-+++ charmtimetracker-1.10.0/Charm/HttpClient/HttpJob.cpp	2015-10-06 14:03:25.978775492 +0200
-@@ -23,7 +23,7 @@
- */
- 
- #include "HttpJob.h"
--#include "Keychain/keychain.h"
-+#include <qt5keychain/keychain.h>
- 
- #include <QNetworkAccessManager>
- #include <QNetworkReply>

-- 
charmtimetracker packaging