[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.16+dfsg-2-13-gc3bcb20
Julian Taylor
jtaylor.debian at googlemail.com
Thu Jan 5 23:07:43 UTC 2012
The following commit has been merged in the master branch:
commit ee57faa3d9b2d28ebc20395616d6bb3da9582405
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Thu Jan 5 23:50:35 2012 +0100
refresh patches
drop upstream applied prefer-4.0-framework-if-available.patch
add patch disable-autoupdate-dialog.patch
diff --git a/debian/patches/disable-autoupdate-dialog.patch b/debian/patches/disable-autoupdate-dialog.patch
new file mode 100644
index 0000000..f078668
--- /dev/null
+++ b/debian/patches/disable-autoupdate-dialog.patch
@@ -0,0 +1,26 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Fri, 30 Dec 2011 16:32:12 +0100
+Subject: disable autoupdate dialog
+
+does makes not much sense for the package
+Forwarded: not-needed
+---
+ KeePass/App/Configuration/AceApplication.cs | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/KeePass/App/Configuration/AceApplication.cs b/KeePass/App/Configuration/AceApplication.cs
+index 922c750..e61c025 100644
+--- a/KeePass/App/Configuration/AceApplication.cs
++++ b/KeePass/App/Configuration/AceApplication.cs
+@@ -193,8 +193,8 @@ namespace KeePass.App.Configuration
+ set { m_bCheckForUpdate = value; }
+ }
+
+- private bool m_bCheckForUpdateCfg = false;
+- [DefaultValue(false)]
++ private bool m_bCheckForUpdateCfg = true;
++ [DefaultValue(true)]
+ public bool CheckForUpdateConfigured
+ {
+ get { return m_bCheckForUpdateCfg; }
+--
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
index 4bfd15a..6ee0182 100644
--- a/debian/patches/enable-local-help.patch
+++ b/debian/patches/enable-local-help.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/KeePass/App/AppHelp.cs b/KeePass/App/AppHelp.cs
-index 335eb71..0400844 100644
+index e6c2d61..0400844 100644
--- a/KeePass/App/AppHelp.cs
+++ b/KeePass/App/AppHelp.cs
@@ -58,7 +58,7 @@ namespace KeePass.App
@@ -48,7 +48,7 @@ index 335eb71..0400844 100644
- strCmd += "\"";
-
-- try { Process.Start("hh.exe", strCmd); }
+- try { Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd); }
+ try { Process.Start("x-www-browser", strCmd); }
catch(Exception exStart)
{
diff --git a/debian/patches/fix-XSL-search-path.patch b/debian/patches/fix-XSL-search-path.patch
index e232837..9bc2ff0 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/KeePass/App/AppDefs.cs b/KeePass/App/AppDefs.cs
-index ba9ed48..ad31ec8 100644
+index 8d3a12b..6de99da 100644
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
@@ -24,7 +24,7 @@ index ba9ed48..ad31ec8 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 56d8d76..2aa25ee 100644
+index 63a72e2..2e7ff32 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
@@ -92,8 +92,7 @@ namespace KeePass.Forms
diff --git a/debian/patches/prefer-4.0-framework-if-available.patch b/debian/patches/prefer-4.0-framework-if-available.patch
deleted file mode 100644
index e697f39..0000000
--- a/debian/patches/prefer-4.0-framework-if-available.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-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 193ac9d..497d8d5 100644
---- a/Ext/KeePass.exe.config
-+++ b/Ext/KeePass.exe.config
-@@ -1,7 +1,7 @@
- <configuration>
- <startup>
-- <supportedRuntime version="v2.0.50727" />
- <supportedRuntime version="v4.0" />
-+ <supportedRuntime version="v2.0.50727" />
- </startup>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
---
diff --git a/debian/patches/remove-ToolsVersion-3.5.patch b/debian/patches/remove-ToolsVersion-3.5.patch
index feae95a..bab483d 100644
--- a/debian/patches/remove-ToolsVersion-3.5.patch
+++ b/debian/patches/remove-ToolsVersion-3.5.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 486675a..0e1cd08 100644
+index 3bcc038..73891d6 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -1,4 +1,4 @@
diff --git a/debian/patches/series b/debian/patches/series
index 715440b..8e07c9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,6 @@ 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
enable-local-help.patch
work-around-issues-with-autotype-and-keyboard-layout.patch
+disable-autoupdate-dialog.patch
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 5ecee79..c1f57dc 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -8,10 +8,10 @@ Forwarded: not-needed
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index cb7d0b4..486675a 100644
+index 7ee2266..3bcc038 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
-@@ -1227,7 +1227,4 @@
+@@ -1241,7 +1241,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index 25d8c4b..ea6cdf0 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -9,12 +9,14 @@ Bugs-mono: https://bugzilla.novell.com/show_bug.cgi?id=599462
Forwarded: not-needed
---
KeePass/Forms/AboutForm.cs | 4 ++--
+ KeePass/Forms/AutoTypeCtxForm.cs | 2 +-
KeePass/Forms/CharPickerForm.cs | 2 +-
KeePass/Forms/ColumnsForm.cs | 2 +-
KeePass/Forms/DataEditorForm.cs | 2 +-
KeePass/Forms/DataViewerForm.cs | 2 +-
KeePass/Forms/DatabaseOperationsForm.cs | 2 +-
KeePass/Forms/DatabaseSettingsForm.cs | 2 +-
+ KeePass/Forms/DuplicationForm.cs | 2 +-
KeePass/Forms/EcasTriggerForm.cs | 2 +-
KeePass/Forms/EcasTriggersForm.cs | 2 +-
KeePass/Forms/EditAutoTypeItemForm.cs | 2 +-
@@ -47,15 +49,14 @@ Forwarded: not-needed
KeePass/Forms/SingleLineEditForm.cs | 2 +-
KeePass/Forms/StatusLoggerForm.cs | 2 +-
KeePass/Forms/TanWizardForm.cs | 2 +-
+ KeePass/Forms/UpdateCheckForm.cs | 2 +-
KeePass/Forms/UrlSchemeForm.cs | 2 +-
KeePass/Forms/UrlSchemesForm.cs | 2 +-
- 41 files changed, 47 insertions(+), 47 deletions(-)
+ 44 files changed, 50 insertions(+), 50 deletions(-)
-diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index cb405c7..56d8d76 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
-@@ -56,11 +56,11 @@ namespace KeePass.Forms
+@@ -56,11 +56,11 @@
string strTitle = PwDefs.ProductName;
string strDesc = KPRes.Version + " " + PwDefs.VersionString;
@@ -67,13 +68,22 @@ index cb405c7..56d8d76 100644
- 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.Component, 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 fecd0df..e7343c3 100644
+--- a/KeePass/Forms/AutoTypeCtxForm.cs
++++ b/KeePass/Forms/AutoTypeCtxForm.cs
+@@ -70,7 +70,7 @@
+
+ m_lblText.Text = KPRes.AutoTypeEntrySelectionDescLong;
+ this.Text = KPRes.AutoTypeEntrySelection;
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ string strRect = Program.Config.UI.AutoTypeCtxRect;
+ if(strRect.Length > 0) UIUtil.SetWindowScreenRect(this, strRect);
--- a/KeePass/Forms/CharPickerForm.cs
+++ b/KeePass/Forms/CharPickerForm.cs
-@@ -106,7 +106,7 @@ namespace KeePass.Forms
+@@ -106,7 +106,7 @@
m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
@@ -82,11 +92,9 @@ index fecd0df..e7343c3 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 e7ae02f..0fba326 100644
--- a/KeePass/Forms/ColumnsForm.cs
+++ b/KeePass/Forms/ColumnsForm.cs
-@@ -55,7 +55,7 @@ namespace KeePass.Forms
+@@ -57,7 +57,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_View_Detailed,
KPRes.ConfigureColumns, KPRes.ConfigureColumnsDesc);
@@ -95,11 +103,9 @@ index e7ae02f..0fba326 100644
this.Text = KPRes.ConfigureColumns;
int nWidth = (m_lvColumns.ClientRectangle.Width -
-diff --git a/KeePass/Forms/DataEditorForm.cs b/KeePass/Forms/DataEditorForm.cs
-index 9a43427..b48ed83 100644
--- a/KeePass/Forms/DataEditorForm.cs
+++ b/KeePass/Forms/DataEditorForm.cs
-@@ -92,7 +92,7 @@ namespace KeePass.Forms
+@@ -92,7 +92,7 @@
GlobalWindowManager.AddWindow(this);
@@ -108,11 +114,9 @@ index 9a43427..b48ed83 100644
this.DoubleBuffered = true;
string strRect = Program.Config.UI.DataEditorRect;
-diff --git a/KeePass/Forms/DataViewerForm.cs b/KeePass/Forms/DataViewerForm.cs
-index 782a381..1223200 100644
--- a/KeePass/Forms/DataViewerForm.cs
+++ b/KeePass/Forms/DataViewerForm.cs
-@@ -71,7 +71,7 @@ namespace KeePass.Forms
+@@ -71,7 +71,7 @@
GlobalWindowManager.AddWindow(this);
@@ -121,11 +125,9 @@ index 782a381..1223200 100644
m_tslViewer.Text = KPRes.ShowIn + ":";
m_tslEncoding.Text = KPRes.Encoding + ":";
-diff --git a/KeePass/Forms/DatabaseOperationsForm.cs b/KeePass/Forms/DatabaseOperationsForm.cs
-index 6353158..96dfcf1 100644
--- a/KeePass/Forms/DatabaseOperationsForm.cs
+++ b/KeePass/Forms/DatabaseOperationsForm.cs
-@@ -61,7 +61,7 @@ namespace KeePass.Forms
+@@ -61,7 +61,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Package_Settings, KPRes.DatabaseMaintenance,
KPRes.DatabaseMaintenanceDesc);
@@ -134,11 +136,9 @@ index 6353158..96dfcf1 100644
this.Text = KPRes.DatabaseMaintenance;
m_numHistoryDays.Value = m_pwDatabase.MaintenanceHistoryDays;
-diff --git a/KeePass/Forms/DatabaseSettingsForm.cs b/KeePass/Forms/DatabaseSettingsForm.cs
-index c386771..bc1ef23 100644
--- a/KeePass/Forms/DatabaseSettingsForm.cs
+++ b/KeePass/Forms/DatabaseSettingsForm.cs
-@@ -77,7 +77,7 @@ namespace KeePass.Forms
+@@ -78,7 +78,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Ark, KPRes.DatabaseSettings,
KPRes.DatabaseSettingsDesc);
@@ -147,11 +147,20 @@ index c386771..bc1ef23 100644
m_bInitializing = true;
-diff --git a/KeePass/Forms/EcasTriggerForm.cs b/KeePass/Forms/EcasTriggerForm.cs
-index d8bc8c4..8b76f82 100644
+--- a/KeePass/Forms/DuplicationForm.cs
++++ b/KeePass/Forms/DuplicationForm.cs
+@@ -54,7 +54,7 @@
+ {
+ GlobalWindowManager.AddWindow(this);
+
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ FontUtil.AssignDefaultBold(m_cbAppendCopy);
+ FontUtil.AssignDefaultBold(m_cbFieldRefs);
--- a/KeePass/Forms/EcasTriggerForm.cs
+++ b/KeePass/Forms/EcasTriggerForm.cs
-@@ -67,7 +67,7 @@ namespace KeePass.Forms
+@@ -67,7 +67,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Run, strTitle, strDesc);
this.Text = strTitle;
@@ -160,11 +169,9 @@ index d8bc8c4..8b76f82 100644
m_lvEvents.SmallImageList = m_ilIcons;
m_lvConditions.SmallImageList = m_ilIcons;
-diff --git a/KeePass/Forms/EcasTriggersForm.cs b/KeePass/Forms/EcasTriggersForm.cs
-index a5222b7..e0f3b36 100644
--- a/KeePass/Forms/EcasTriggersForm.cs
+++ b/KeePass/Forms/EcasTriggersForm.cs
-@@ -82,7 +82,7 @@ namespace KeePass.Forms
+@@ -82,7 +82,7 @@
Properties.Resources.B48x48_Make_KDevelop, KPRes.Triggers,
KPRes.TriggersDesc);
this.Text = KPRes.Triggers;
@@ -173,11 +180,9 @@ index a5222b7..e0f3b36 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 4be77cb..1b7a2d5 100644
--- a/KeePass/Forms/EditAutoTypeItemForm.cs
+++ b/KeePass/Forms/EditAutoTypeItemForm.cs
-@@ -121,7 +121,7 @@ namespace KeePass.Forms
+@@ -121,7 +121,7 @@
KPRes.ConfigureKeystrokeSeqDesc);
}
@@ -186,24 +191,20 @@ index 4be77cb..1b7a2d5 100644
UIUtil.EnableAutoCompletion(m_cmbWindow, false);
-diff --git a/KeePass/Forms/EditStringForm.cs b/KeePass/Forms/EditStringForm.cs
-index 8d15620..68d3349 100644
--- a/KeePass/Forms/EditStringForm.cs
+++ b/KeePass/Forms/EditStringForm.cs
-@@ -94,7 +94,7 @@ namespace KeePass.Forms
+@@ -93,7 +93,7 @@
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");
- m_clrNormalBackground = m_cmbStringName.BackColor;
-
-diff --git a/KeePass/Forms/EntropyForm.cs b/KeePass/Forms/EntropyForm.cs
-index aa53f6b..33b808e 100644
+ UIUtil.EnableAutoCompletion(m_cmbStringName, true);
+ UIUtil.PrepareStandardMultilineControl(m_richStringValue, true, true);
--- a/KeePass/Forms/EntropyForm.cs
+++ b/KeePass/Forms/EntropyForm.cs
-@@ -71,7 +71,7 @@ namespace KeePass.Forms
+@@ -71,7 +71,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
KPRes.EntropyDesc);
@@ -212,11 +213,9 @@ index aa53f6b..33b808e 100644
this.Text = KPRes.EntropyTitle;
UpdateUIState();
-diff --git a/KeePass/Forms/EntryListForm.cs b/KeePass/Forms/EntryListForm.cs
-index c9ae55c..f3bdaf4 100644
--- a/KeePass/Forms/EntryListForm.cs
+++ b/KeePass/Forms/EntryListForm.cs
-@@ -87,7 +87,7 @@ namespace KeePass.Forms
+@@ -87,7 +87,7 @@
m_imgIcon, m_strTitle, m_strDescShort);
m_lblText.Text = m_strDescLong;
this.Text = m_strTitle;
@@ -225,11 +224,9 @@ index c9ae55c..f3bdaf4 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 469b413..c805245 100644
--- a/KeePass/Forms/EntryReportForm.cs
+++ b/KeePass/Forms/EntryReportForm.cs
-@@ -51,7 +51,7 @@ namespace KeePass.Forms
+@@ -51,7 +51,7 @@
private void OnFormLoad(object sender, EventArgs e)
{
@@ -238,11 +235,9 @@ 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 869abc5..dfaf4bb 100644
--- a/KeePass/Forms/ExchangeDataForm.cs
+++ b/KeePass/Forms/ExchangeDataForm.cs
-@@ -98,7 +98,7 @@ namespace KeePass.Forms
+@@ -98,7 +98,7 @@
Properties.Resources.B48x48_Folder_Download);
BannerFactory.CreateBannerEx(this, m_bannerImage,
bmpBanner, strWndTitle, strWndDesc);
@@ -251,11 +246,9 @@ index 869abc5..dfaf4bb 100644
this.Text = strWndTitle;
-diff --git a/KeePass/Forms/FieldRefForm.cs b/KeePass/Forms/FieldRefForm.cs
-index 2bbbe2c..d3edcbf 100644
--- a/KeePass/Forms/FieldRefForm.cs
+++ b/KeePass/Forms/FieldRefForm.cs
-@@ -68,7 +68,7 @@ namespace KeePass.Forms
+@@ -68,7 +68,7 @@
GlobalWindowManager.AddWindow(this);
@@ -263,12 +256,10 @@ index 2bbbe2c..d3edcbf 100644
+ 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
+ if(UISystemFonts.ListFont != null)
--- a/KeePass/Forms/FileBrowserForm.cs
+++ b/KeePass/Forms/FileBrowserForm.cs
-@@ -93,7 +93,7 @@ namespace KeePass.Forms
+@@ -93,7 +93,7 @@
{
GlobalWindowManager.AddWindow(this);
@@ -277,11 +268,9 @@ index a75cf76..9b0d31c 100644
this.Text = m_strTitle;
m_nIconDim = m_tvFolders.ItemHeight;
-diff --git a/KeePass/Forms/GroupForm.cs b/KeePass/Forms/GroupForm.cs
-index b3234a5..816484a 100644
--- a/KeePass/Forms/GroupForm.cs
+++ b/KeePass/Forms/GroupForm.cs
-@@ -66,7 +66,7 @@ namespace KeePass.Forms
+@@ -66,7 +66,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Txt, KPRes.EditGroup,
KPRes.EditGroupDesc);
@@ -290,11 +279,9 @@ index b3234a5..816484a 100644
UIUtil.SetButtonImage(m_btnAutoTypeEdit,
Properties.Resources.B16x16_Wizard, true);
-diff --git a/KeePass/Forms/HelpSourceForm.cs b/KeePass/Forms/HelpSourceForm.cs
-index 85265b4..2e5411e 100644
--- a/KeePass/Forms/HelpSourceForm.cs
+++ b/KeePass/Forms/HelpSourceForm.cs
-@@ -47,7 +47,7 @@ namespace KeePass.Forms
+@@ -47,7 +47,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.HelpSourceSelection,
KPRes.HelpSourceSelectionDesc);
@@ -303,11 +290,9 @@ index 85265b4..2e5411e 100644
this.Text = KPRes.HelpSourceSelection;
FontUtil.AssignDefaultBold(m_radioLocal);
-diff --git a/KeePass/Forms/IOConnectionForm.cs b/KeePass/Forms/IOConnectionForm.cs
-index 2668a19..65d530a 100644
--- a/KeePass/Forms/IOConnectionForm.cs
+++ b/KeePass/Forms/IOConnectionForm.cs
-@@ -75,7 +75,7 @@ namespace KeePass.Forms
+@@ -75,7 +75,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
KeePass.Properties.Resources.B48x48_WWW, strTitle, strDesc);
@@ -316,11 +301,9 @@ index 2668a19..65d530a 100644
this.Text = strTitle;
FontUtil.AssignDefaultBold(m_lblUrl);
-diff --git a/KeePass/Forms/IconPickerForm.cs b/KeePass/Forms/IconPickerForm.cs
-index 70bdafc..ec3596d 100644
--- a/KeePass/Forms/IconPickerForm.cs
+++ b/KeePass/Forms/IconPickerForm.cs
-@@ -79,7 +79,7 @@ namespace KeePass.Forms
+@@ -79,7 +79,7 @@
GlobalWindowManager.AddWindow(this);
@@ -329,11 +312,9 @@ index 70bdafc..ec3596d 100644
FontUtil.AssignDefaultBold(m_radioStandard);
FontUtil.AssignDefaultBold(m_radioCustom);
-diff --git a/KeePass/Forms/ImportCsvForm.cs b/KeePass/Forms/ImportCsvForm.cs
-index 766c60f..51e8aa9 100644
--- a/KeePass/Forms/ImportCsvForm.cs
+++ b/KeePass/Forms/ImportCsvForm.cs
-@@ -69,7 +69,7 @@ namespace KeePass.Forms
+@@ -69,7 +69,7 @@
GlobalWindowManager.AddWindow(this);
@@ -342,11 +323,9 @@ index 766c60f..51e8aa9 100644
m_bBlockChangedEvent = true;
-diff --git a/KeePass/Forms/ImportMethodForm.cs b/KeePass/Forms/ImportMethodForm.cs
-index 67c266a..d9916b6 100644
--- a/KeePass/Forms/ImportMethodForm.cs
+++ b/KeePass/Forms/ImportMethodForm.cs
-@@ -56,7 +56,7 @@ namespace KeePass.Forms
+@@ -56,7 +56,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.ImportBehavior,
KPRes.ImportBehaviorDesc);
@@ -355,11 +334,9 @@ index 67c266a..d9916b6 100644
this.Text = KPRes.ImportBehavior;
-diff --git a/KeePass/Forms/InternalBrowserForm.cs b/KeePass/Forms/InternalBrowserForm.cs
-index f8fc293..428a4cb 100644
--- a/KeePass/Forms/InternalBrowserForm.cs
+++ b/KeePass/Forms/InternalBrowserForm.cs
-@@ -53,7 +53,7 @@ namespace KeePass.Forms
+@@ -53,7 +53,7 @@
{
GlobalWindowManager.AddWindow(this);
@@ -368,11 +345,9 @@ 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 a272c58..8c9e12e 100644
--- a/KeePass/Forms/KeyCreationForm.cs
+++ b/KeePass/Forms/KeyCreationForm.cs
-@@ -79,7 +79,7 @@ namespace KeePass.Forms
+@@ -78,7 +78,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Sign, KPRes.CreateMasterKey,
m_ioInfo.GetDisplayName());
@@ -381,11 +356,9 @@ index a272c58..8c9e12e 100644
this.Text = KPRes.CreateMasterKey;
FontUtil.AssignDefaultBold(m_cbPassword);
-diff --git a/KeePass/Forms/KeyPromptForm.cs b/KeePass/Forms/KeyPromptForm.cs
-index ff544e9..aadf223 100644
--- a/KeePass/Forms/KeyPromptForm.cs
+++ b/KeePass/Forms/KeyPromptForm.cs
-@@ -115,7 +115,7 @@ namespace KeePass.Forms
+@@ -115,7 +115,7 @@
string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Key2, strBannerTitle, strBannerDesc);
@@ -394,11 +367,9 @@ index ff544e9..aadf223 100644
FontUtil.AssignDefaultBold(m_cbPassword);
FontUtil.AssignDefaultBold(m_cbKeyFile);
-diff --git a/KeePass/Forms/LanguageForm.cs b/KeePass/Forms/LanguageForm.cs
-index 4cf052f..1d9d009 100644
--- a/KeePass/Forms/LanguageForm.cs
+++ b/KeePass/Forms/LanguageForm.cs
-@@ -54,7 +54,7 @@ namespace KeePass.Forms
+@@ -54,7 +54,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Keyboard_Layout,
KPRes.SelectLanguage, KPRes.SelectLanguageDesc);
@@ -407,11 +378,9 @@ index 4cf052f..1d9d009 100644
this.Text = KPRes.SelectLanguage;
int nWidth = m_lvLanguages.ClientRectangle.Width / 4;
-diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index aaeedba..30ed805 100644
--- a/KeePass/Forms/MainForm.cs
+++ b/KeePass/Forms/MainForm.cs
-@@ -140,7 +140,7 @@ namespace KeePass.Forms
+@@ -140,7 +140,7 @@
m_strNeverExpiresText = KPRes.NeverExpires;
this.Text = PwDefs.ProductName;
@@ -420,11 +389,9 @@ index aaeedba..30ed805 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 aefaa25..c9684a8 100644
--- a/KeePass/Forms/MainForm_Functions.cs
+++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -402,12 +402,12 @@ namespace KeePass.Forms
+@@ -402,12 +402,12 @@
strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -439,7 +406,7 @@ index aefaa25..c9684a8 100644
KPRes.Locked);
NativeMethods.EnableWindowPeekPreview(this.Handle, false);
}
-@@ -417,7 +417,7 @@ namespace KeePass.Forms
+@@ -417,7 +417,7 @@
strNtfText = strWindowText;
Icon icoDisposable, icoAssignable;
@@ -448,7 +415,7 @@ index aefaa25..c9684a8 100644
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -447,7 +447,7 @@ namespace KeePass.Forms
+@@ -447,7 +447,7 @@
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -457,7 +424,7 @@ index aefaa25..c9684a8 100644
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -462,7 +462,7 @@ namespace KeePass.Forms
+@@ -462,7 +462,7 @@
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
@@ -466,7 +433,7 @@ index aefaa25..c9684a8 100644
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -3473,7 +3473,7 @@ namespace KeePass.Forms
+@@ -3503,7 +3503,7 @@
// wasn't fully constructed at that time yet)
// if(IsFileLocked(null))
// TaskbarList.SetOverlayIcon(this,
@@ -475,11 +442,9 @@ index aefaa25..c9684a8 100644
}
if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
-diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
-index 23bcaa4..c67cacc 100644
--- a/KeePass/Forms/OptionsForm.cs
+++ b/KeePass/Forms/OptionsForm.cs
-@@ -107,7 +107,7 @@ namespace KeePass.Forms
+@@ -107,7 +107,7 @@
GlobalWindowManager.AddWindow(this);
@@ -488,11 +453,9 @@ index 23bcaa4..c67cacc 100644
Debug.Assert(m_ilIcons != null);
if(m_ilIcons != null)
-diff --git a/KeePass/Forms/PluginsForm.cs b/KeePass/Forms/PluginsForm.cs
-index 9aa6461..6d87c22 100644
--- a/KeePass/Forms/PluginsForm.cs
+++ b/KeePass/Forms/PluginsForm.cs
-@@ -64,7 +64,7 @@ namespace KeePass.Forms
+@@ -64,7 +64,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_BlockDevice, KPRes.Plugins,
KPRes.PluginsDesc);
@@ -501,11 +464,9 @@ index 9aa6461..6d87c22 100644
m_cbCacheDeleteOld.Checked = Program.Config.Application.Start.PluginCacheDeleteOld;
-diff --git a/KeePass/Forms/PrintForm.cs b/KeePass/Forms/PrintForm.cs
-index 9012952..bcbdf1c 100644
--- a/KeePass/Forms/PrintForm.cs
+++ b/KeePass/Forms/PrintForm.cs
-@@ -95,7 +95,7 @@ namespace KeePass.Forms
+@@ -95,7 +95,7 @@
GlobalWindowManager.AddWindow(this);
@@ -514,11 +475,9 @@ index 9012952..bcbdf1c 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
+@@ -44,7 +44,7 @@
{
GlobalWindowManager.AddWindow(this);
@@ -527,11 +486,9 @@ index 7c65533..286d830 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 775f9df..63ff77c 100644
--- a/KeePass/Forms/PwEntryForm.cs
+++ b/KeePass/Forms/PwEntryForm.cs
-@@ -550,7 +550,7 @@ namespace KeePass.Forms
+@@ -550,7 +550,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
@@ -540,11 +497,9 @@ index 775f9df..63ff77c 100644
this.Text = strTitle;
UIUtil.SetButtonImage(m_btnTools,
-diff --git a/KeePass/Forms/PwGeneratorForm.cs b/KeePass/Forms/PwGeneratorForm.cs
-index 5f8f372..d3a79f4 100644
--- a/KeePass/Forms/PwGeneratorForm.cs
+++ b/KeePass/Forms/PwGeneratorForm.cs
-@@ -90,7 +90,7 @@ namespace KeePass.Forms
+@@ -90,7 +90,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Gen, KPRes.PasswordOptions,
KPRes.PasswordOptionsDesc);
@@ -553,11 +508,9 @@ index 5f8f372..d3a79f4 100644
UIUtil.SetButtonImage(m_btnProfileAdd,
Properties.Resources.B16x16_FileSaveAs, false);
-diff --git a/KeePass/Forms/SearchForm.cs b/KeePass/Forms/SearchForm.cs
-index 56f4e1f..97df3bc 100644
--- a/KeePass/Forms/SearchForm.cs
+++ b/KeePass/Forms/SearchForm.cs
-@@ -92,7 +92,7 @@ namespace KeePass.Forms
+@@ -92,7 +92,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_XMag, strTitle, KPRes.SearchDesc);
@@ -566,11 +519,9 @@ index 56f4e1f..97df3bc 100644
m_cbDerefData.Text = m_cbDerefData.Text + " (" + KPRes.Slow + ")";
-diff --git a/KeePass/Forms/SingleLineEditForm.cs b/KeePass/Forms/SingleLineEditForm.cs
-index 58b7802..68fc9a6 100644
--- a/KeePass/Forms/SingleLineEditForm.cs
+++ b/KeePass/Forms/SingleLineEditForm.cs
-@@ -73,7 +73,7 @@ namespace KeePass.Forms
+@@ -73,7 +73,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
m_imgIcon, m_strTitle, m_strDesc);
@@ -579,11 +530,9 @@ index 58b7802..68fc9a6 100644
this.Text = m_strTitle;
m_lblLongDesc.Text = m_strLongDesc;
-diff --git a/KeePass/Forms/StatusLoggerForm.cs b/KeePass/Forms/StatusLoggerForm.cs
-index 86e9e95..ebb9cc7 100644
--- a/KeePass/Forms/StatusLoggerForm.cs
+++ b/KeePass/Forms/StatusLoggerForm.cs
-@@ -124,7 +124,7 @@ namespace KeePass.Forms
+@@ -124,7 +124,7 @@
{
GlobalWindowManager.AddWindow(this);
@@ -592,11 +541,9 @@ index 86e9e95..ebb9cc7 100644
this.Text = PwDefs.ShortProductName;
m_pbProgress.Minimum = 0;
-diff --git a/KeePass/Forms/TanWizardForm.cs b/KeePass/Forms/TanWizardForm.cs
-index 5e5f8ab..7dc89c4 100644
--- a/KeePass/Forms/TanWizardForm.cs
+++ b/KeePass/Forms/TanWizardForm.cs
-@@ -61,7 +61,7 @@ namespace KeePass.Forms
+@@ -61,7 +61,7 @@
KeePass.Properties.Resources.B48x48_Wizard, KPRes.TanWizard,
KPRes.TanWizardDesc);
@@ -605,11 +552,20 @@ index 5e5f8ab..7dc89c4 100644
this.Text = KPRes.TanWizard;
if((m_pgStorage.Name != null) && (m_pgStorage.Name.Length > 0))
-diff --git a/KeePass/Forms/UrlSchemeForm.cs b/KeePass/Forms/UrlSchemeForm.cs
-index 4ff62a8..6b88f6d 100644
+--- a/KeePass/Forms/UpdateCheckForm.cs
++++ b/KeePass/Forms/UpdateCheckForm.cs
+@@ -64,7 +64,7 @@
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
+ Properties.Resources.B48x48_WWW, KPRes.UpdateCheck,
+ KPRes.UpdateCheckResults);
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+ this.Text = KPRes.UpdateCheck + " - " + PwDefs.ShortProductName;
+
+ // UIUtil.SetExplorerTheme(m_lvInfo.Handle);
--- a/KeePass/Forms/UrlSchemeForm.cs
+++ b/KeePass/Forms/UrlSchemeForm.cs
-@@ -51,7 +51,7 @@ namespace KeePass.Forms
+@@ -51,7 +51,7 @@
GlobalWindowManager.AddWindow(this);
@@ -618,11 +574,9 @@ index 4ff62a8..6b88f6d 100644
this.Text = KPRes.UrlSchemeOverride;
m_tbScheme.Text = m_ovr.Scheme;
-diff --git a/KeePass/Forms/UrlSchemesForm.cs b/KeePass/Forms/UrlSchemesForm.cs
-index d0e87ae..6934c77 100644
--- a/KeePass/Forms/UrlSchemesForm.cs
+++ b/KeePass/Forms/UrlSchemesForm.cs
-@@ -54,7 +54,7 @@ namespace KeePass.Forms
+@@ -54,7 +54,7 @@
GlobalWindowManager.AddWindow(this);
@@ -631,4 +585,3 @@ index d0e87ae..6934c77 100644
this.Text = KPRes.UrlSchemeOverrides;
UIUtil.SetExplorerTheme(m_lvOverrides.Handle);
---
diff --git a/debian/patches/use-the-mono-signing-key.patch b/debian/patches/use-the-mono-signing-key.patch
index 09433eb..d699046 100644
--- a/debian/patches/use-the-mono-signing-key.patch
+++ b/debian/patches/use-the-mono-signing-key.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 2175f7c..cb7d0b4 100644
+index 9cd0069..7ee2266 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
@@ -22,7 +22,7 @@ index 2175f7c..cb7d0b4 100644
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
-index a127a30..0a9c332 100644
+index 016e0c1..caeae4d 100644
--- a/KeePassLib/KeePassLib.csproj
+++ b/KeePassLib/KeePassLib.csproj
@@ -10,7 +10,7 @@
diff --git a/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch b/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
index 94bfa9a..77c9d82 100644
--- a/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
+++ b/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
@@ -3,7 +3,6 @@ Date: Tue, 25 Oct 2011 21:08:14 +0200
Subject: work around issues with autotype and keyboard layouts
for some reason unicode codes works better
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/keepass2/+bug/801415
---
KeePass/Util/SendInputEx.Unix.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
--
keepass2
More information about the Pkg-cli-apps-commits
mailing list