[SCM] kchmviewer packaging branch, master, updated. 0f5142e2fb16c4f8f7c75bbf8662973c2aec5c18

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit f86729c34c78b64f2ca9382cc00ec0a0ae83416e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 21 20:31:37 2015 -0300

    Refresh disable_check_new_version.patch.
---
 debian/changelog                               |  1 +
 debian/patches/disable_check_new_version.patch | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a826dc0..612870f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kchmviewer (7.3-1) UNRELEASED; urgency=medium
       and KDE4 support. We can add KF5 support as soon as it happen upstream.
   * Override dh_auto_configure in order to use Qt5's qmake. We can drop this
     if CMakeLists.txt starts detecting Qt5.
+  * Refresh disable_check_new_version.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 21 Sep 2015 19:47:54 -0300
 
diff --git a/debian/patches/disable_check_new_version.patch b/debian/patches/disable_check_new_version.patch
index ca628a9..c4f34f0 100644
--- a/debian/patches/disable_check_new_version.patch
+++ b/debian/patches/disable_check_new_version.patch
@@ -1,8 +1,14 @@
 Description: disable check new version
 Bug: 602535
+Last-Updated: 2015-09-21
+---
+ src/config.cpp       |    2 +-
+ src/dialog_setup.cpp |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/src/config.cpp
 +++ b/src/config.cpp
-@@ -53,7 +53,7 @@ Config::Config()
+@@ -50,7 +50,7 @@ Config::Config()
  	m_advLayoutDirectionRL = settings.value( "advanced/layoutltr", false ).toBool();
  	m_advAutodetectEncoding = settings.value( "advanced/autodetectenc", false ).toBool();
  	m_advExternalEditorPath = settings.value( "advanced/editorpath", "/usr/bin/kate" ).toString();
@@ -13,7 +19,7 @@ Bug: 602535
  
 --- a/src/dialog_setup.cpp
 +++ b/src/dialog_setup.cpp
-@@ -177,7 +177,7 @@ void DialogSetup::accept()
+@@ -176,7 +176,7 @@ void DialogSetup::accept()
  	
  	// Autodetect encoding
  	Check_Need_Restart( boxAutodetectEncoding, &pConfig->m_advAutodetectEncoding, &need_restart );

-- 
kchmviewer packaging