rev 18798 - in kde-extras/kchmviewer/trunk/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2011-02-20 11:30:53 +0000 (Sun, 20 Feb 2011)
New Revision: 18798

Added:
   kde-extras/kchmviewer/trunk/debian/patches/disable_check_new_version.patch
Removed:
   kde-extras/kchmviewer/trunk/debian/patches/00_ftbfs_svn_r363.diff
   kde-extras/kchmviewer/trunk/debian/patches/02_grammatical_error.diff
Modified:
   kde-extras/kchmviewer/trunk/debian/changelog
   kde-extras/kchmviewer/trunk/debian/patches/series
Log:
New upstream release.
Remove patches:
 - 00_ftbfs_svn_r363.diff - merged upstream
 - 02_grammatical_error.diff - merger upstream
Add disable_check_new_version.patch to disable new version checking.
(Closes: #602535)


Modified: kde-extras/kchmviewer/trunk/debian/changelog
===================================================================
--- kde-extras/kchmviewer/trunk/debian/changelog	2011-02-20 11:27:43 UTC (rev 18797)
+++ kde-extras/kchmviewer/trunk/debian/changelog	2011-02-20 11:30:53 UTC (rev 18798)
@@ -1,3 +1,14 @@
+kchmviewer (5.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove patches:
+    - 00_ftbfs_svn_r363.diff - merged upstream
+    - 02_grammatical_error.diff - merger upstream
+  * Add disable_check_new_version.patch to disable new version checking.
+    (Closes: #602535)
+
+ -- Fathi Boudra <fabo at debian.org>  Sun, 30 Jan 2011 19:08:06 +0200
+
 kchmviewer (5.2-1) unstable; urgency=low
 
   * New upstream release.

Added: kde-extras/kchmviewer/trunk/debian/patches/disable_check_new_version.patch
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/disable_check_new_version.patch	                        (rev 0)
+++ kde-extras/kchmviewer/trunk/debian/patches/disable_check_new_version.patch	2011-02-20 11:30:53 UTC (rev 18798)
@@ -0,0 +1,24 @@
+Description: disable check new version
+Bug: 602535
+--- a/src/config.cpp
++++ b/src/config.cpp
+@@ -53,7 +53,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();
+-	m_advCheckNewVersion = settings.value( "advanced/checknewver", true ).toBool();
++	m_advCheckNewVersion = false;
+ 	m_toolbarMode = (Config::ToolbarMode) settings.value( "advanced/toolbarmode", TOOLBAR_LARGEICONSTEXT ).toInt();
+ 	m_lastOpenedDir = settings.value( "advanced/lastopendir", "." ).toString();
+ 
+--- a/src/dialog_setup.cpp
++++ b/src/dialog_setup.cpp
+@@ -220,7 +220,7 @@ void DialogSetup::accept()
+ 		need_restart = true;
+ 	
+ 	pConfig->m_advAutodetectEncoding = boxAutodetectEncoding->isChecked();
+-	pConfig->m_advCheckNewVersion = cbCheckForUpdates->isChecked();
++	pConfig->m_advCheckNewVersion = false;
+ 
+ 	// Layout direction management
+ 	bool layout_rl = boxLayoutDirectionRL->isChecked();

Modified: kde-extras/kchmviewer/trunk/debian/patches/series
===================================================================
--- kde-extras/kchmviewer/trunk/debian/patches/series	2011-02-20 11:27:43 UTC (rev 18797)
+++ kde-extras/kchmviewer/trunk/debian/patches/series	2011-02-20 11:30:53 UTC (rev 18798)
@@ -1,3 +1,2 @@
-00_ftbfs_svn_r363.diff
 01_disable_kio-msits_build.diff
-02_grammatical_error.diff
+disable_check_new_version.patch