[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.15+dfsg-3-8-g2e02b19
Julian Taylor
jtaylor.debian at googlemail.com
Tue Jul 12 18:38:12 UTC 2011
The following commit has been merged in the master branch:
commit e980dffb61c47f3cc0b88ff05a24fdf418be4755
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Tue Jul 12 20:08:14 2011 +0200
refresh patches and remove upstream applied ones
diff --git a/debian/patches/06_add-translation-search-paths.patch b/debian/patches/06_add-translation-search-paths.patch
deleted file mode 100644
index ca7c8ef..0000000
--- a/debian/patches/06_add-translation-search-paths.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Sun, 17 Apr 2011 18:54:38 +0200
-Subject: add translation search paths
-
- also search for translations in XDG_CONFIG_HOME and XDG_DATA_HOME
-Applied-Upstream: 2.16
----
- KeePass/App/Configuration/AppConfigSerializer.cs | 24 ++++++-
- KeePass/Forms/LanguageForm.cs | 70 +++++++++++++++-------
- KeePass/Program.cs | 60 ++++++++++++-------
- 3 files changed, 106 insertions(+), 48 deletions(-)
-
-diff --git a/KeePass/App/Configuration/AppConfigSerializer.cs b/KeePass/App/Configuration/AppConfigSerializer.cs
-index 24deaa1..62f58fe 100644
---- a/KeePass/App/Configuration/AppConfigSerializer.cs
-+++ b/KeePass/App/Configuration/AppConfigSerializer.cs
-@@ -40,6 +40,7 @@ namespace KeePass.App.Configuration
- private static string m_strBaseName = null; // Null prop allowed
-
- private static string m_strCreateDir = null;
-+ private static string m_strCreateDirLocal = null;
- private static string m_strEnforcedConfigFile = null;
- private static string m_strGlobalConfigFile = null;
- private static string m_strUserConfigFile = null;
-@@ -53,6 +54,15 @@ namespace KeePass.App.Configuration
- }
- }
-
-+ public static string LocalAppDataDirectory
-+ {
-+ get
-+ {
-+ AppConfigSerializer.GetConfigPaths();
-+ return m_strCreateDirLocal;
-+ }
-+ }
-+
- /// <summary>
- /// Get/set the base name for the configuration. If this property is
- /// <c>null</c>, the class constructs names based on the current
-@@ -67,6 +77,7 @@ namespace KeePass.App.Configuration
- m_strBaseName = value;
-
- m_strCreateDir = null;
-+ m_strCreateDirLocal = null;
- m_strEnforcedConfigFile = null; // Invalidate paths
- m_strGlobalConfigFile = null;
- m_strUserConfigFile = null;
-@@ -125,19 +136,24 @@ namespace KeePass.App.Configuration
- strUserDir = UrlUtil.GetFileDirectory(UrlUtil.FileUrlToPath(
- Assembly.GetExecutingAssembly().GetName().CodeBase), true, false);
- }
-+ strUserDir = UrlUtil.EnsureTerminatingSeparator(strUserDir, false);
-
-- if(!strUserDir.EndsWith(new string(Path.DirectorySeparatorChar, 1)) &&
-- !strUserDir.EndsWith("\\") && !strUserDir.EndsWith("/"))
-+ string strUserDirLocal;
-+ try
- {
-- strUserDir += new string(Path.DirectorySeparatorChar, 1);
-+ strUserDirLocal = Environment.GetFolderPath(
-+ Environment.SpecialFolder.LocalApplicationData);
- }
-+ catch(Exception) { strUserDirLocal = strUserDir; }
-+ strUserDirLocal = UrlUtil.EnsureTerminatingSeparator(strUserDirLocal, false);
-
- m_strCreateDir = strUserDir + strBaseDirName;
-+ m_strCreateDirLocal = strUserDirLocal + strBaseDirName;
- m_strUserConfigFile = m_strCreateDir + Path.DirectorySeparatorChar +
- strBaseDirName + ".config.xml";
- }
-
-- Debug.Assert(m_strCreateDir != null); Debug.Assert(m_strCreateDir.Length > 0);
-+ Debug.Assert(!string.IsNullOrEmpty(m_strCreateDir));
- }
-
- private static void EnsureAppDataDirAvailable()
-diff --git a/KeePass/Forms/LanguageForm.cs b/KeePass/Forms/LanguageForm.cs
-index 8478a23..c5c9360 100644
---- a/KeePass/Forms/LanguageForm.cs
-+++ b/KeePass/Forms/LanguageForm.cs
-@@ -26,6 +26,7 @@ using System.Windows.Forms;
- using System.IO;
-
- using KeePass.App;
-+using KeePass.App.Configuration;
- using KeePass.UI;
- using KeePass.Resources;
- using KeePass.Util;
-@@ -68,37 +69,62 @@ namespace KeePass.Forms
- lvi.SubItems.Add(AppDefs.DefaultTrlAuthor);
- lvi.SubItems.Add(AppDefs.DefaultTrlContact);
-
-+ List<string> vList = new List<string>();
-+ GetAvailableTranslations(AppConfigSerializer.AppDataDirectory, vList);
-+ GetAvailableTranslations(AppConfigSerializer.LocalAppDataDirectory, vList);
-+
- string strExe = WinUtil.GetExecutable();
- string strPath = UrlUtil.GetFileDirectory(strExe, false, true);
-- GetAvailableTranslations(strPath);
-+ GetAvailableTranslations(strPath, vList);
- }
-
-- private void GetAvailableTranslations(string strPath)
-+ private void GetAvailableTranslations(string strPath, List<string> vList)
- {
-- DirectoryInfo di = new DirectoryInfo(strPath);
-- FileInfo[] vFiles = di.GetFiles();
--
-- foreach(FileInfo fi in vFiles)
-+ try
- {
-- if(fi.FullName.ToLower().EndsWith("." + KPTranslation.FileExtension))
-+ DirectoryInfo di = new DirectoryInfo(strPath);
-+ FileInfo[] vFiles = di.GetFiles();
-+
-+ foreach(FileInfo fi in vFiles)
- {
-- try
-- {
-- KPTranslation kpTrl = KPTranslation.LoadFromFile(fi.FullName);
--
-- ListViewItem lvi = m_lvLanguages.Items.Add(
-- kpTrl.Properties.NameEnglish, 0);
-- lvi.SubItems.Add(kpTrl.Properties.ApplicationVersion);
-- lvi.SubItems.Add(kpTrl.Properties.AuthorName);
-- lvi.SubItems.Add(kpTrl.Properties.AuthorContact);
-- lvi.Tag = UrlUtil.GetFileName(fi.FullName);
-- }
-- catch(Exception ex)
-+ string strFullName = fi.FullName;
-+
-+ if(strFullName.ToLower().EndsWith("." + KPTranslation.FileExtension))
- {
-- MessageService.ShowWarning(ex.Message);
-+ string strFileName = UrlUtil.GetFileName(strFullName);
-+
-+ bool bFound = false;
-+ foreach(string strExisting in vList)
-+ {
-+ if(strExisting.Equals(strFileName, StrUtil.CaseIgnoreCmp))
-+ {
-+ bFound = true;
-+ break;
-+ }
-+ }
-+ if(bFound) continue;
-+
-+ try
-+ {
-+ KPTranslation kpTrl = KPTranslation.LoadFromFile(strFullName);
-+
-+ ListViewItem lvi = m_lvLanguages.Items.Add(
-+ kpTrl.Properties.NameEnglish, 0);
-+ lvi.SubItems.Add(kpTrl.Properties.ApplicationVersion);
-+ lvi.SubItems.Add(kpTrl.Properties.AuthorName);
-+ lvi.SubItems.Add(kpTrl.Properties.AuthorContact);
-+ lvi.Tag = strFileName;
-+
-+ vList.Add(strFileName);
-+ }
-+ catch(Exception ex)
-+ {
-+ MessageService.ShowWarning(ex.Message);
-+ }
- }
- }
- }
-+ catch(Exception) { } // Directory might not exist or cause access violation
- }
-
- private void OnBtnClose(object sender, EventArgs e)
-@@ -113,13 +139,13 @@ namespace KeePass.Forms
- if(lvic[0].Index == 0) // First item selected = English
- {
- if(Program.Config.Application.LanguageFile.Length == 0)
-- return; // Is built-English already
-+ return; // Is English already
-
- Program.Config.Application.LanguageFile = string.Empty;
- }
- else
- {
-- string strSelID = lvic[0].Tag as string;
-+ string strSelID = (lvic[0].Tag as string);
- if(strSelID == Program.Config.Application.LanguageFile) return;
-
- Program.Config.Application.LanguageFile = strSelID;
-diff --git a/KeePass/Program.cs b/KeePass/Program.cs
-index c8e9ef4..9cd0417 100644
---- a/KeePass/Program.cs
-+++ b/KeePass/Program.cs
-@@ -225,28 +225,7 @@ namespace KeePass
- string strHelpFile = UrlUtil.StripExtension(WinUtil.GetExecutable()) + ".chm";
- AppHelp.LocalHelpFile = strHelpFile;
-
-- string strLangFile = m_appConfig.Application.LanguageFile;
-- if((strLangFile != null) && (strLangFile.Length > 0))
-- {
-- strLangFile = UrlUtil.GetFileDirectory(WinUtil.GetExecutable(), true,
-- false) + strLangFile;
--
-- try
-- {
-- m_kpTranslation = KPTranslation.LoadFromFile(strLangFile);
--
-- KPRes.SetTranslatedStrings(
-- m_kpTranslation.SafeGetStringTableDictionary(
-- "KeePass.Resources.KPRes"));
-- KLRes.SetTranslatedStrings(
-- m_kpTranslation.SafeGetStringTableDictionary(
-- "KeePassLib.Resources.KLRes"));
--
-- StrUtil.RightToLeft = m_kpTranslation.Properties.RightToLeft;
-- }
-- catch(FileNotFoundException) { } // Ignore
-- catch(Exception) { Debug.Assert(false); }
-- }
-+ LoadTranslation();
-
- if(m_appConfig.Application.Start.PluginCacheClearOnce)
- {
-@@ -574,5 +553,42 @@ namespace KeePass
-
- MainCleanUp();
- }
-+
-+ private static void LoadTranslation()
-+ {
-+ string strLangFile = m_appConfig.Application.LanguageFile;
-+ if((strLangFile != null) && (strLangFile.Length > 0))
-+ {
-+ string[] vLangDirs = new string[]{
-+ AppConfigSerializer.AppDataDirectory,
-+ AppConfigSerializer.LocalAppDataDirectory,
-+ UrlUtil.GetFileDirectory(WinUtil.GetExecutable(), false, false)
-+ };
-+
-+ foreach(string strLangDir in vLangDirs)
-+ {
-+ string strLangPath = UrlUtil.EnsureTerminatingSeparator(
-+ strLangDir, false) + strLangFile;
-+
-+ try
-+ {
-+ m_kpTranslation = KPTranslation.LoadFromFile(strLangPath);
-+
-+ KPRes.SetTranslatedStrings(
-+ m_kpTranslation.SafeGetStringTableDictionary(
-+ "KeePass.Resources.KPRes"));
-+ KLRes.SetTranslatedStrings(
-+ m_kpTranslation.SafeGetStringTableDictionary(
-+ "KeePassLib.Resources.KLRes"));
-+
-+ StrUtil.RightToLeft = m_kpTranslation.Properties.RightToLeft;
-+ break;
-+ }
-+ catch(DirectoryNotFoundException) { } // Ignore
-+ catch(FileNotFoundException) { } // Ignore
-+ catch(Exception) { Debug.Assert(false); }
-+ }
-+ }
-+ }
- }
- }
---
diff --git a/debian/patches/07_fix-quicksearch-losing-results-on-defocus.patch b/debian/patches/07_fix-quicksearch-losing-results-on-defocus.patch
deleted file mode 100644
index 50484b9..0000000
--- a/debian/patches/07_fix-quicksearch-losing-results-on-defocus.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Mon, 18 Apr 2011 19:44:53 +0200
-Subject: fix quicksearch losing results on defocus
-
-Applied-Upstream: 2.16
----
- KeePass/Forms/MainForm.cs | 10 ++++------
- 1 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index 441f06a..ee82a9f 100644
---- a/KeePass/Forms/MainForm.cs
-+++ b/KeePass/Forms/MainForm.cs
-@@ -999,6 +999,7 @@ namespace KeePass.Forms
- private void OnQuickFindSelectedIndexChanged(object sender, EventArgs e)
- {
- if(m_bBlockQuickFind) return;
-+ m_bBlockQuickFind = true;
-
- string strSearch = m_tbQuickFind.Text; // Text, not selected index!
- string strGroupName = KPRes.SearchGroupName + " (\"" + strSearch + "\" ";
-@@ -1031,12 +1032,9 @@ namespace KeePass.Forms
-
- m_tbQuickFind.Items.Insert(0, strSearch);
-
-- if(bDoSetText)
-- {
-- m_bBlockQuickFind = true;
-- m_tbQuickFind.Text = strSearch;
-- m_bBlockQuickFind = false;
-- }
-+ if(bDoSetText) m_tbQuickFind.Text = strSearch;
-+
-+ m_bBlockQuickFind = false;
- }
-
- private void OnQuickFindKeyDown(object sender, KeyEventArgs e)
---
diff --git a/debian/patches/08_work-around-quicksearch-crash.patch b/debian/patches/08_work-around-quicksearch-crash.patch
deleted file mode 100644
index b1bbe7c..0000000
--- a/debian/patches/08_work-around-quicksearch-crash.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Tue, 19 Apr 2011 19:44:11 +0200
-Subject: work around quicksearch crash
-
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3286048&group_id=95013&atid=609908
-Applied-Upstream: 2.16
----
- KeePass/Forms/MainForm.cs | 8 +++-----
- KeePass/Forms/MainForm_Functions.cs | 10 +++++++++-
- 2 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index ee82a9f..e0e1bcb 100644
---- a/KeePass/Forms/MainForm.cs
-+++ b/KeePass/Forms/MainForm.cs
-@@ -1021,18 +1021,16 @@ namespace KeePass.Forms
- }
-
- // Update the history items in the combobox
-- bool bDoSetText = false;
- if(nExistsAlready >= 0)
-- {
- m_tbQuickFind.Items.RemoveAt(nExistsAlready);
-- bDoSetText = true;
-- }
- else if(m_tbQuickFind.Items.Count >= 8)
- m_tbQuickFind.Items.RemoveAt(m_tbQuickFind.Items.Count - 1);
-
- m_tbQuickFind.Items.Insert(0, strSearch);
-
-- if(bDoSetText) m_tbQuickFind.Text = strSearch;
-+ // if(bDoSetText) m_tbQuickFind.Text = strSearch;
-+ m_tbQuickFind.SelectedIndex = 0;
-+ m_tbQuickFind.Select(0, strSearch.Length);
-
- m_bBlockQuickFind = false;
- }
-diff --git a/KeePass/Forms/MainForm_Functions.cs b/KeePass/Forms/MainForm_Functions.cs
-index 708f815..8f21a4f 100644
---- a/KeePass/Forms/MainForm_Functions.cs
-+++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -1074,7 +1074,15 @@ namespace KeePass.Forms
- }
- }
-
-- if(lviFocused != null) m_lvEntries.FocusedItem = lviFocused;
-+ if(lviFocused != null)
-+ {
-+ try { m_lvEntries.FocusedItem = lviFocused; } // .NET
-+ catch(Exception)
-+ {
-+ try { lviFocused.Focused = true; } // Mono
-+ catch(Exception) { Debug.Assert(false); }
-+ }
-+ }
-
- View view = m_lvEntries.View;
- if(m_bSimpleTanView)
---
diff --git a/debian/patches/09_do-not-strip-leading-slash-from-command-line.patch b/debian/patches/09_do-not-strip-leading-slash-from-command-line.patch
deleted file mode 100644
index 535ca14..0000000
--- a/debian/patches/09_do-not-strip-leading-slash-from-command-line.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Wed, 20 Apr 2011 20:33:40 +0200
-Subject: do not strip leading slash from command line
-
-Applied-Upstream: 2.16
----
- KeePass/Util/CommandLineArgs.cs | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/KeePass/Util/CommandLineArgs.cs b/KeePass/Util/CommandLineArgs.cs
-index a62006c..4d0ef50 100644
---- a/KeePass/Util/CommandLineArgs.cs
-+++ b/KeePass/Util/CommandLineArgs.cs
-@@ -24,6 +24,8 @@ using System.Diagnostics;
- using System.IO;
- using System.Xml.Serialization;
-
-+using KeePassLib.Native;
-+
- namespace KeePass.Util
- {
- public sealed class CommandLineArgs
-@@ -102,7 +104,8 @@ namespace KeePass.Util
-
- if(str.StartsWith("--")) str = str.Remove(0, 2);
- else if(str.StartsWith("-")) str = str.Remove(0, 1);
-- else if(str.StartsWith("/")) str = str.Remove(0, 1);
-+ else if(str.StartsWith("/") && !NativeLib.IsUnix())
-+ str = str.Remove(0, 1);
- else return new KeyValuePair<string, string>(string.Empty, str);
-
- int posDbl = str.IndexOf(':');
---
diff --git a/debian/patches/10_fix-single-instance-ipc-in-mono.patch b/debian/patches/10_fix-single-instance-ipc-in-mono.patch
deleted file mode 100644
index a304333..0000000
--- a/debian/patches/10_fix-single-instance-ipc-in-mono.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Wed, 20 Apr 2011 20:28:10 +0200
-Subject: fix single instance ipc in mono
-
-Applied-Upstream: 2.16
----
- KeePass/Program.cs | 8 ++++++--
- KeePass/Util/IpcBroadcast.cs | 2 +-
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/KeePass/Program.cs b/KeePass/Program.cs
-index 9cd0417..36f41bc 100644
---- a/KeePass/Program.cs
-+++ b/KeePass/Program.cs
-@@ -346,7 +346,7 @@ namespace KeePass
- #endif
-
- try { m_nAppMessage = NativeMethods.RegisterWindowMessage(m_strWndMsgID); }
-- catch(Exception) { Debug.Assert(false); }
-+ catch(Exception) { Debug.Assert(KeePassLib.Native.NativeLib.IsUnix()); }
-
- if(m_cmdLineArgs[AppDefs.CommandLineOptions.ExitAll] != null)
- {
-@@ -504,7 +504,11 @@ namespace KeePass
-
- private static void ActivatePreviousInstance(string[] args)
- {
-- if(m_nAppMessage == 0) { Debug.Assert(false); return; }
-+ if((m_nAppMessage == 0) && !KeePassLib.Native.NativeLib.IsUnix())
-+ {
-+ Debug.Assert(false);
-+ return;
-+ }
-
- try
- {
-diff --git a/KeePass/Util/IpcBroadcast.cs b/KeePass/Util/IpcBroadcast.cs
-index 1bc7d3a..20f0522 100644
---- a/KeePass/Util/IpcBroadcast.cs
-+++ b/KeePass/Util/IpcBroadcast.cs
-@@ -143,7 +143,7 @@ namespace KeePass.Util
- public delegate void CallPrivDelegate(int msg, int lParam);
- private void CallPriv(int msg, int lParam)
- {
-- Program.MainForm.ProcessAppMessage(new IntPtr(msg), new IntPtr(0));
-+ Program.MainForm.ProcessAppMessage(new IntPtr(msg), new IntPtr(lParam));
- }
- }
- }
---
diff --git a/debian/patches/11_disable-multiple-instance-support.patch b/debian/patches/11_disable-multiple-instance-support.patch
deleted file mode 100644
index 5c8d47d..0000000
--- a/debian/patches/11_disable-multiple-instance-support.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Wed, 20 Apr 2011 18:43:49 +0200
-Subject: disable multiple instance support
-
-ipc between them is broken
----
- KeePass/Forms/OptionsForm.cs | 4 ++--
- KeePass/Program.cs | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
-index 68ef6d4..2292e5e 100644
---- a/KeePass/Forms/OptionsForm.cs
-+++ b/KeePass/Forms/OptionsForm.cs
-@@ -388,8 +388,8 @@ namespace KeePass.Forms
- m_lvAdvanced.Groups.Add(lvg);
- m_cdxAdvanced.CreateItem(Program.Config.Application.Start, "OpenLastFile",
- m_lvAdvanced, lvg, KPRes.AutoRememberOpenLastFile);
-- m_cdxAdvanced.CreateItem(Program.Config.Integration, "LimitToSingleInstance",
-- m_lvAdvanced, lvg, KPRes.LimitSingleInstance);
-+ //m_cdxAdvanced.CreateItem(Program.Config.Integration, "LimitToSingleInstance",
-+ // m_lvAdvanced, lvg, KPRes.LimitSingleInstance);
- m_cdxAdvanced.CreateItem(Program.Config.Application.Start, "CheckForUpdate",
- m_lvAdvanced, lvg, KPRes.CheckForUpdAtStart);
- m_cdxAdvanced.CreateItem(Program.Config.Application.Start, "MinimizedAndLocked",
-diff --git a/KeePass/Program.cs b/KeePass/Program.cs
-index 36f41bc..6008908 100644
---- a/KeePass/Program.cs
-+++ b/KeePass/Program.cs
-@@ -383,7 +383,7 @@ namespace KeePass
- }
-
- Mutex mSingleLock = TrySingleInstanceLock(AppDefs.MutexName, true);
-- if((mSingleLock == null) && m_appConfig.Integration.LimitToSingleInstance)
-+ if((mSingleLock == null)) // && m_appConfig.Integration.LimitToSingleInstance)
- {
- ActivatePreviousInstance(args);
- MainCleanUp();
---
diff --git a/debian/patches/12_fix-single-instance-enforcement.patch b/debian/patches/12_fix-single-instance-enforcement.patch
deleted file mode 100644
index 16a3290..0000000
--- a/debian/patches/12_fix-single-instance-enforcement.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Thu, 21 Apr 2011 00:30:20 +0200
-Subject: fix single instance enforcement
-
-mono >= 2.6.7-5 disables interprocess communication of named mutex
-workaround checks if there is a Remoting server running already
----
- KeePass/Forms/MainForm.cs | 2 +-
- KeePass/Program.cs | 8 +++++++-
- KeePass/Util/IpcBroadcast.cs | 22 +++++++++++++++-------
- 3 files changed, 23 insertions(+), 9 deletions(-)
-
-diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index e0e1bcb..f4b27ac 100644
---- a/KeePass/Forms/MainForm.cs
-+++ b/KeePass/Forms/MainForm.cs
-@@ -310,7 +310,7 @@ namespace KeePass.Forms
- #endif
-
- m_sessionLockNotifier.Install(this.OnSessionLock);
-- IpcBroadcast.StartServer();
-+ //IpcBroadcast.StartServer();
-
- int nInitColProvCount = Program.ColumnProviderPool.Count;
-
-diff --git a/KeePass/Program.cs b/KeePass/Program.cs
-index 6008908..63743fb 100644
---- a/KeePass/Program.cs
-+++ b/KeePass/Program.cs
-@@ -382,8 +382,14 @@ namespace KeePass
- return;
- }
-
-+ bool activate_prev = false;
- Mutex mSingleLock = TrySingleInstanceLock(AppDefs.MutexName, true);
-- if((mSingleLock == null)) // && m_appConfig.Integration.LimitToSingleInstance)
-+ if (KeePassLib.Native.NativeLib.IsUnix())
-+ activate_prev = IpcBroadcast.StartServer();
-+ else
-+ activate_prev = (mSingleLock == null);
-+
-+ if((activate_prev == false)) // && m_appConfig.Integration.LimitToSingleInstance)
- {
- ActivatePreviousInstance(args);
- MainCleanUp();
-diff --git a/KeePass/Util/IpcBroadcast.cs b/KeePass/Util/IpcBroadcast.cs
-index 20f0522..f42fc72 100644
---- a/KeePass/Util/IpcBroadcast.cs
-+++ b/KeePass/Util/IpcBroadcast.cs
-@@ -98,23 +98,31 @@ namespace KeePass.Util
- return m_strPortName;
- }
-
-- public static void StartServer()
-+ public static bool StartServer()
- {
- StopServer();
-
-- if(!KeePassLib.Native.NativeLib.IsUnix()) return; // Windows
-+ if(!KeePassLib.Native.NativeLib.IsUnix()) return true; // Windows
-
- IDictionary dOpt = new Hashtable();
- dOpt["portName"] = GetPortName();
- dOpt["exclusiveAddressUse"] = false;
- dOpt["secure"] = false;
-
-- m_chServer = new IpcServerChannel(dOpt, null);
-- ChannelServices.RegisterChannel(m_chServer, false);
-+ try {
-+ m_chServer = new IpcServerChannel(dOpt, null);
-+ ChannelServices.RegisterChannel(m_chServer, false);
-
-- RemotingConfiguration.RegisterWellKnownServiceType(typeof(
-- IpcBroadcastSingleton), IpcObjectName,
-- WellKnownObjectMode.SingleCall);
-+ RemotingConfiguration.RegisterWellKnownServiceType(typeof(
-+ IpcBroadcastSingleton), IpcObjectName,
-+ WellKnownObjectMode.SingleCall);
-+ return true;
-+ }
-+ catch (System.Reflection.TargetInvocationException e) {
-+ if (e.GetBaseException() is System.InvalidOperationException)
-+ return false;
-+ throw;
-+ }
- }
-
- public static void StopServer()
---
diff --git a/debian/patches/14_fix-WebClient-for-ftp-access-under-mono.patch b/debian/patches/14_fix-WebClient-for-ftp-access-under-mono.patch
deleted file mode 100644
index 9172555..0000000
--- a/debian/patches/14_fix-WebClient-for-ftp-access-under-mono.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Tue, 3 May 2011 20:00:11 +0200
-Subject: fix WebClient for ftp access under mono
-
-skip setting CachePolicy, not implemented and ignored in mono < 2.10
-always set Credentials, required by mono
- -default username to "anonymous" when none set
-Applied-Upstream: 2.16
----
- KeePass/Util/CheckForUpdate.cs | 8 +++++++-
- KeePassLib/Serialization/IOConnection.cs | 21 +++++++++++++++++++--
- 2 files changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/KeePass/Util/CheckForUpdate.cs b/KeePass/Util/CheckForUpdate.cs
-index 9cf651e..b2a1e39 100644
---- a/KeePass/Util/CheckForUpdate.cs
-+++ b/KeePass/Util/CheckForUpdate.cs
-@@ -68,7 +68,13 @@ namespace KeePass.Util
- try
- {
- WebClient webClient = new WebClient();
-- webClient.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore);
-+
-+ // Not implemented and ignored in Mono < 2.10
-+ try
-+ {
-+ webClient.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore);
-+ }
-+ catch(NotImplementedException) { }
-
- Uri uri = new Uri(m_strVersionURL);
-
-diff --git a/KeePassLib/Serialization/IOConnection.cs b/KeePassLib/Serialization/IOConnection.cs
-index 6bdbe3c..9170175 100644
---- a/KeePassLib/Serialization/IOConnection.cs
-+++ b/KeePassLib/Serialization/IOConnection.cs
-@@ -30,6 +30,7 @@ using System.Net.Cache;
- using System.Net.Security;
- #endif
-
-+using KeePassLib.Native;
- using KeePassLib.Utility;
-
- namespace KeePassLib.Serialization
-@@ -92,10 +93,18 @@ namespace KeePassLib.Serialization
- PrepareWebAccess();
-
- IOWebClient wc = new IOWebClient();
-- wc.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore);
-+
-+ // Not implemented and ignored in Mono < 2.10
-+ try
-+ {
-+ wc.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore);
-+ }
-+ catch(NotImplementedException) { }
-
- if((ioc.UserName.Length > 0) || (ioc.Password.Length > 0))
- wc.Credentials = new NetworkCredential(ioc.UserName, ioc.Password);
-+ else if(NativeLib.IsUnix()) // Mono requires credentials
-+ wc.Credentials = new NetworkCredential("anonymous", string.Empty);
-
- return wc;
- }
-@@ -106,10 +115,18 @@ namespace KeePassLib.Serialization
-
- WebRequest req = WebRequest.Create(ioc.Path);
- ConfigureWebRequest(req);
-- req.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore);
-+
-+ // Not implemented and ignored in Mono < 2.10
-+ try
-+ {
-+ req.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore);
-+ }
-+ catch(NotImplementedException) { }
-
- if((ioc.UserName.Length > 0) || (ioc.Password.Length > 0))
- req.Credentials = new NetworkCredential(ioc.UserName, ioc.Password);
-+ else if(NativeLib.IsUnix()) // Mono requires credentials
-+ req.Credentials = new NetworkCredential("anonymous", string.Empty);
-
- return req;
- }
---
diff --git a/debian/patches/15_add-xdotool-keysym-mapping-for-square-brackets.patch b/debian/patches/15_add-xdotool-keysym-mapping-for-square-brackets.patch
deleted file mode 100644
index 1a4c693..0000000
--- a/debian/patches/15_add-xdotool-keysym-mapping-for-square-brackets.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Tue, 3 May 2011 10:21:34 +0200
-Subject: add xdotool keysym mapping for square brackets
-
-Applied-Upstream: 2.16
----
- KeePass/Util/SendInputEx.Unix.cs | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/KeePass/Util/SendInputEx.Unix.cs b/KeePass/Util/SendInputEx.Unix.cs
-index 0f14ab5..dcce975 100644
---- a/KeePass/Util/SendInputEx.Unix.cs
-+++ b/KeePass/Util/SendInputEx.Unix.cs
-@@ -79,6 +79,8 @@ namespace KeePass.Util
- m_dictXDoReplace[@")"] = "parenright";
- m_dictXDoReplace[@"{"] = "braceleft";
- m_dictXDoReplace[@"}"] = "braceright";
-+ m_dictXDoReplace[@"["] = "bracketleft";
-+ m_dictXDoReplace[@"]"] = "bracketright";
-
- foreach(string strKpKey in m_dictXDoReplace.Keys)
- {
---
diff --git a/debian/patches/16_increase-tab-size-to-avoid-crash-on-changing-tabs.patch b/debian/patches/16_increase-tab-size-to-avoid-crash-on-changing-tabs.patch
deleted file mode 100644
index 20adcca..0000000
--- a/debian/patches/16_increase-tab-size-to-avoid-crash-on-changing-tabs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Sat, 7 May 2011 19:38:50 +0200
-Subject: increase tab size to avoid crash on changing tabs
-
-Bug: http://sourceforge.net/projects/keepass/forums/forum/329221/topic/4519750
-Applied-Upstream: 2.16
-
----
- KeePass/Forms/MainForm.Designer.cs | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/KeePass/Forms/MainForm.Designer.cs b/KeePass/Forms/MainForm.Designer.cs
-index 3a868cd..139b121 100644
---- a/KeePass/Forms/MainForm.Designer.cs
-+++ b/KeePass/Forms/MainForm.Designer.cs
-@@ -1747,7 +1747,7 @@
- this.m_tabMain.Name = "m_tabMain";
- this.m_tabMain.SelectedIndex = 0;
- this.m_tabMain.ShowToolTips = true;
-- this.m_tabMain.Size = new System.Drawing.Size(654, 22);
-+ this.m_tabMain.Size = new System.Drawing.Size(654, 25);
- this.m_tabMain.TabIndex = 2;
- this.m_tabMain.MouseClick += new System.Windows.Forms.MouseEventHandler(this.OnTabMainMouseClick);
- this.m_tabMain.SelectedIndexChanged += new System.EventHandler(this.OnTabMainSelectedIndexChanged);
---
diff --git a/debian/patches/17_fix-ftp-stream-read.patch b/debian/patches/17_fix-ftp-stream-read.patch
deleted file mode 100644
index b7d5c76..0000000
--- a/debian/patches/17_fix-ftp-stream-read.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Tue, 17 May 2011 13:36:19 +0200
-Subject: fix ftp stream read
-
-mono throws NullReferenceException when reading past end of FtpDataStream
-Applied-Upstream: 2.16
----
- KeePassLib/Serialization/HashedBlockStream.cs | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/KeePassLib/Serialization/HashedBlockStream.cs b/KeePassLib/Serialization/HashedBlockStream.cs
-index 6383017..862064c 100644
---- a/KeePassLib/Serialization/HashedBlockStream.cs
-+++ b/KeePassLib/Serialization/HashedBlockStream.cs
-@@ -206,7 +206,14 @@ namespace KeePassLib.Serialization
- if((pbStoredHash == null) || (pbStoredHash.Length != 32))
- throw new InvalidDataException();
-
-- int nBufferSize = m_brInput.ReadInt32();
-+ int nBufferSize = 0;
-+ // mono throws NullReferenceException when reading past end of FtpDataStream
-+ try
-+ {
-+ nBufferSize = m_brInput.ReadInt32();
-+ }
-+ catch {}
-+
- if(nBufferSize < 0)
- throw new InvalidDataException();
-
---
diff --git a/debian/patches/18_fix-autotype-of-apostrophes.patch b/debian/patches/18_fix-autotype-of-apostrophes.patch
deleted file mode 100644
index 12bed17..0000000
--- a/debian/patches/18_fix-autotype-of-apostrophes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Sun, 8 May 2011 02:12:15 +0200
-Subject: fix autotype of apostrophes
-
-Bug: https://sourceforge.net/tracker/?func=detail&atid=609908&aid=3298808&group_id=95013
-Applied-Upstream: 2.16
----
- KeePass/Util/SendInputEx.Unix.cs | 1 +
- KeePass/Util/Spr/SprEncoding.cs | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/KeePass/Util/SendInputEx.Unix.cs b/KeePass/Util/SendInputEx.Unix.cs
-index dcce975..5690c3e 100644
---- a/KeePass/Util/SendInputEx.Unix.cs
-+++ b/KeePass/Util/SendInputEx.Unix.cs
-@@ -81,6 +81,7 @@ namespace KeePass.Util
- m_dictXDoReplace[@"}"] = "braceright";
- m_dictXDoReplace[@"["] = "bracketleft";
- m_dictXDoReplace[@"]"] = "bracketright";
-+ m_dictXDoReplace[@"'"] = "apostrophe";
-
- foreach(string strKpKey in m_dictXDoReplace.Keys)
- {
-diff --git a/KeePass/Util/Spr/SprEncoding.cs b/KeePass/Util/Spr/SprEncoding.cs
-index 9613cfe..3d1c373 100644
---- a/KeePass/Util/Spr/SprEncoding.cs
-+++ b/KeePass/Util/Spr/SprEncoding.cs
-@@ -34,6 +34,7 @@ namespace KeePass.Util.Spr
-
- str = str.Replace(@"[", @"{[}");
- str = str.Replace(@"]", @"{]}");
-+ str = str.Replace(@"'", @"{'}");
-
- str = str.Replace(@"+", @"{+}");
- str = str.Replace(@"%", @"{%}");
---
diff --git a/debian/patches/19_make-sure-whole-block-is-read-from-crypto-stream.patch b/debian/patches/19_make-sure-whole-block-is-read-from-crypto-stream.patch
deleted file mode 100644
index e085826..0000000
--- a/debian/patches/19_make-sure-whole-block-is-read-from-crypto-stream.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Sun, 19 Jun 2011 19:05:11 +0200
-Subject: make sure whole block is read from crypto stream
-
-this fixes an issue with https streams where for some reason only
-2 bytes are read, leading to an Invalid Blocksize exception in
-the FinalDecrypt() of Mono.Security.Cryptography/SymmetricTransform.cs
-due to CryptoStream.Read considering a read smaller than the InputBlockSize
-as EndOfStream
-Incomplete read probably due to the header not aligned to 16 bytes.
-
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/keepass2/+bug/798910
-Applied-Upstream: 2.16
-
----
- KeePassLib/Cryptography/HashingStreamEx.cs | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/KeePassLib/Cryptography/HashingStreamEx.cs b/KeePassLib/Cryptography/HashingStreamEx.cs
-index f5ce5f8..6700a13 100644
---- a/KeePassLib/Cryptography/HashingStreamEx.cs
-+++ b/KeePassLib/Cryptography/HashingStreamEx.cs
-@@ -136,6 +136,15 @@ namespace KeePassLib.Cryptography
-
- int nRead = m_sBaseStream.Read(pbBuffer, nOffset, nCount);
-
-+ // Mono bug workaround (LaunchPad 798910)
-+ int nPartialRead = nRead;
-+ while((nRead < nCount) && (nPartialRead != 0))
-+ {
-+ nPartialRead = m_sBaseStream.Read(pbBuffer, nOffset + nRead,
-+ nCount - nRead);
-+ nRead += nPartialRead;
-+ }
-+
- #if DEBUG
- byte[] pbOrg = new byte[pbBuffer.Length];
- Array.Copy(pbBuffer, pbOrg, pbBuffer.Length);
---
diff --git a/debian/patches/03_use_free_icon.patch b/debian/patches/do-not-use-the-non-free-icons.patch
similarity index 91%
rename from debian/patches/03_use_free_icon.patch
rename to debian/patches/do-not-use-the-non-free-icons.patch
index 48f71ea..2e26c67 100644
--- a/debian/patches/03_use_free_icon.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -1,5 +1,14 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Tue, 21 Jun 2011 19:43:31 +0200
+Subject: do not use the non-free icons
+
+Forwarded: not-needed
+---
+ KeePass/Properties/Resources.resx | 56 ++++++++++++++++++------------------
+ 1 files changed, 28 insertions(+), 28 deletions(-)
+
diff --git a/KeePass/Properties/Resources.resx b/KeePass/Properties/Resources.resx
-index 14a41ca..66d9396 100644
+index e13ee0f..cd9967b 100644
--- a/KeePass/Properties/Resources.resx
+++ b/KeePass/Properties/Resources.resx
@@ -416,43 +416,43 @@
@@ -133,13 +142,21 @@ index 14a41ca..66d9396 100644
</data>
<data name="B16x16_MenuRadio" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\B16x16_MenuRadio.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -563,6 +563,6 @@
+@@ -563,12 +563,12 @@
<value>..\Resources\Nuvola\B16x16_KaboodleLoop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_PwsPlus" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Images\B16x16_Imp_PwsPlus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
--</root>
+ <data name="B16x16_Imp_StickyPw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+- <value>..\Resources\Images\B16x16_Imp_StickyPw.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
++ <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="B16x16_Imp_KasperskyPwMgr" type="System.Resources.ResXFileRef, System.Windows.Forms">
+- <value>..\Resources\Images\B16x16_Imp_KasperskyPwMgr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
++ <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ </root>
\ No newline at end of file
-+</root>
+--
diff --git a/debian/patches/05_find_xsl.patch b/debian/patches/fix-XSL-search-path.patch
similarity index 70%
rename from debian/patches/05_find_xsl.patch
rename to debian/patches/fix-XSL-search-path.patch
index 5746ed4..4db5902 100644
--- a/debian/patches/05_find_xsl.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -1,5 +1,17 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Tue, 21 Jun 2011 19:43:31 +0200
+Subject: fix XSL search path
+
+search for XSL files in /usr/share/keepass2
+
+Forwarded: not-needed
+---
+ KeePass/App/AppDefs.cs | 2 ++
+ KeePass/Forms/AboutForm.cs | 3 +--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
diff --git a/KeePass/App/AppDefs.cs b/KeePass/App/AppDefs.cs
-index 5345a3e..a9247e8 100644
+index af4fae3..9f66f18 100644
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
@@ -12,10 +24,10 @@ index 5345a3e..a9247e8 100644
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
+index 56d8d76..2aa25ee 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
-@@ -93,8 +93,7 @@ namespace KeePass.Forms
+@@ -92,8 +92,7 @@ namespace KeePass.Forms
m_lvComponents.Items.Add(lvi);
lvi = new ListViewItem(KPRes.XslStylesheets);
@@ -25,3 +37,4 @@ index 3e0ad1d..198ec0c 100644
strPath += AppDefs.XslFilesDir;
strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);
+--
diff --git a/debian/patches/20_prefer-4.0-framework-if-available.patch b/debian/patches/prefer-4.0-framework-if-available.patch
similarity index 91%
rename from debian/patches/20_prefer-4.0-framework-if-available.patch
rename to debian/patches/prefer-4.0-framework-if-available.patch
index 2d3e577..2d49774 100644
--- a/debian/patches/20_prefer-4.0-framework-if-available.patch
+++ b/debian/patches/prefer-4.0-framework-if-available.patch
@@ -3,12 +3,13 @@ Date: Mon, 20 Jun 2011 15:20:47 +0200
Subject: prefer 4.0 framework if available
when compiled for 4.0 it will not run with 2.0
+Forwarded: not-needed
---
Ext/KeePass.exe.config | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Ext/KeePass.exe.config b/Ext/KeePass.exe.config
-index 303f865..078aca3 100644
+index ecfec22..59ed454 100644
--- a/Ext/KeePass.exe.config
+++ b/Ext/KeePass.exe.config
@@ -1,7 +1,7 @@
diff --git a/debian/patches/13-remove-ToolsVersion-3.5.patch b/debian/patches/remove-ToolsVersion-3.5.patch
similarity index 92%
rename from debian/patches/13-remove-ToolsVersion-3.5.patch
rename to debian/patches/remove-ToolsVersion-3.5.patch
index a94a9dc..a76aed5 100644
--- a/debian/patches/13-remove-ToolsVersion-3.5.patch
+++ b/debian/patches/remove-ToolsVersion-3.5.patch
@@ -3,12 +3,13 @@ Date: Mon, 25 Apr 2011 14:07:05 +0200
Subject: remove ToolsVersion="3.5"
use debians default
+Forwarded: not-needed
---
KeePass/KeePass.csproj | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index f6db9c6..d5c6103 100644
+index 5ad0023..b32ac7e 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -1,4 +1,4 @@
diff --git a/debian/patches/series b/debian/patches/series
index 69dd64a..bb52e9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,20 +1,7 @@
-01_change_signing_key.patch
-02_avoid_broken_res.patch
-03_use_free_icon.patch
-04_no_sgen.patch
-05_find_xsl.patch
-06_add-translation-search-paths.patch
-07_fix-quicksearch-losing-results-on-defocus.patch
-08_work-around-quicksearch-crash.patch
-09_do-not-strip-leading-slash-from-command-line.patch
-10_fix-single-instance-ipc-in-mono.patch
-11_disable-multiple-instance-support.patch
-12_fix-single-instance-enforcement.patch
-13-remove-ToolsVersion-3.5.patch
-14_fix-WebClient-for-ftp-access-under-mono.patch
-15_add-xdotool-keysym-mapping-for-square-brackets.patch
-16_increase-tab-size-to-avoid-crash-on-changing-tabs.patch
-17_fix-ftp-stream-read.patch
-18_fix-autotype-of-apostrophes.patch
-19_make-sure-whole-block-is-read-from-crypto-stream.patch
-20_prefer-4.0-framework-if-available.patch
+use-the-mono-signing-key.patch
+use-installed-ico-files.patch
+do-not-use-the-non-free-icons.patch
+skip-sgen-run-during-build.patch
+fix-XSL-search-path.patch
+remove-ToolsVersion-3.5.patch
+prefer-4.0-framework-if-available.patch
diff --git a/debian/patches/04_no_sgen.patch b/debian/patches/skip-sgen-run-during-build.patch
similarity index 84%
rename from debian/patches/04_no_sgen.patch
rename to debian/patches/skip-sgen-run-during-build.patch
index 66a205b..8306c54 100644
--- a/debian/patches/04_no_sgen.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -1,16 +1,17 @@
From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Date: Sun, 10 Apr 2011 15:46:08 +0200
-Subject: 04_no_sgen
+Subject: skip sgen run during build
+Forwarded: not-needed
---
KeePass/KeePass.csproj | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 6fe95b3..f6db9c6 100644
+index 68c0f5a..5ad0023 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
-@@ -1186,7 +1186,4 @@
+@@ -1202,7 +1202,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/02_avoid_broken_res.patch b/debian/patches/use-installed-ico-files.patch
similarity index 80%
rename from debian/patches/02_avoid_broken_res.patch
rename to debian/patches/use-installed-ico-files.patch
index cb91612..d4d2a51 100644
--- a/debian/patches/02_avoid_broken_res.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -1,10 +1,12 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Date: Sun, 10 Apr 2011 15:46:08 +0200
-Description: do not use ressources for *.ico files
- use installed icons instead of pulling them from the ressource.
- This avoids a UnknownImageFormat error probably caused by mono bug.
-Bugs-mono: https://bugzilla.novell.com/show_bug.cgi?id=599462
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Subject: use installed ico files
+
+use installed icons instead of pulling them from the ressource.
+This avoids a UnknownImageFormat error probably caused by mono bug.
+Bugs-mono: https://bugzilla.novell.com/show_bug.cgi?id=599462
+Forwarded: not-needed
---
KeePass/Forms/AboutForm.cs | 4 ++--
KeePass/Forms/CharPickerForm.cs | 2 +-
@@ -21,6 +23,7 @@ Author: Julian Taylor <jtaylor.debian at googlemail.com>
KeePass/Forms/EntryListForm.cs | 2 +-
KeePass/Forms/EntryReportForm.cs | 2 +-
KeePass/Forms/ExchangeDataForm.cs | 2 +-
+ KeePass/Forms/FieldRefForm.cs | 2 +-
KeePass/Forms/FileBrowserForm.cs | 2 +-
KeePass/Forms/GroupForm.cs | 2 +-
KeePass/Forms/HelpSourceForm.cs | 2 +-
@@ -37,6 +40,7 @@ Author: Julian Taylor <jtaylor.debian at googlemail.com>
KeePass/Forms/OptionsForm.cs | 2 +-
KeePass/Forms/PluginsForm.cs | 2 +-
KeePass/Forms/PrintForm.cs | 2 +-
+ KeePass/Forms/ProxyForm.cs | 2 +-
KeePass/Forms/PwEntryForm.cs | 2 +-
KeePass/Forms/PwGeneratorForm.cs | 2 +-
KeePass/Forms/SearchForm.cs | 2 +-
@@ -45,34 +49,33 @@ Author: Julian Taylor <jtaylor.debian at googlemail.com>
KeePass/Forms/TanWizardForm.cs | 2 +-
KeePass/Forms/UrlSchemeForm.cs | 2 +-
KeePass/Forms/UrlSchemesForm.cs | 2 +-
- 39 files changed, 45 insertions(+), 45 deletions(-)
+ 41 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index 3e0ad1d..da4f0a4 100644
+index cb405c7..56d8d76 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
-@@ -56,12 +56,12 @@ namespace KeePass.Forms
+@@ -56,11 +56,11 @@ namespace KeePass.Forms
string strTitle = PwDefs.ProductName;
string strDesc = KPRes.Version + " " + PwDefs.VersionString;
- Icon icoNew = new Icon(Properties.Resources.KeePass, 48, 48);
+ Icon icoNew = new Icon(new Icon("/usr/share/keepass2/KeePass.ico"), 48, 48);
- m_bannerImage.Image = BannerFactory.CreateBanner(m_bannerImage.Width,
- m_bannerImage.Height, BannerStyle.Default,
- icoNew.ToBitmap(), strTitle, strDesc);
+ BannerFactory.CreateBannerEx(this, m_bannerImage, icoNew.ToBitmap(),
+ strTitle, strDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
m_lvComponents.Columns.Add(KPRes.Components, 100, HorizontalAlignment.Left);
m_lvComponents.Columns.Add(KPRes.Version, 100, HorizontalAlignment.Left);
diff --git a/KeePass/Forms/CharPickerForm.cs b/KeePass/Forms/CharPickerForm.cs
-index 870a252..00f4fdb 100644
+index 02386c1..202e84d 100644
--- a/KeePass/Forms/CharPickerForm.cs
+++ b/KeePass/Forms/CharPickerForm.cs
@@ -105,7 +105,7 @@ namespace KeePass.Forms
- m_fontChars = new Font("Tahoma", 8.25f, FontStyle.Bold);
+ m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
@@ -80,11 +83,11 @@ index 870a252..00f4fdb 100644
m_secWord.Attach(m_tbSelected, OnSelectedTextChangedEx, true);
diff --git a/KeePass/Forms/ColumnsForm.cs b/KeePass/Forms/ColumnsForm.cs
-index 3226713..b159327 100644
+index e7ae02f..0fba326 100644
--- a/KeePass/Forms/ColumnsForm.cs
+++ b/KeePass/Forms/ColumnsForm.cs
-@@ -56,7 +56,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -55,7 +55,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_View_Detailed,
KPRes.ConfigureColumns, KPRes.ConfigureColumnsDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -93,10 +96,10 @@ index 3226713..b159327 100644
int nWidth = (m_lvColumns.ClientRectangle.Width -
diff --git a/KeePass/Forms/DataEditorForm.cs b/KeePass/Forms/DataEditorForm.cs
-index 7b2c867..38b2523 100644
+index 7a4656c..224faeb 100644
--- a/KeePass/Forms/DataEditorForm.cs
+++ b/KeePass/Forms/DataEditorForm.cs
-@@ -98,7 +98,7 @@ namespace KeePass.Forms
+@@ -92,7 +92,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -104,7 +107,7 @@ index 7b2c867..38b2523 100644
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.DoubleBuffered = true;
- m_bdc = BinaryDataClassifier.Classify(m_strDataDesc, m_pbData);
+ string strRect = Program.Config.UI.DataEditorRect;
diff --git a/KeePass/Forms/DataViewerForm.cs b/KeePass/Forms/DataViewerForm.cs
index 35995c6..6431f1c 100644
--- a/KeePass/Forms/DataViewerForm.cs
@@ -119,11 +122,11 @@ index 35995c6..6431f1c 100644
m_tslViewer.Text = KPRes.ShowIn + ":";
m_tslEncoding.Text = KPRes.Encoding + ":";
diff --git a/KeePass/Forms/DatabaseOperationsForm.cs b/KeePass/Forms/DatabaseOperationsForm.cs
-index e8dbc8b..1988645 100644
+index 6353158..96dfcf1 100644
--- a/KeePass/Forms/DatabaseOperationsForm.cs
+++ b/KeePass/Forms/DatabaseOperationsForm.cs
-@@ -62,7 +62,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -61,7 +61,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Package_Settings, KPRes.DatabaseMaintenance,
KPRes.DatabaseMaintenanceDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -132,11 +135,11 @@ index e8dbc8b..1988645 100644
m_numHistoryDays.Value = m_pwDatabase.MaintenanceHistoryDays;
diff --git a/KeePass/Forms/DatabaseSettingsForm.cs b/KeePass/Forms/DatabaseSettingsForm.cs
-index 4589b57..eb0b111 100644
+index c386771..bc1ef23 100644
--- a/KeePass/Forms/DatabaseSettingsForm.cs
+++ b/KeePass/Forms/DatabaseSettingsForm.cs
-@@ -78,7 +78,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -77,7 +77,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Ark, KPRes.DatabaseSettings,
KPRes.DatabaseSettingsDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -145,11 +148,11 @@ index 4589b57..eb0b111 100644
m_bInitializing = true;
diff --git a/KeePass/Forms/EcasTriggerForm.cs b/KeePass/Forms/EcasTriggerForm.cs
-index c42b9d1..689b78c 100644
+index d8bc8c4..8b76f82 100644
--- a/KeePass/Forms/EcasTriggerForm.cs
+++ b/KeePass/Forms/EcasTriggerForm.cs
-@@ -68,7 +68,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -67,7 +67,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Run, strTitle, strDesc);
this.Text = strTitle;
- this.Icon = Properties.Resources.KeePass;
@@ -158,10 +161,10 @@ index c42b9d1..689b78c 100644
m_lvEvents.SmallImageList = m_ilIcons;
m_lvConditions.SmallImageList = m_ilIcons;
diff --git a/KeePass/Forms/EcasTriggersForm.cs b/KeePass/Forms/EcasTriggersForm.cs
-index 3c27e5d..4e97d60 100644
+index a5222b7..e0f3b36 100644
--- a/KeePass/Forms/EcasTriggersForm.cs
+++ b/KeePass/Forms/EcasTriggersForm.cs
-@@ -83,7 +83,7 @@ namespace KeePass.Forms
+@@ -82,7 +82,7 @@ namespace KeePass.Forms
Properties.Resources.B48x48_Make_KDevelop, KPRes.Triggers,
KPRes.TriggersDesc);
this.Text = KPRes.Triggers;
@@ -171,10 +174,10 @@ index 3c27e5d..4e97d60 100644
int nWidth = (m_lvTriggers.ClientSize.Width - UIUtil.GetVScrollBarWidth() - 1);
m_lvTriggers.Columns.Add(KPRes.Triggers, nWidth);
diff --git a/KeePass/Forms/EditAutoTypeItemForm.cs b/KeePass/Forms/EditAutoTypeItemForm.cs
-index 7d4b6f9..8abd7b4 100644
+index f6f65b0..9683773 100644
--- a/KeePass/Forms/EditAutoTypeItemForm.cs
+++ b/KeePass/Forms/EditAutoTypeItemForm.cs
-@@ -119,7 +119,7 @@ namespace KeePass.Forms
+@@ -118,7 +118,7 @@ namespace KeePass.Forms
KPRes.ConfigureKeystrokeSeqDesc);
}
@@ -184,12 +187,12 @@ index 7d4b6f9..8abd7b4 100644
UIUtil.EnableAutoCompletion(m_cmbWindow, false);
diff --git a/KeePass/Forms/EditStringForm.cs b/KeePass/Forms/EditStringForm.cs
-index 1492fe0..598d0d3 100644
+index e8acc06..e76a0fa 100644
--- a/KeePass/Forms/EditStringForm.cs
+++ b/KeePass/Forms/EditStringForm.cs
-@@ -95,7 +95,7 @@ namespace KeePass.Forms
- m_bannerImage.Image = BannerFactory.CreateBanner(m_bannerImage.Width,
- m_bannerImage.Height, BannerStyle.Default,
+@@ -94,7 +94,7 @@ namespace KeePass.Forms
+
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Font, strTitle, strDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
@@ -197,11 +200,11 @@ index 1492fe0..598d0d3 100644
m_clrNormalBackground = m_cmbStringName.BackColor;
diff --git a/KeePass/Forms/EntropyForm.cs b/KeePass/Forms/EntropyForm.cs
-index 0deb64a..fd90733 100644
+index aa53f6b..33b808e 100644
--- a/KeePass/Forms/EntropyForm.cs
+++ b/KeePass/Forms/EntropyForm.cs
-@@ -72,7 +72,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -71,7 +71,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
KPRes.EntropyDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -210,10 +213,10 @@ index 0deb64a..fd90733 100644
UpdateUIState();
diff --git a/KeePass/Forms/EntryListForm.cs b/KeePass/Forms/EntryListForm.cs
-index a2a00ef..babf857 100644
+index c260656..2eed07e 100644
--- a/KeePass/Forms/EntryListForm.cs
+++ b/KeePass/Forms/EntryListForm.cs
-@@ -88,7 +88,7 @@ namespace KeePass.Forms
+@@ -87,7 +87,7 @@ namespace KeePass.Forms
m_imgIcon, m_strTitle, m_strDescShort);
m_lblText.Text = m_strDescLong;
this.Text = m_strTitle;
@@ -236,18 +239,31 @@ index 469b413..c805245 100644
if(!string.IsNullOrEmpty(m_strTitle)) this.Text = m_strTitle;
else m_strTitle = PwDefs.ShortProductName;
diff --git a/KeePass/Forms/ExchangeDataForm.cs b/KeePass/Forms/ExchangeDataForm.cs
-index eb665aa..c87d1e9 100644
+index 869abc5..dfaf4bb 100644
--- a/KeePass/Forms/ExchangeDataForm.cs
+++ b/KeePass/Forms/ExchangeDataForm.cs
@@ -98,7 +98,7 @@ namespace KeePass.Forms
Properties.Resources.B48x48_Folder_Download);
- m_bannerImage.Image = BannerFactory.CreateBanner(m_bannerImage.Width,
- m_bannerImage.Height, BannerStyle.Default, bmpBanner, strWndTitle, strWndDesc);
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
+ bmpBanner, strWndTitle, strWndDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = strWndTitle;
+diff --git a/KeePass/Forms/FieldRefForm.cs b/KeePass/Forms/FieldRefForm.cs
+index 2ce5e06..a2842fc 100644
+--- a/KeePass/Forms/FieldRefForm.cs
++++ b/KeePass/Forms/FieldRefForm.cs
+@@ -68,7 +68,7 @@ namespace KeePass.Forms
+
+ GlobalWindowManager.AddWindow(this);
+
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ UIUtil.SetExplorerTheme(m_lvEntries.Handle);
+
diff --git a/KeePass/Forms/FileBrowserForm.cs b/KeePass/Forms/FileBrowserForm.cs
index a75cf76..9b0d31c 100644
--- a/KeePass/Forms/FileBrowserForm.cs
@@ -262,11 +278,11 @@ index a75cf76..9b0d31c 100644
m_nIconDim = m_tvFolders.ItemHeight;
diff --git a/KeePass/Forms/GroupForm.cs b/KeePass/Forms/GroupForm.cs
-index 73473b0..129b155 100644
+index 969c788..1c0716a 100644
--- a/KeePass/Forms/GroupForm.cs
+++ b/KeePass/Forms/GroupForm.cs
-@@ -67,7 +67,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -66,7 +66,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Txt, KPRes.EditGroup,
KPRes.EditGroupDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -275,11 +291,11 @@ index 73473b0..129b155 100644
UIUtil.SetButtonImage(m_btnAutoTypeEdit,
Properties.Resources.B16x16_Wizard, true);
diff --git a/KeePass/Forms/HelpSourceForm.cs b/KeePass/Forms/HelpSourceForm.cs
-index f49d81a..c9c97e6 100644
+index 85265b4..2e5411e 100644
--- a/KeePass/Forms/HelpSourceForm.cs
+++ b/KeePass/Forms/HelpSourceForm.cs
-@@ -48,7 +48,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -47,7 +47,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.HelpSourceSelection,
KPRes.HelpSourceSelectionDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -288,13 +304,13 @@ index f49d81a..c9c97e6 100644
FontUtil.AssignDefaultBold(m_radioLocal);
diff --git a/KeePass/Forms/IOConnectionForm.cs b/KeePass/Forms/IOConnectionForm.cs
-index 16caca0..17e0668 100644
+index 2668a19..65d530a 100644
--- a/KeePass/Forms/IOConnectionForm.cs
+++ b/KeePass/Forms/IOConnectionForm.cs
-@@ -77,7 +77,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
- KeePass.Properties.Resources.B48x48_WWW, strTitle,
- strDesc);
+@@ -75,7 +75,7 @@ namespace KeePass.Forms
+
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
+ KeePass.Properties.Resources.B48x48_WWW, strTitle, strDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = strTitle;
@@ -327,11 +343,11 @@ index 766c60f..51e8aa9 100644
m_bBlockChangedEvent = true;
diff --git a/KeePass/Forms/ImportMethodForm.cs b/KeePass/Forms/ImportMethodForm.cs
-index 0c44925..f190bea 100644
+index 67c266a..d9916b6 100644
--- a/KeePass/Forms/ImportMethodForm.cs
+++ b/KeePass/Forms/ImportMethodForm.cs
-@@ -57,7 +57,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -56,7 +56,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.ImportBehavior,
KPRes.ImportBehaviorDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -353,11 +369,11 @@ index f8fc293..428a4cb 100644
if(m_strInitialUrl.Length > 0)
m_webBrowser.Navigate(m_strInitialUrl);
diff --git a/KeePass/Forms/KeyCreationForm.cs b/KeePass/Forms/KeyCreationForm.cs
-index 21982b9..02513c6 100644
+index d963bf1..05948b7 100644
--- a/KeePass/Forms/KeyCreationForm.cs
+++ b/KeePass/Forms/KeyCreationForm.cs
-@@ -80,7 +80,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -79,7 +79,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Sign, KPRes.CreateMasterKey,
m_ioInfo.GetDisplayName());
- this.Icon = Properties.Resources.KeePass;
@@ -366,12 +382,12 @@ index 21982b9..02513c6 100644
FontUtil.AssignDefaultBold(m_cbPassword);
diff --git a/KeePass/Forms/KeyPromptForm.cs b/KeePass/Forms/KeyPromptForm.cs
-index 160de6f..0463261 100644
+index f261e5d..e3a89a4 100644
--- a/KeePass/Forms/KeyPromptForm.cs
+++ b/KeePass/Forms/KeyPromptForm.cs
-@@ -120,7 +120,7 @@ namespace KeePass.Forms
- m_bannerImage.Image = BannerFactory.CreateBanner(m_bannerImage.Width,
- m_bannerImage.Height, BannerStyle.Default,
+@@ -115,7 +115,7 @@ namespace KeePass.Forms
+ string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Key2, strBannerTitle, strBannerDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
@@ -379,11 +395,11 @@ index 160de6f..0463261 100644
FontUtil.AssignDefaultBold(m_cbPassword);
FontUtil.AssignDefaultBold(m_cbKeyFile);
diff --git a/KeePass/Forms/LanguageForm.cs b/KeePass/Forms/LanguageForm.cs
-index ba302dc..8478a23 100644
+index 4cf052f..1d9d009 100644
--- a/KeePass/Forms/LanguageForm.cs
+++ b/KeePass/Forms/LanguageForm.cs
@@ -54,7 +54,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Keyboard_Layout,
KPRes.SelectLanguage, KPRes.SelectLanguageDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -392,10 +408,10 @@ index ba302dc..8478a23 100644
int nWidth = m_lvLanguages.ClientRectangle.Width / 4;
diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index 7e05058..441f06a 100644
+index c4cc042..3192dac 100644
--- a/KeePass/Forms/MainForm.cs
+++ b/KeePass/Forms/MainForm.cs
-@@ -118,7 +118,7 @@ namespace KeePass.Forms
+@@ -126,7 +126,7 @@ namespace KeePass.Forms
m_strNeverExpiresText = KPRes.NeverExpires;
this.Text = PwDefs.ProductName;
@@ -405,10 +421,10 @@ index 7e05058..441f06a 100644
m_imgFileSaveDisabled = Properties.Resources.B16x16_FileSave_Disabled;
// m_imgFileSaveAllEnabled = Properties.Resources.B16x16_File_SaveAll;
diff --git a/KeePass/Forms/MainForm_Functions.cs b/KeePass/Forms/MainForm_Functions.cs
-index d8c84c7..708f815 100644
+index 8756d22..813724b 100644
--- a/KeePass/Forms/MainForm_Functions.cs
+++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -374,12 +374,12 @@ namespace KeePass.Forms
+@@ -382,12 +382,12 @@ namespace KeePass.Forms
strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -423,7 +439,7 @@ index d8c84c7..708f815 100644
KPRes.Locked);
NativeMethods.EnableWindowPeekPreview(this.Handle, false);
}
-@@ -389,7 +389,7 @@ namespace KeePass.Forms
+@@ -397,7 +397,7 @@ namespace KeePass.Forms
strNtfText = strWindowText;
Icon icoDisposable, icoAssignable;
@@ -432,7 +448,7 @@ index d8c84c7..708f815 100644
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -419,7 +419,7 @@ namespace KeePass.Forms
+@@ -427,7 +427,7 @@ namespace KeePass.Forms
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -441,7 +457,7 @@ index d8c84c7..708f815 100644
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -434,7 +434,7 @@ namespace KeePass.Forms
+@@ -442,7 +442,7 @@ namespace KeePass.Forms
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
@@ -450,7 +466,7 @@ index d8c84c7..708f815 100644
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -3245,7 +3245,7 @@ namespace KeePass.Forms
+@@ -3377,7 +3377,7 @@ namespace KeePass.Forms
// wasn't fully constructed at that time yet)
if(IsFileLocked(null))
TaskbarList.SetOverlayIcon(this,
@@ -460,7 +476,7 @@ index d8c84c7..708f815 100644
if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
-index d23e3e1..68ef6d4 100644
+index c0ba1d2..ed67e7d 100644
--- a/KeePass/Forms/OptionsForm.cs
+++ b/KeePass/Forms/OptionsForm.cs
@@ -104,7 +104,7 @@ namespace KeePass.Forms
@@ -473,11 +489,11 @@ index d23e3e1..68ef6d4 100644
Debug.Assert(m_ilIcons != null);
if(m_ilIcons != null)
diff --git a/KeePass/Forms/PluginsForm.cs b/KeePass/Forms/PluginsForm.cs
-index cb2db6e..96c4d43 100644
+index 9aa6461..6d87c22 100644
--- a/KeePass/Forms/PluginsForm.cs
+++ b/KeePass/Forms/PluginsForm.cs
-@@ -65,7 +65,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -64,7 +64,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_BlockDevice, KPRes.Plugins,
KPRes.PluginsDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -486,10 +502,10 @@ index cb2db6e..96c4d43 100644
m_cbCacheDeleteOld.Checked = Program.Config.Application.Start.PluginCacheDeleteOld;
diff --git a/KeePass/Forms/PrintForm.cs b/KeePass/Forms/PrintForm.cs
-index 0f2e2a6..5d0e60c 100644
+index 9f323ea..c9864bd 100644
--- a/KeePass/Forms/PrintForm.cs
+++ b/KeePass/Forms/PrintForm.cs
-@@ -96,7 +96,7 @@ namespace KeePass.Forms
+@@ -94,7 +94,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -498,25 +514,38 @@ index 0f2e2a6..5d0e60c 100644
CreateDialogBanner();
UIUtil.SetButtonImage(m_btnConfigPrinter,
+diff --git a/KeePass/Forms/ProxyForm.cs b/KeePass/Forms/ProxyForm.cs
+index 7c65533..286d830 100644
+--- a/KeePass/Forms/ProxyForm.cs
++++ b/KeePass/Forms/ProxyForm.cs
+@@ -44,7 +44,7 @@ namespace KeePass.Forms
+ {
+ GlobalWindowManager.AddWindow(this);
+
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ ProxyServerType pst = Program.Config.Integration.ProxyType;
+ if(pst == ProxyServerType.None) m_rbNoProxy.Checked = true;
diff --git a/KeePass/Forms/PwEntryForm.cs b/KeePass/Forms/PwEntryForm.cs
-index a34d423..c8d2534 100644
+index b79f7a2..42e282a 100644
--- a/KeePass/Forms/PwEntryForm.cs
+++ b/KeePass/Forms/PwEntryForm.cs
-@@ -547,7 +547,7 @@ namespace KeePass.Forms
- BannerStyle.Default,
- KeePass.Properties.Resources.B48x48_KGPG_Sign,
- strTitle, strDesc);
+@@ -550,7 +550,7 @@ namespace KeePass.Forms
+
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
+ KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = strTitle;
UIUtil.SetButtonImage(m_btnTools,
diff --git a/KeePass/Forms/PwGeneratorForm.cs b/KeePass/Forms/PwGeneratorForm.cs
-index b69a014..5142164 100644
+index 22f0c8c..2e9043b 100644
--- a/KeePass/Forms/PwGeneratorForm.cs
+++ b/KeePass/Forms/PwGeneratorForm.cs
-@@ -91,7 +91,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
+@@ -90,7 +90,7 @@ namespace KeePass.Forms
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Gen, KPRes.PasswordOptions,
KPRes.PasswordOptionsDesc);
- this.Icon = Properties.Resources.KeePass;
@@ -525,25 +554,25 @@ index b69a014..5142164 100644
UIUtil.SetButtonImage(m_btnProfileAdd,
Properties.Resources.B16x16_FileSaveAs, false);
diff --git a/KeePass/Forms/SearchForm.cs b/KeePass/Forms/SearchForm.cs
-index ecaf06d..5c30687 100644
+index 9082a87..80130ca 100644
--- a/KeePass/Forms/SearchForm.cs
+++ b/KeePass/Forms/SearchForm.cs
-@@ -91,7 +91,7 @@ namespace KeePass.Forms
- m_bannerImage.Height, BannerStyle.Default,
- Properties.Resources.B48x48_XMag, strTitle,
- KPRes.SearchDesc);
+@@ -89,7 +89,7 @@ namespace KeePass.Forms
+
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
+ Properties.Resources.B48x48_XMag, strTitle, KPRes.SearchDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
SearchParameters sp = Program.Config.Defaults.SearchParameters;
m_cbTitle.Checked = sp.SearchInTitles;
diff --git a/KeePass/Forms/SingleLineEditForm.cs b/KeePass/Forms/SingleLineEditForm.cs
-index e0e4a95..ca4e84a 100644
+index 58b7802..68fc9a6 100644
--- a/KeePass/Forms/SingleLineEditForm.cs
+++ b/KeePass/Forms/SingleLineEditForm.cs
-@@ -74,7 +74,7 @@ namespace KeePass.Forms
- m_bannerImage.Image = BannerFactory.CreateBanner(m_bannerImage.Width,
- m_bannerImage.Height, BannerStyle.Default,
+@@ -73,7 +73,7 @@ namespace KeePass.Forms
+
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
m_imgIcon, m_strTitle, m_strDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
@@ -564,10 +593,10 @@ index 86e9e95..ebb9cc7 100644
m_pbProgress.Minimum = 0;
diff --git a/KeePass/Forms/TanWizardForm.cs b/KeePass/Forms/TanWizardForm.cs
-index 4740442..e61fef9 100644
+index 5e5f8ab..7dc89c4 100644
--- a/KeePass/Forms/TanWizardForm.cs
+++ b/KeePass/Forms/TanWizardForm.cs
-@@ -62,7 +62,7 @@ namespace KeePass.Forms
+@@ -61,7 +61,7 @@ namespace KeePass.Forms
KeePass.Properties.Resources.B48x48_Wizard, KPRes.TanWizard,
KPRes.TanWizardDesc);
diff --git a/debian/patches/01_change_signing_key.patch b/debian/patches/use-the-mono-signing-key.patch
similarity index 93%
rename from debian/patches/01_change_signing_key.patch
rename to debian/patches/use-the-mono-signing-key.patch
index 35e1380..c3c5e62 100644
--- a/debian/patches/01_change_signing_key.patch
+++ b/debian/patches/use-the-mono-signing-key.patch
@@ -1,14 +1,15 @@
From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Date: Sun, 10 Apr 2011 15:46:08 +0200
-Subject: 01_change_signing_key
+Subject: use the mono signing key
+Forwarded: not-needed
---
KeePass/KeePass.csproj | 2 +-
KeePassLib/KeePassLib.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index af89b98..6fe95b3 100644
+index cddd7d2..68c0f5a 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
--
keepass2
More information about the Pkg-cli-apps-commits
mailing list