[SCM] charmtimetracker packaging branch, master, updated. upstream/1.10.0-10-gdad2612

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 16 08:14:46 UTC 2015


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

The following commit has been merged in the master branch:
commit dad26123b6cc6c6609a71a6579c7aaee388baa51
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Oct 16 09:48:26 2015 +0200

    Patch typo
---
 debian/patches/reset_button.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/reset_button.patch b/debian/patches/reset_button.patch
index ede35e8..2cb903a 100644
--- a/debian/patches/reset_button.patch
+++ b/debian/patches/reset_button.patch
@@ -1,13 +1,13 @@
 Index: charmtimetracker/Charm/Widgets/CharmPreferences.cpp
 ===================================================================
---- charmtimetracker.orig/Charm/Widgets/CharmPreferences.cpp	2015-10-06 15:25:00.001340812 +0200
-+++ charmtimetracker/Charm/Widgets/CharmPreferences.cpp	2015-10-15 19:17:35.395175781 +0200
+--- 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.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() );

-- 
charmtimetracker packaging



More information about the pkg-kde-commits mailing list