[Pkg-cli-apps-commits] [keepass2] 02/04: New upstream release (Closes: #823686)
Julian Taylor
jtaylor.debian at googlemail.com
Wed May 11 20:31:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch master
in repository keepass2.
commit 575ddc0c69b39477ccdd832877ebeecae4ddd373
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Wed May 11 20:52:21 2016 +0200
New upstream release (Closes: #823686)
---
debian/changelog | 6 +
debian/patches/disable-autoupdate-dialog.patch | 10 +-
debian/patches/do-not-use-the-non-free-icons.patch | 19 +-
debian/patches/enable-local-help.patch | 8 +-
debian/patches/fix-XSL-search-path.patch | 16 +-
debian/patches/force_toolsversion_4 | 34 +-
debian/patches/skip-sgen-run-during-build.patch | 10 +-
debian/patches/use-installed-ico-files.patch | 390 ++++++++++-----------
debian/patches/use-the-mono-signing-key.patch | 16 +-
9 files changed, 257 insertions(+), 252 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aff49cc..5e1217c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+keepass2 (2.33+dfsg-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #823686)
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Wed, 11 May 2016 20:50:56 +0200
+
keepass2 (2.32+dfsg-1) unstable; urgency=medium
* New upstream release (Closes: #817781)
diff --git a/debian/patches/disable-autoupdate-dialog.patch b/debian/patches/disable-autoupdate-dialog.patch
index 24dfaa7..7d958a1 100644
--- a/debian/patches/disable-autoupdate-dialog.patch
+++ b/debian/patches/disable-autoupdate-dialog.patch
@@ -8,11 +8,11 @@ Forwarded: not-needed
KeePass/App/Configuration/AceApplication.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/KeePass/App/Configuration/AceApplication.cs b/KeePass/App/Configuration/AceApplication.cs
-index e3e7841..0220620 100644
---- a/KeePass/App/Configuration/AceApplication.cs
-+++ b/KeePass/App/Configuration/AceApplication.cs
-@@ -301,8 +301,8 @@ namespace KeePass.App.Configuration
+Index: keepass2/KeePass/App/Configuration/AceApplication.cs
+===================================================================
+--- keepass2.orig/KeePass/App/Configuration/AceApplication.cs
++++ keepass2/KeePass/App/Configuration/AceApplication.cs
+@@ -309,8 +309,8 @@ namespace KeePass.App.Configuration
set { m_bCheckForUpdate = value; }
}
diff --git a/debian/patches/do-not-use-the-non-free-icons.patch b/debian/patches/do-not-use-the-non-free-icons.patch
index 84198a4..2f4d5ce 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -4,13 +4,13 @@ Subject: do not use the non-free icons
Forwarded: not-needed
---
- KeePass/Properties/Resources.resx | 74 +++++++++++++++++++--------------------
- 1 file changed, 37 insertions(+), 37 deletions(-)
+ KeePass/Properties/Resources.resx | 72 +++++++++++++++++++--------------------
+ 1 file changed, 36 insertions(+), 36 deletions(-)
-diff --git a/KeePass/Properties/Resources.resx b/KeePass/Properties/Resources.resx
-index 7fee6b0..2905801 100644
---- a/KeePass/Properties/Resources.resx
-+++ b/KeePass/Properties/Resources.resx
+Index: keepass2/KeePass/Properties/Resources.resx
+===================================================================
+--- keepass2.orig/KeePass/Properties/Resources.resx
++++ keepass2/KeePass/Properties/Resources.resx
@@ -404,40 +404,40 @@
<value>..\Resources\Nuvola\B48x48_Run.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -197,13 +197,12 @@ index 7fee6b0..2905801 100644
</data>
<data name="B16x16_MenuCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\B16x16_MenuCheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -629,6 +629,6 @@
+@@ -629,7 +629,7 @@
<value>..\Resources\Nuvola_Derived\B16x16_Folder_New_Ex.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_NPassword" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Images\B16x16_Imp_NPassword.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>
+ <data name="B16x16_Folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Nuvola\B16x16_Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
index e81e75c..7d5f604 100644
--- a/debian/patches/enable-local-help.patch
+++ b/debian/patches/enable-local-help.patch
@@ -9,10 +9,10 @@ Forwarded: not-needed
KeePass/App/AppHelp.cs | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
-diff --git a/KeePass/App/AppHelp.cs b/KeePass/App/AppHelp.cs
-index fd99e25..02e41f8 100644
---- a/KeePass/App/AppHelp.cs
-+++ b/KeePass/App/AppHelp.cs
+Index: keepass2/KeePass/App/AppHelp.cs
+===================================================================
+--- keepass2.orig/KeePass/App/AppHelp.cs
++++ keepass2/KeePass/App/AppHelp.cs
@@ -58,7 +58,7 @@ namespace KeePass.App
{
if(m_strLocalHelpFile == null) return false;
diff --git a/debian/patches/fix-XSL-search-path.patch b/debian/patches/fix-XSL-search-path.patch
index 7dc446d..8fb0158 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -10,10 +10,10 @@ Forwarded: not-needed
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 f309b25..e3925d0 100644
---- a/KeePass/App/AppDefs.cs
-+++ b/KeePass/App/AppDefs.cs
+Index: keepass2/KeePass/App/AppDefs.cs
+===================================================================
+--- keepass2.orig/KeePass/App/AppDefs.cs
++++ keepass2/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);
@@ -23,10 +23,10 @@ index f309b25..e3925d0 100644
public const string XslFilesDir = "XSL";
public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";
public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
-diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index 57c0a4d..4646221 100644
---- a/KeePass/Forms/AboutForm.cs
-+++ b/KeePass/Forms/AboutForm.cs
+Index: keepass2/KeePass/Forms/AboutForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/AboutForm.cs
++++ keepass2/KeePass/Forms/AboutForm.cs
@@ -86,8 +86,7 @@ namespace KeePass.Forms
m_lvComponents.Items.Add(lvi);
diff --git a/debian/patches/force_toolsversion_4 b/debian/patches/force_toolsversion_4
index 02bc1fa..4107ba1 100644
--- a/debian/patches/force_toolsversion_4
+++ b/debian/patches/force_toolsversion_4
@@ -10,37 +10,37 @@ Subject: force_toolsversion_4
Translation/TrlUtil/TrlUtil.csproj | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
-diff --git a/KeePass.sln b/KeePass.sln
-index b955428..ca4da98 100644
---- a/KeePass.sln
-+++ b/KeePass.sln
+Index: keepass2/KeePass.sln
+===================================================================
+--- keepass2.orig/KeePass.sln
++++ keepass2/KeePass.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
+Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
EndProject
-diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index a91521c..3af4735 100644
---- a/KeePass/KeePass.csproj
-+++ b/KeePass/KeePass.csproj
+Index: keepass2/KeePass/KeePass.csproj
+===================================================================
+--- keepass2.orig/KeePass/KeePass.csproj
++++ keepass2/KeePass/KeePass.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -1334,4 +1334,4 @@
+@@ -1335,4 +1335,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file
+</Project>
-diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
-index 9f6151a..ffc2814 100644
---- a/KeePassLib/KeePassLib.csproj
-+++ b/KeePassLib/KeePassLib.csproj
+Index: keepass2/KeePassLib/KeePassLib.csproj
+===================================================================
+--- keepass2.orig/KeePassLib/KeePassLib.csproj
++++ keepass2/KeePassLib/KeePassLib.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
@@ -54,10 +54,10 @@ index 9f6151a..ffc2814 100644
-</Project>
\ No newline at end of file
+</Project>
-diff --git a/Translation/TrlUtil/TrlUtil.csproj b/Translation/TrlUtil/TrlUtil.csproj
-index 6e20b80..0198f1d 100644
---- a/Translation/TrlUtil/TrlUtil.csproj
-+++ b/Translation/TrlUtil/TrlUtil.csproj
+Index: keepass2/Translation/TrlUtil/TrlUtil.csproj
+===================================================================
+--- keepass2.orig/Translation/TrlUtil/TrlUtil.csproj
++++ keepass2/Translation/TrlUtil/TrlUtil.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 0746301..74a4a6a 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -7,11 +7,11 @@ Forwarded: not-needed
KeePass/KeePass.csproj | 3 ---
1 file changed, 3 deletions(-)
-diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index cab8d44..a91521c 100644
---- a/KeePass/KeePass.csproj
-+++ b/KeePass/KeePass.csproj
-@@ -1334,7 +1334,4 @@
+Index: keepass2/KeePass/KeePass.csproj
+===================================================================
+--- keepass2.orig/KeePass/KeePass.csproj
++++ keepass2/KeePass/KeePass.csproj
+@@ -1335,7 +1335,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index f06c0ce..2d6d01a 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -58,10 +58,10 @@ Forwarded: not-needed
KeePass/Forms/XmlReplaceForm.cs | 2 +-
48 files changed, 56 insertions(+), 56 deletions(-)
-diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index ac0f166..57c0a4d 100644
---- a/KeePass/Forms/AboutForm.cs
-+++ b/KeePass/Forms/AboutForm.cs
+Index: keepass2/KeePass/Forms/AboutForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/AboutForm.cs
++++ keepass2/KeePass/Forms/AboutForm.cs
@@ -57,11 +57,11 @@ namespace KeePass.Forms
string strDesc = KPRes.Version + " " + PwDefs.VersionString;
if(Program.IsDevelopmentSnapshot()) strDesc += " (Dev)";
@@ -76,10 +76,10 @@ index ac0f166..57c0a4d 100644
m_lvComponents.Columns.Add(KPRes.Component, 100, HorizontalAlignment.Left);
m_lvComponents.Columns.Add(KPRes.Status + " / " + KPRes.Version, 100,
-diff --git a/KeePass/Forms/AutoTypeCtxForm.cs b/KeePass/Forms/AutoTypeCtxForm.cs
-index 27e83c8..fc447d3 100644
---- a/KeePass/Forms/AutoTypeCtxForm.cs
-+++ b/KeePass/Forms/AutoTypeCtxForm.cs
+Index: keepass2/KeePass/Forms/AutoTypeCtxForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/AutoTypeCtxForm.cs
++++ keepass2/KeePass/Forms/AutoTypeCtxForm.cs
@@ -76,7 +76,7 @@ namespace KeePass.Forms
m_lblText.Text = KPRes.AutoTypeEntrySelectionDescLong2;
@@ -89,10 +89,10 @@ index 27e83c8..fc447d3 100644
string strRect = Program.Config.UI.AutoTypeCtxRect;
if(strRect.Length > 0) UIUtil.SetWindowScreenRect(this, strRect);
-diff --git a/KeePass/Forms/CharPickerForm.cs b/KeePass/Forms/CharPickerForm.cs
-index 27b464e..522fec4 100644
---- a/KeePass/Forms/CharPickerForm.cs
-+++ b/KeePass/Forms/CharPickerForm.cs
+Index: keepass2/KeePass/Forms/CharPickerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/CharPickerForm.cs
++++ keepass2/KeePass/Forms/CharPickerForm.cs
@@ -134,7 +134,7 @@ namespace KeePass.Forms
m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
@@ -102,10 +102,10 @@ index 27b464e..522fec4 100644
this.Text = KPRes.PickCharacters + " - " + PwDefs.ShortProductName;
m_secWord.Attach(m_tbSelected, OnSelectedTextChangedEx, true);
-diff --git a/KeePass/Forms/ColumnsForm.cs b/KeePass/Forms/ColumnsForm.cs
-index ea3339e..f8adb6a 100644
---- a/KeePass/Forms/ColumnsForm.cs
-+++ b/KeePass/Forms/ColumnsForm.cs
+Index: keepass2/KeePass/Forms/ColumnsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/ColumnsForm.cs
++++ keepass2/KeePass/Forms/ColumnsForm.cs
@@ -58,7 +58,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_View_Detailed,
@@ -115,10 +115,10 @@ index ea3339e..f8adb6a 100644
this.Text = KPRes.ConfigureColumns;
float fWidth = (float)(m_lvColumns.ClientRectangle.Width -
-diff --git a/KeePass/Forms/CsvImportForm.cs b/KeePass/Forms/CsvImportForm.cs
-index cd239ba..f7b6503 100644
---- a/KeePass/Forms/CsvImportForm.cs
-+++ b/KeePass/Forms/CsvImportForm.cs
+Index: keepass2/KeePass/Forms/CsvImportForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/CsvImportForm.cs
++++ keepass2/KeePass/Forms/CsvImportForm.cs
@@ -112,7 +112,7 @@ namespace KeePass.Forms
// Callable from KPScript without parent form
Debug.Assert(this.StartPosition == FormStartPosition.CenterScreen);
@@ -128,10 +128,10 @@ index cd239ba..f7b6503 100644
this.Text = KPRes.GenericCsvImporter + " - " + PwDefs.ShortProductName;
// FontUtil.AssignDefaultBold(m_grpSyntax);
-diff --git a/KeePass/Forms/DataEditorForm.cs b/KeePass/Forms/DataEditorForm.cs
-index 45959d7..c0fc6a4 100644
---- a/KeePass/Forms/DataEditorForm.cs
-+++ b/KeePass/Forms/DataEditorForm.cs
+Index: keepass2/KeePass/Forms/DataEditorForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/DataEditorForm.cs
++++ keepass2/KeePass/Forms/DataEditorForm.cs
@@ -93,7 +93,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -141,10 +141,10 @@ index 45959d7..c0fc6a4 100644
this.DoubleBuffered = true;
string strRect = Program.Config.UI.DataEditorRect;
-diff --git a/KeePass/Forms/DataViewerForm.cs b/KeePass/Forms/DataViewerForm.cs
-index 607a7e3..96678f4 100644
---- a/KeePass/Forms/DataViewerForm.cs
-+++ b/KeePass/Forms/DataViewerForm.cs
+Index: keepass2/KeePass/Forms/DataViewerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/DataViewerForm.cs
++++ keepass2/KeePass/Forms/DataViewerForm.cs
@@ -93,7 +93,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -154,10 +154,10 @@ index 607a7e3..96678f4 100644
string strTitle = PwDefs.ShortProductName + " " + KPRes.DataViewer;
if(m_strDataDesc.Length > 0)
-diff --git a/KeePass/Forms/DatabaseOperationsForm.cs b/KeePass/Forms/DatabaseOperationsForm.cs
-index efcb436..a7b9b5a 100644
---- a/KeePass/Forms/DatabaseOperationsForm.cs
-+++ b/KeePass/Forms/DatabaseOperationsForm.cs
+Index: keepass2/KeePass/Forms/DatabaseOperationsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/DatabaseOperationsForm.cs
++++ keepass2/KeePass/Forms/DatabaseOperationsForm.cs
@@ -61,7 +61,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Package_Settings, KPRes.DatabaseMaintenance,
@@ -167,10 +167,10 @@ index efcb436..a7b9b5a 100644
this.Text = KPRes.DatabaseMaintenance;
m_numHistoryDays.Value = m_pwDatabase.MaintenanceHistoryDays;
-diff --git a/KeePass/Forms/DatabaseSettingsForm.cs b/KeePass/Forms/DatabaseSettingsForm.cs
-index e1e2576..598e111 100644
---- a/KeePass/Forms/DatabaseSettingsForm.cs
-+++ b/KeePass/Forms/DatabaseSettingsForm.cs
+Index: keepass2/KeePass/Forms/DatabaseSettingsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/DatabaseSettingsForm.cs
++++ keepass2/KeePass/Forms/DatabaseSettingsForm.cs
@@ -81,7 +81,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Ark, KPRes.DatabaseSettings,
@@ -180,10 +180,10 @@ index e1e2576..598e111 100644
FontUtil.AssignDefaultItalic(m_lblHeaderCpAlgo);
FontUtil.AssignDefaultItalic(m_lblHeaderCp);
-diff --git a/KeePass/Forms/DuplicationForm.cs b/KeePass/Forms/DuplicationForm.cs
-index 9ad52ce..7abe0aa 100644
---- a/KeePass/Forms/DuplicationForm.cs
-+++ b/KeePass/Forms/DuplicationForm.cs
+Index: keepass2/KeePass/Forms/DuplicationForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/DuplicationForm.cs
++++ keepass2/KeePass/Forms/DuplicationForm.cs
@@ -100,7 +100,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -193,10 +193,10 @@ index 9ad52ce..7abe0aa 100644
FontUtil.AssignDefaultBold(m_cbAppendCopy);
FontUtil.AssignDefaultBold(m_cbFieldRefs);
-diff --git a/KeePass/Forms/EcasActionForm.cs b/KeePass/Forms/EcasActionForm.cs
-index 3a07a58..51c7d7b 100644
---- a/KeePass/Forms/EcasActionForm.cs
-+++ b/KeePass/Forms/EcasActionForm.cs
+Index: keepass2/KeePass/Forms/EcasActionForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasActionForm.cs
++++ keepass2/KeePass/Forms/EcasActionForm.cs
@@ -59,7 +59,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -206,10 +206,10 @@ index 3a07a58..51c7d7b 100644
m_lblParamHint.Text = KPRes.ParamDescHelp;
-diff --git a/KeePass/Forms/EcasConditionForm.cs b/KeePass/Forms/EcasConditionForm.cs
-index e48a767..b5aa88e 100644
---- a/KeePass/Forms/EcasConditionForm.cs
-+++ b/KeePass/Forms/EcasConditionForm.cs
+Index: keepass2/KeePass/Forms/EcasConditionForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasConditionForm.cs
++++ keepass2/KeePass/Forms/EcasConditionForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -219,10 +219,10 @@ index e48a767..b5aa88e 100644
m_lblParamHint.Text = KPRes.ParamDescHelp;
-diff --git a/KeePass/Forms/EcasEventForm.cs b/KeePass/Forms/EcasEventForm.cs
-index 8adddb5..b7b96c0 100644
---- a/KeePass/Forms/EcasEventForm.cs
-+++ b/KeePass/Forms/EcasEventForm.cs
+Index: keepass2/KeePass/Forms/EcasEventForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasEventForm.cs
++++ keepass2/KeePass/Forms/EcasEventForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -232,10 +232,10 @@ index 8adddb5..b7b96c0 100644
m_lblParamHint.Text = KPRes.ParamDescHelp;
-diff --git a/KeePass/Forms/EcasTriggerForm.cs b/KeePass/Forms/EcasTriggerForm.cs
-index cf16913..3e7106e 100644
---- a/KeePass/Forms/EcasTriggerForm.cs
-+++ b/KeePass/Forms/EcasTriggerForm.cs
+Index: keepass2/KeePass/Forms/EcasTriggerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasTriggerForm.cs
++++ keepass2/KeePass/Forms/EcasTriggerForm.cs
@@ -67,7 +67,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Run, strTitle, strDesc);
@@ -245,10 +245,10 @@ index cf16913..3e7106e 100644
m_lvEvents.SmallImageList = m_ilIcons;
m_lvConditions.SmallImageList = m_ilIcons;
-diff --git a/KeePass/Forms/EcasTriggersForm.cs b/KeePass/Forms/EcasTriggersForm.cs
-index 6733641..1d5c281 100644
---- a/KeePass/Forms/EcasTriggersForm.cs
-+++ b/KeePass/Forms/EcasTriggersForm.cs
+Index: keepass2/KeePass/Forms/EcasTriggersForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasTriggersForm.cs
++++ keepass2/KeePass/Forms/EcasTriggersForm.cs
@@ -82,7 +82,7 @@ namespace KeePass.Forms
Properties.Resources.B48x48_Make_KDevelop, KPRes.Triggers,
KPRes.TriggersDesc);
@@ -258,10 +258,10 @@ index 6733641..1d5c281 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 632488c..dc1d486 100644
---- a/KeePass/Forms/EditAutoTypeItemForm.cs
-+++ b/KeePass/Forms/EditAutoTypeItemForm.cs
+Index: keepass2/KeePass/Forms/EditAutoTypeItemForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EditAutoTypeItemForm.cs
++++ keepass2/KeePass/Forms/EditAutoTypeItemForm.cs
@@ -106,7 +106,7 @@ namespace KeePass.Forms
KPRes.ConfigureKeystrokeSeqDesc);
}
@@ -271,10 +271,10 @@ index 632488c..dc1d486 100644
// FontUtil.AssignDefaultBold(m_lblTargetWindow);
// FontUtil.AssignDefaultBold(m_rbSeqDefault);
-diff --git a/KeePass/Forms/EditStringForm.cs b/KeePass/Forms/EditStringForm.cs
-index 4cbc725..e5e249f 100644
---- a/KeePass/Forms/EditStringForm.cs
-+++ b/KeePass/Forms/EditStringForm.cs
+Index: keepass2/KeePass/Forms/EditStringForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EditStringForm.cs
++++ keepass2/KeePass/Forms/EditStringForm.cs
@@ -97,7 +97,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -284,10 +284,10 @@ index 4cbc725..e5e249f 100644
UIUtil.EnableAutoCompletion(m_cmbStringName, true);
UIUtil.PrepareStandardMultilineControl(m_richStringValue, true, true);
-diff --git a/KeePass/Forms/EntropyForm.cs b/KeePass/Forms/EntropyForm.cs
-index 279e4fa..927125b 100644
---- a/KeePass/Forms/EntropyForm.cs
-+++ b/KeePass/Forms/EntropyForm.cs
+Index: keepass2/KeePass/Forms/EntropyForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EntropyForm.cs
++++ keepass2/KeePass/Forms/EntropyForm.cs
@@ -78,7 +78,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
@@ -297,10 +297,10 @@ index 279e4fa..927125b 100644
this.Text = KPRes.EntropyTitle;
m_bmpRandom = CreateRandomBitmap(m_picRandom.ClientSize);
-diff --git a/KeePass/Forms/EntryListForm.cs b/KeePass/Forms/EntryListForm.cs
-index 8eba7d6..022dd76 100644
---- a/KeePass/Forms/EntryListForm.cs
-+++ b/KeePass/Forms/EntryListForm.cs
+Index: keepass2/KeePass/Forms/EntryListForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EntryListForm.cs
++++ keepass2/KeePass/Forms/EntryListForm.cs
@@ -87,7 +87,7 @@ namespace KeePass.Forms
m_imgIcon, m_strTitle, m_strDescShort);
m_lblText.Text = m_strDescLong;
@@ -310,10 +310,10 @@ index 8eba7d6..022dd76 100644
if(m_ilIcons != null) m_lvEntries.SmallImageList = m_ilIcons;
else m_ilIcons = new ImageList();
-diff --git a/KeePass/Forms/EntryReportForm.cs b/KeePass/Forms/EntryReportForm.cs
-index c958121..87037d8 100644
---- a/KeePass/Forms/EntryReportForm.cs
-+++ b/KeePass/Forms/EntryReportForm.cs
+Index: keepass2/KeePass/Forms/EntryReportForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EntryReportForm.cs
++++ keepass2/KeePass/Forms/EntryReportForm.cs
@@ -51,7 +51,7 @@ namespace KeePass.Forms
private void OnFormLoad(object sender, EventArgs e)
@@ -323,10 +323,10 @@ index c958121..87037d8 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 b4f0254..efbabd7 100644
---- a/KeePass/Forms/ExchangeDataForm.cs
-+++ b/KeePass/Forms/ExchangeDataForm.cs
+Index: keepass2/KeePass/Forms/ExchangeDataForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/ExchangeDataForm.cs
++++ keepass2/KeePass/Forms/ExchangeDataForm.cs
@@ -100,7 +100,7 @@ namespace KeePass.Forms
Properties.Resources.B48x48_Folder_Download);
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -336,10 +336,10 @@ index b4f0254..efbabd7 100644
this.Text = strWndTitle;
-diff --git a/KeePass/Forms/FieldRefForm.cs b/KeePass/Forms/FieldRefForm.cs
-index 6f71a27..a2830c3 100644
---- a/KeePass/Forms/FieldRefForm.cs
-+++ b/KeePass/Forms/FieldRefForm.cs
+Index: keepass2/KeePass/Forms/FieldRefForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/FieldRefForm.cs
++++ keepass2/KeePass/Forms/FieldRefForm.cs
@@ -71,7 +71,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -349,10 +349,10 @@ index 6f71a27..a2830c3 100644
UIUtil.SetExplorerTheme(m_lvEntries, true);
-diff --git a/KeePass/Forms/FileBrowserForm.cs b/KeePass/Forms/FileBrowserForm.cs
-index 2b82ea3..bdccfe6 100644
---- a/KeePass/Forms/FileBrowserForm.cs
-+++ b/KeePass/Forms/FileBrowserForm.cs
+Index: keepass2/KeePass/Forms/FileBrowserForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/FileBrowserForm.cs
++++ keepass2/KeePass/Forms/FileBrowserForm.cs
@@ -97,7 +97,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -362,10 +362,10 @@ index 2b82ea3..bdccfe6 100644
this.Text = m_strTitle;
m_nIconDim = m_tvFolders.ItemHeight;
-diff --git a/KeePass/Forms/GroupForm.cs b/KeePass/Forms/GroupForm.cs
-index 92ac1cf..172b731 100644
---- a/KeePass/Forms/GroupForm.cs
-+++ b/KeePass/Forms/GroupForm.cs
+Index: keepass2/KeePass/Forms/GroupForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/GroupForm.cs
++++ keepass2/KeePass/Forms/GroupForm.cs
@@ -78,7 +78,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Txt, strTitle,
@@ -375,10 +375,10 @@ index 92ac1cf..172b731 100644
this.Text = strTitle;
UIUtil.SetButtonImage(m_btnAutoTypeEdit,
-diff --git a/KeePass/Forms/HelpSourceForm.cs b/KeePass/Forms/HelpSourceForm.cs
-index 92051df..1302061 100644
---- a/KeePass/Forms/HelpSourceForm.cs
-+++ b/KeePass/Forms/HelpSourceForm.cs
+Index: keepass2/KeePass/Forms/HelpSourceForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/HelpSourceForm.cs
++++ keepass2/KeePass/Forms/HelpSourceForm.cs
@@ -47,7 +47,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.HelpSourceSelection,
@@ -388,10 +388,10 @@ index 92051df..1302061 100644
this.Text = KPRes.HelpSourceSelection;
FontUtil.AssignDefaultBold(m_radioLocal);
-diff --git a/KeePass/Forms/IOConnectionForm.cs b/KeePass/Forms/IOConnectionForm.cs
-index 31c15e8..7bbf053 100644
---- a/KeePass/Forms/IOConnectionForm.cs
-+++ b/KeePass/Forms/IOConnectionForm.cs
+Index: keepass2/KeePass/Forms/IOConnectionForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/IOConnectionForm.cs
++++ keepass2/KeePass/Forms/IOConnectionForm.cs
@@ -85,7 +85,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -401,10 +401,10 @@ index 31c15e8..7bbf053 100644
this.Text = strTitle;
FontUtil.AssignDefaultBold(m_lblUrl);
-diff --git a/KeePass/Forms/IconPickerForm.cs b/KeePass/Forms/IconPickerForm.cs
-index c4c9d2f..a8fcdb2 100644
---- a/KeePass/Forms/IconPickerForm.cs
-+++ b/KeePass/Forms/IconPickerForm.cs
+Index: keepass2/KeePass/Forms/IconPickerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/IconPickerForm.cs
++++ keepass2/KeePass/Forms/IconPickerForm.cs
@@ -80,7 +80,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -414,10 +414,10 @@ index c4c9d2f..a8fcdb2 100644
FontUtil.AssignDefaultBold(m_radioStandard);
FontUtil.AssignDefaultBold(m_radioCustom);
-diff --git a/KeePass/Forms/ImportMethodForm.cs b/KeePass/Forms/ImportMethodForm.cs
-index 4f1d5ee..63b1f76 100644
---- a/KeePass/Forms/ImportMethodForm.cs
-+++ b/KeePass/Forms/ImportMethodForm.cs
+Index: keepass2/KeePass/Forms/ImportMethodForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/ImportMethodForm.cs
++++ keepass2/KeePass/Forms/ImportMethodForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.ImportBehavior,
@@ -427,10 +427,10 @@ index 4f1d5ee..63b1f76 100644
this.Text = KPRes.ImportBehavior;
-diff --git a/KeePass/Forms/InternalBrowserForm.cs b/KeePass/Forms/InternalBrowserForm.cs
-index f856339..a200647 100644
---- a/KeePass/Forms/InternalBrowserForm.cs
-+++ b/KeePass/Forms/InternalBrowserForm.cs
+Index: keepass2/KeePass/Forms/InternalBrowserForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/InternalBrowserForm.cs
++++ keepass2/KeePass/Forms/InternalBrowserForm.cs
@@ -53,7 +53,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -440,10 +440,10 @@ index f856339..a200647 100644
if(m_strInitialUrl.Length > 0)
m_webBrowser.Navigate(m_strInitialUrl);
-diff --git a/KeePass/Forms/KeyCreationForm.cs b/KeePass/Forms/KeyCreationForm.cs
-index f7671a3..005e510 100644
---- a/KeePass/Forms/KeyCreationForm.cs
-+++ b/KeePass/Forms/KeyCreationForm.cs
+Index: keepass2/KeePass/Forms/KeyCreationForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/KeyCreationForm.cs
++++ keepass2/KeePass/Forms/KeyCreationForm.cs
@@ -82,7 +82,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Sign, KPRes.CreateMasterKey,
@@ -453,10 +453,10 @@ index f7671a3..005e510 100644
this.Text = KPRes.CreateMasterKey;
FontUtil.SetDefaultFont(m_cbPassword);
-diff --git a/KeePass/Forms/KeyPromptForm.cs b/KeePass/Forms/KeyPromptForm.cs
-index 96aaa23..b2a0e4f 100644
---- a/KeePass/Forms/KeyPromptForm.cs
-+++ b/KeePass/Forms/KeyPromptForm.cs
+Index: keepass2/KeePass/Forms/KeyPromptForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/KeyPromptForm.cs
++++ keepass2/KeePass/Forms/KeyPromptForm.cs
@@ -120,7 +120,7 @@ namespace KeePass.Forms
string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -466,10 +466,10 @@ index 96aaa23..b2a0e4f 100644
FontUtil.SetDefaultFont(m_cbPassword);
FontUtil.AssignDefaultBold(m_cbPassword);
-diff --git a/KeePass/Forms/LanguageForm.cs b/KeePass/Forms/LanguageForm.cs
-index c71371b..e495c57 100644
---- a/KeePass/Forms/LanguageForm.cs
-+++ b/KeePass/Forms/LanguageForm.cs
+Index: keepass2/KeePass/Forms/LanguageForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/LanguageForm.cs
++++ keepass2/KeePass/Forms/LanguageForm.cs
@@ -58,7 +58,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Keyboard_Layout,
@@ -479,10 +479,10 @@ index c71371b..e495c57 100644
this.Text = KPRes.SelectLanguage;
List<Image> lImg = new List<Image>();
-diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index 134a78b..79ba65e 100644
---- a/KeePass/Forms/MainForm.cs
-+++ b/KeePass/Forms/MainForm.cs
+Index: keepass2/KeePass/Forms/MainForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/MainForm.cs
++++ keepass2/KeePass/Forms/MainForm.cs
@@ -140,7 +140,7 @@ namespace KeePass.Forms
m_strNeverExpiresText = KPRes.NeverExpires;
@@ -492,10 +492,10 @@ index 134a78b..79ba65e 100644
m_imgFileSaveEnabled = Properties.Resources.B16x16_FileSave;
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 7018aa8..3fe4149 100644
---- a/KeePass/Forms/MainForm_Functions.cs
-+++ b/KeePass/Forms/MainForm_Functions.cs
+Index: keepass2/KeePass/Forms/MainForm_Functions.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/MainForm_Functions.cs
++++ keepass2/KeePass/Forms/MainForm_Functions.cs
@@ -435,18 +435,18 @@ namespace KeePass.Forms
strNtfText = strNtfPre + strFileDesc;
@@ -536,7 +536,7 @@ index 7018aa8..3fe4149 100644
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2727,12 +2727,12 @@ namespace KeePass.Forms
+@@ -2730,12 +2730,12 @@ namespace KeePass.Forms
}
else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
{
@@ -551,7 +551,7 @@ index 7018aa8..3fe4149 100644
return;
}
-@@ -3833,7 +3833,7 @@ namespace KeePass.Forms
+@@ -3836,7 +3836,7 @@ namespace KeePass.Forms
// wasn't fully constructed at that time yet)
// if(IsFileLocked(null))
// TaskbarList.SetOverlayIcon(this,
@@ -560,10 +560,10 @@ index 7018aa8..3fe4149 100644
}
if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
-diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
-index daac41f..4bb512c 100644
---- a/KeePass/Forms/OptionsForm.cs
-+++ b/KeePass/Forms/OptionsForm.cs
+Index: keepass2/KeePass/Forms/OptionsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/OptionsForm.cs
++++ keepass2/KeePass/Forms/OptionsForm.cs
@@ -119,7 +119,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -573,10 +573,10 @@ index daac41f..4bb512c 100644
Debug.Assert(m_ilIcons != null);
if(m_ilIcons != null)
-diff --git a/KeePass/Forms/PluginsForm.cs b/KeePass/Forms/PluginsForm.cs
-index 0f8570f..825198a 100644
---- a/KeePass/Forms/PluginsForm.cs
-+++ b/KeePass/Forms/PluginsForm.cs
+Index: keepass2/KeePass/Forms/PluginsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/PluginsForm.cs
++++ keepass2/KeePass/Forms/PluginsForm.cs
@@ -64,7 +64,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_BlockDevice, KPRes.Plugins,
@@ -586,10 +586,10 @@ index 0f8570f..825198a 100644
m_cbCacheDeleteOld.Checked = Program.Config.Application.Start.PluginCacheDeleteOld;
-diff --git a/KeePass/Forms/PrintForm.cs b/KeePass/Forms/PrintForm.cs
-index 01e6bec..2ae5f54 100644
---- a/KeePass/Forms/PrintForm.cs
-+++ b/KeePass/Forms/PrintForm.cs
+Index: keepass2/KeePass/Forms/PrintForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/PrintForm.cs
++++ keepass2/KeePass/Forms/PrintForm.cs
@@ -100,7 +100,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -599,10 +599,10 @@ index 01e6bec..2ae5f54 100644
CreateDialogBanner();
List<Image> lTabImg = new List<Image>();
-diff --git a/KeePass/Forms/ProxyForm.cs b/KeePass/Forms/ProxyForm.cs
-index 07e4750..9a1868f 100644
---- a/KeePass/Forms/ProxyForm.cs
-+++ b/KeePass/Forms/ProxyForm.cs
+Index: keepass2/KeePass/Forms/ProxyForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/ProxyForm.cs
++++ keepass2/KeePass/Forms/ProxyForm.cs
@@ -44,7 +44,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -612,11 +612,11 @@ index 07e4750..9a1868f 100644
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 ed3fafa..19fb8d9 100644
---- a/KeePass/Forms/PwEntryForm.cs
-+++ b/KeePass/Forms/PwEntryForm.cs
-@@ -652,7 +652,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/PwEntryForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/PwEntryForm.cs
++++ keepass2/KeePass/Forms/PwEntryForm.cs
+@@ -657,7 +657,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
@@ -625,10 +625,10 @@ index ed3fafa..19fb8d9 100644
this.Text = strTitle;
m_imgPwGen = UIUtil.CreateDropDownImage(Properties.Resources.B16x16_Key_New);
-diff --git a/KeePass/Forms/PwGeneratorForm.cs b/KeePass/Forms/PwGeneratorForm.cs
-index 1b365d3..b189385 100644
---- a/KeePass/Forms/PwGeneratorForm.cs
-+++ b/KeePass/Forms/PwGeneratorForm.cs
+Index: keepass2/KeePass/Forms/PwGeneratorForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/PwGeneratorForm.cs
++++ keepass2/KeePass/Forms/PwGeneratorForm.cs
@@ -98,7 +98,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Gen, KPRes.PasswordOptions,
@@ -638,10 +638,10 @@ index 1b365d3..b189385 100644
UIUtil.SetButtonImage(m_btnProfileAdd,
Properties.Resources.B16x16_FileSaveAs, false);
-diff --git a/KeePass/Forms/SearchForm.cs b/KeePass/Forms/SearchForm.cs
-index 47d490b..3ab1d47 100644
---- a/KeePass/Forms/SearchForm.cs
-+++ b/KeePass/Forms/SearchForm.cs
+Index: keepass2/KeePass/Forms/SearchForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/SearchForm.cs
++++ keepass2/KeePass/Forms/SearchForm.cs
@@ -92,7 +92,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -651,10 +651,10 @@ index 47d490b..3ab1d47 100644
m_cbDerefData.Text = m_cbDerefData.Text + " (" + KPRes.Slow + ")";
-diff --git a/KeePass/Forms/SingleLineEditForm.cs b/KeePass/Forms/SingleLineEditForm.cs
-index 54b1f9e..15f585e 100644
---- a/KeePass/Forms/SingleLineEditForm.cs
-+++ b/KeePass/Forms/SingleLineEditForm.cs
+Index: keepass2/KeePass/Forms/SingleLineEditForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/SingleLineEditForm.cs
++++ keepass2/KeePass/Forms/SingleLineEditForm.cs
@@ -73,7 +73,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -664,10 +664,10 @@ index 54b1f9e..15f585e 100644
this.Text = m_strTitle;
m_lblLongDesc.Text = m_strLongDesc;
-diff --git a/KeePass/Forms/StatusLoggerForm.cs b/KeePass/Forms/StatusLoggerForm.cs
-index 303ed62..b4832ec 100644
---- a/KeePass/Forms/StatusLoggerForm.cs
-+++ b/KeePass/Forms/StatusLoggerForm.cs
+Index: keepass2/KeePass/Forms/StatusLoggerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/StatusLoggerForm.cs
++++ keepass2/KeePass/Forms/StatusLoggerForm.cs
@@ -127,7 +127,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -677,10 +677,10 @@ index 303ed62..b4832ec 100644
this.Text = PwDefs.ShortProductName;
m_pbProgress.Minimum = 0;
-diff --git a/KeePass/Forms/TanWizardForm.cs b/KeePass/Forms/TanWizardForm.cs
-index 02ca150..a7f99ba 100644
---- a/KeePass/Forms/TanWizardForm.cs
-+++ b/KeePass/Forms/TanWizardForm.cs
+Index: keepass2/KeePass/Forms/TanWizardForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/TanWizardForm.cs
++++ keepass2/KeePass/Forms/TanWizardForm.cs
@@ -61,7 +61,7 @@ namespace KeePass.Forms
KeePass.Properties.Resources.B48x48_Wizard, KPRes.TanWizard,
KPRes.TanWizardDesc);
@@ -690,10 +690,10 @@ index 02ca150..a7f99ba 100644
this.Text = KPRes.TanWizard;
if((m_pgStorage.Name != null) && (m_pgStorage.Name.Length > 0))
-diff --git a/KeePass/Forms/UpdateCheckForm.cs b/KeePass/Forms/UpdateCheckForm.cs
-index c2a235c..62d2f71 100644
---- a/KeePass/Forms/UpdateCheckForm.cs
-+++ b/KeePass/Forms/UpdateCheckForm.cs
+Index: keepass2/KeePass/Forms/UpdateCheckForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/UpdateCheckForm.cs
++++ keepass2/KeePass/Forms/UpdateCheckForm.cs
@@ -64,7 +64,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_WWW, KPRes.UpdateCheck,
@@ -703,10 +703,10 @@ index c2a235c..62d2f71 100644
this.Text = KPRes.UpdateCheck + " - " + PwDefs.ShortProductName;
UIUtil.SetExplorerTheme(m_lvInfo, true);
-diff --git a/KeePass/Forms/UrlOverrideForm.cs b/KeePass/Forms/UrlOverrideForm.cs
-index e6b0ff2..a8087df 100644
---- a/KeePass/Forms/UrlOverrideForm.cs
-+++ b/KeePass/Forms/UrlOverrideForm.cs
+Index: keepass2/KeePass/Forms/UrlOverrideForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/UrlOverrideForm.cs
++++ keepass2/KeePass/Forms/UrlOverrideForm.cs
@@ -51,7 +51,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -716,10 +716,10 @@ index e6b0ff2..a8087df 100644
this.Text = KPRes.UrlOverride;
m_tbScheme.Text = m_ovr.Scheme;
-diff --git a/KeePass/Forms/UrlOverridesForm.cs b/KeePass/Forms/UrlOverridesForm.cs
-index 1ed5e16..2f28e8a 100644
---- a/KeePass/Forms/UrlOverridesForm.cs
-+++ b/KeePass/Forms/UrlOverridesForm.cs
+Index: keepass2/KeePass/Forms/UrlOverridesForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/UrlOverridesForm.cs
++++ keepass2/KeePass/Forms/UrlOverridesForm.cs
@@ -66,7 +66,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -729,10 +729,10 @@ index 1ed5e16..2f28e8a 100644
this.Text = KPRes.UrlOverrides;
UIUtil.SetExplorerTheme(m_lvOverrides, false);
-diff --git a/KeePass/Forms/XmlReplaceForm.cs b/KeePass/Forms/XmlReplaceForm.cs
-index d9d1d85..fe98777 100644
---- a/KeePass/Forms/XmlReplaceForm.cs
-+++ b/KeePass/Forms/XmlReplaceForm.cs
+Index: keepass2/KeePass/Forms/XmlReplaceForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/XmlReplaceForm.cs
++++ keepass2/KeePass/Forms/XmlReplaceForm.cs
@@ -62,7 +62,7 @@ namespace KeePass.Forms
KeePass.Properties.Resources.B48x48_Binary, KPRes.XmlReplace,
KPRes.XmlReplaceDesc);
diff --git a/debian/patches/use-the-mono-signing-key.patch b/debian/patches/use-the-mono-signing-key.patch
index 4796207..34ca317 100644
--- a/debian/patches/use-the-mono-signing-key.patch
+++ b/debian/patches/use-the-mono-signing-key.patch
@@ -8,10 +8,10 @@ Forwarded: not-needed
KeePassLib/KeePassLib.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 024e044..cab8d44 100644
---- a/KeePass/KeePass.csproj
-+++ b/KeePass/KeePass.csproj
+Index: keepass2/KeePass/KeePass.csproj
+===================================================================
+--- keepass2.orig/KeePass/KeePass.csproj
++++ keepass2/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
<AssemblyName>KeePass</AssemblyName>
<ApplicationIcon>KeePass.ico</ApplicationIcon>
@@ -21,10 +21,10 @@ index 024e044..cab8d44 100644
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
-diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
-index 2f7a653..9f6151a 100644
---- a/KeePassLib/KeePassLib.csproj
-+++ b/KeePassLib/KeePassLib.csproj
+Index: keepass2/KeePassLib/KeePassLib.csproj
+===================================================================
+--- keepass2.orig/KeePassLib/KeePassLib.csproj
++++ keepass2/KeePassLib/KeePassLib.csproj
@@ -10,7 +10,7 @@
<RootNamespace>KeePassLib</RootNamespace>
<AssemblyName>KeePassLib</AssemblyName>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/keepass2.git
More information about the Pkg-cli-apps-commits
mailing list