[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. upstream/2.14.dfsg-76-g6a006d9

[Julian Taylor]

The following commit has been merged in the master branch:
commit c206107a44d2c3c2dd287fe836967421d654807e
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Apr 10 16:26:12 2011 +0200

    add patch 05_find_xsl.patch
    
    searches for XSL files in /usr/share/keepass2

diff --git a/debian/patches/05_find_xsl.patch b/debian/patches/05_find_xsl.patch
new file mode 100644
index 0000000..5746ed4
--- /dev/null
+++ b/debian/patches/05_find_xsl.patch
@@ -0,0 +1,27 @@
+diff --git a/KeePass/App/AppDefs.cs b/KeePass/App/AppDefs.cs
+index 5345a3e..a9247e8 100644
+--- a/KeePass/App/AppDefs.cs
++++ b/KeePass/App/AppDefs.cs
+@@ -36,6 +36,8 @@ namespace KeePass.App
+ 		public static readonly Color ColorControlDisabled = SystemColors.Control;
+ 		public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
+ 
++                public const string DebianDataDir = "/usr/share/keepass2/";
++
+ 		public const string XslFilesDir = "XSL";
+ 		public const string XslFileHtmlLite = "KDB4_DetailsLite.xsl";
+ 		public const string XslFileHtmlFull = "KDB4_DetailsFull.xsl";
+diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
+index 3e0ad1d..198ec0c 100644
+--- a/KeePass/Forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
+@@ -93,8 +93,7 @@ namespace KeePass.Forms
+ 			m_lvComponents.Items.Add(lvi);
+ 
+ 			lvi = new ListViewItem(KPRes.XslStylesheets);
+-			string strPath = WinUtil.GetExecutable();
+-			strPath = UrlUtil.GetFileDirectory(strPath, true, false);
++			string strPath = AppDefs.DebianDataDir;
+ 			strPath += AppDefs.XslFilesDir;
+ 			strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
+ 			bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);
diff --git a/debian/patches/series b/debian/patches/series
index 8f165af..48636c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_avoid_broken_res.patch
 03_use_free_icon.patch
 04_no_sgen.patch
+05_find_xsl.patch

-- 
keepass2