[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.15+dfsg-3-9-gc7fcad6

[Julian Taylor]

The following commit has been merged in the master branch:
commit c7fcad68b3ccd271726a7ec99b8212347df9d20a
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue Jul 12 21:57:11 2011 +0200

    add patch: enable-local-help.patch
    
    enables opening of local help files from the application

diff --git a/debian/changelog b/debian/changelog
index 2fa880d..239a2c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ keepass2 (2.16+dfsg-1) UNRELEASED; urgency=low
     - removed two non-free icons from orig source
   * update debian/README.Debian:
     - multiple instancse working, removed from known issues
+  * add patch: enable-local-help.patch
+    - enables opening of local help files from the application
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 12 Jul 2011 20:19:13 +0200
 
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
new file mode 100644
index 0000000..b8f5d1e
--- /dev/null
+++ b/debian/patches/enable-local-help.patch
@@ -0,0 +1,53 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Tue, 12 Jul 2011 21:51:43 +0200
+Subject: enable local help
+
+disable windows chm viewer and use x-www-browser to view docs
+located as html files in "/usr/share/doc/keepass2/Chm/help/"
+Forwarded: not-needed
+---
+ KeePass/App/AppHelp.cs |   12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/KeePass/App/AppHelp.cs b/KeePass/App/AppHelp.cs
+index 3172a33..67d6419 100644
+--- a/KeePass/App/AppHelp.cs
++++ b/KeePass/App/AppHelp.cs
+@@ -56,7 +56,7 @@ namespace KeePass.App
+ 			{
+ 				if(m_strLocalHelpFile == null) return false;
+ 
+-				try { return File.Exists(m_strLocalHelpFile); }
++				try { return Directory.Exists(@"/usr/share/doc/keepass2/Chm/help/"); }
+ 				catch(Exception) { }
+ 				return false;
+ 			}
+@@ -113,10 +113,12 @@ namespace KeePass.App
+ 		{
+ 			Debug.Assert(m_strLocalHelpFile != null);
+ 
+-			string strCmd = @"ms-its:" + m_strLocalHelpFile;
++			string strCmd = @"/usr/share/doc/keepass2/Chm/help/";
+ 
+ 			if(strTopic != null)
+-				strCmd += @"::/help/" + strTopic + ".html";
++				strCmd += strTopic + ".html";
++			else
++				strCmd += @"../index.html";
+ 
+ 			if(strSection != null)
+ 			{
+@@ -124,10 +126,10 @@ namespace KeePass.App
+ 				strCmd += @"#" + strSection;
+ 			}
+ 
+-			try { Process.Start("hh.exe", strCmd); }
++			try { Process.Start("x-www-browser", strCmd); }
+ 			catch(Exception exStart)
+ 			{
+-				MessageService.ShowWarning(@"hh.exe " + strCmd, exStart);
++				MessageService.ShowWarning(@"x-www-browser " + strCmd, exStart);
+ 			}
+ 		}
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index bb52e9e..d0c70b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ skip-sgen-run-during-build.patch
 fix-XSL-search-path.patch
 remove-ToolsVersion-3.5.patch
 prefer-4.0-framework-if-available.patch
+enable-local-help.patch

-- 
keepass2