[Pkg-cli-apps-commits] [SCM] keepass2 branch, master-exp, updated. debian/2.21+dfsg-1-8-g6290d77
Julian Taylor
jtaylor.debian at googlemail.com
Sun Apr 14 13:09:43 UTC 2013
The following commit has been merged in the master-exp branch:
commit 457dd68fc1907ab706617ceb47395e7c8c295b40
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Apr 14 14:38:42 2013 +0200
refresh patches
diff --git a/debian/patches/disable-autoupdate-dialog.patch b/debian/patches/disable-autoupdate-dialog.patch
index 871b0f7..fac15c4 100644
--- a/debian/patches/disable-autoupdate-dialog.patch
+++ b/debian/patches/disable-autoupdate-dialog.patch
@@ -5,7 +5,7 @@ Subject: disable autoupdate dialog
does makes not much sense for the package
Forwarded: not-needed
---
- KeePass/App/Configuration/AceApplication.cs | 4 ++--
+ KeePass/App/Configuration/AceApplication.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/KeePass/App/Configuration/AceApplication.cs
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 b797259..955ee8a 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -4,12 +4,12 @@ Subject: do not use the non-free icons
Forwarded: not-needed
---
- KeePass/Properties/Resources.resx | 60 ++++++++++++++++++-------------------
- 1 file changed, 30 insertions(+), 30 deletions(-)
+ KeePass/Properties/Resources.resx | 62 +++++++++++++++++++--------------------
+ 1 file changed, 31 insertions(+), 31 deletions(-)
--- a/KeePass/Properties/Resources.resx
+++ b/KeePass/Properties/Resources.resx
-@@ -413,43 +413,43 @@
+@@ -413,40 +413,40 @@
<value>..\Resources\Nuvola\B48x48_Run.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_AmP" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -40,10 +40,6 @@ Forwarded: not-needed
- <value>..\Resources\Images\B16x16_Imp_PwDepot.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_PwGorilla" type="System.Resources.ResXFileRef, System.Windows.Forms">
-- <value>..\Resources\Images\B16x16_Imp_PwGorilla.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_PwSafe" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Images\B16x16_Imp_PwSafe.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>
@@ -65,7 +61,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_File_SaveAll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola_Derived\B16x16_File_SaveAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -461,22 +461,22 @@
+@@ -458,22 +458,22 @@
<value>..\Resources\Nuvola_Derived\B16x16_File_Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_PwTresor" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -93,7 +89,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_Make_KDevelop" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola\B16x16_Make_KDevelop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -485,10 +485,10 @@
+@@ -482,10 +482,10 @@
<value>..\Resources\Nuvola\B48x48_Make_KDevelop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_OnePwPro" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -106,7 +102,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_FontBold" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\B16x16_FontBold.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -524,13 +524,13 @@
+@@ -521,13 +521,13 @@
<value>..\Resources\Images\B16x16_Imp_KeePassX.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_HandySafe" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -123,7 +119,7 @@ Forwarded: not-needed
</data>
<data name="B48x48_View_Detailed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola\B48x48_View_Detailed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -545,13 +545,13 @@
+@@ -542,13 +542,13 @@
<value>..\Resources\Icons\LockOverlay.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_PwPrompter" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -140,7 +136,7 @@ Forwarded: not-needed
</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>
-@@ -560,13 +560,13 @@
+@@ -557,13 +557,13 @@
<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">
@@ -157,7 +153,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_EditCopyLink" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola_Derived\B16x16_EditCopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -575,9 +575,9 @@
+@@ -572,15 +572,15 @@
<value>..\Resources\Nuvola_Derived\B16x16_Key_New.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_DesktopKnox" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -168,5 +164,13 @@ Forwarded: not-needed
- <value>..\Resources\Images\B16x16_Imp_LastPass.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_SafeWallet" type="System.Resources.ResXFileRef, System.Windows.Forms">
+- <value>..\Resources\Images\B16x16_Imp_SafeWallet.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_TurboPws" type="System.Resources.ResXFileRef, System.Windows.Forms">
+- <value>..\Resources\Images\B16x16_Imp_TurboPws.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
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
index c1e8a37..03ff89e 100644
--- a/debian/patches/enable-local-help.patch
+++ b/debian/patches/enable-local-help.patch
@@ -6,7 +6,7 @@ disable windows chm viewer and use x-www-browser to view docs
located as html files in "/usr/share/doc/keepass2/Chm/help/"
Forwarded: not-needed
---
- KeePass/App/AppHelp.cs | 19 ++++++++-----------
+ KeePass/App/AppHelp.cs | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
--- a/KeePass/App/AppHelp.cs
diff --git a/debian/patches/fix-XSL-search-path.patch b/debian/patches/fix-XSL-search-path.patch
index f7eafcc..d75fa3d 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -6,8 +6,8 @@ search for XSL files in /usr/share/keepass2
Forwarded: not-needed
---
- KeePass/App/AppDefs.cs | 2 ++
- KeePass/Forms/AboutForm.cs | 3 +--
+ KeePass/App/AppDefs.cs | 2 ++
+ KeePass/Forms/AboutForm.cs | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
--- a/KeePass/App/AppDefs.cs
diff --git a/debian/patches/remove-ToolsVersion-3.5.patch b/debian/patches/remove-ToolsVersion-3.5.patch
index 3b058cc..52bee17 100644
--- a/debian/patches/remove-ToolsVersion-3.5.patch
+++ b/debian/patches/remove-ToolsVersion-3.5.patch
@@ -5,7 +5,7 @@ Subject: remove ToolsVersion="3.5"
use debians default
Forwarded: not-needed
---
- KeePass/KeePass.csproj | 2 +-
+ KeePass/KeePass.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/KeePass/KeePass.csproj
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 4b660a8..a211e20 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -4,12 +4,12 @@ Subject: skip sgen run during build
Forwarded: not-needed
---
- KeePass/KeePass.csproj | 3 ---
+ KeePass/KeePass.csproj | 3 ---
1 file changed, 3 deletions(-)
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
-@@ -1253,7 +1253,4 @@
+@@ -1258,7 +1258,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index 53b1eda..721a26b 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -8,51 +8,54 @@ 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/AutoTypeCtxForm.cs | 2 +-
- KeePass/Forms/CharPickerForm.cs | 2 +-
- KeePass/Forms/ColumnsForm.cs | 2 +-
- KeePass/Forms/CsvImportForm.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 +-
- KeePass/Forms/EditStringForm.cs | 2 +-
- KeePass/Forms/EntropyForm.cs | 2 +-
- 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 +-
- KeePass/Forms/IOConnectionForm.cs | 2 +-
- KeePass/Forms/IconPickerForm.cs | 2 +-
- KeePass/Forms/ImportMethodForm.cs | 2 +-
- KeePass/Forms/InternalBrowserForm.cs | 2 +-
- KeePass/Forms/KeyCreationForm.cs | 2 +-
- KeePass/Forms/KeyPromptForm.cs | 2 +-
- KeePass/Forms/LanguageForm.cs | 2 +-
- KeePass/Forms/MainForm.cs | 2 +-
- KeePass/Forms/MainForm_Functions.cs | 14 +++++++-------
- 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 +-
- 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 +-
- 44 files changed, 51 insertions(+), 51 deletions(-)
+ KeePass/Forms/AboutForm.cs | 4 ++--
+ KeePass/Forms/AutoTypeCtxForm.cs | 2 +-
+ KeePass/Forms/CharPickerForm.cs | 2 +-
+ KeePass/Forms/ColumnsForm.cs | 2 +-
+ KeePass/Forms/CsvImportForm.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/EcasActionForm.cs | 2 +-
+ KeePass/Forms/EcasConditionForm.cs | 2 +-
+ KeePass/Forms/EcasEventForm.cs | 2 +-
+ KeePass/Forms/EcasTriggerForm.cs | 2 +-
+ KeePass/Forms/EcasTriggersForm.cs | 2 +-
+ KeePass/Forms/EditAutoTypeItemForm.cs | 2 +-
+ KeePass/Forms/EditStringForm.cs | 2 +-
+ KeePass/Forms/EntropyForm.cs | 2 +-
+ 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 +-
+ KeePass/Forms/IOConnectionForm.cs | 2 +-
+ KeePass/Forms/IconPickerForm.cs | 2 +-
+ KeePass/Forms/ImportMethodForm.cs | 2 +-
+ KeePass/Forms/InternalBrowserForm.cs | 2 +-
+ KeePass/Forms/KeyCreationForm.cs | 2 +-
+ KeePass/Forms/KeyPromptForm.cs | 2 +-
+ KeePass/Forms/LanguageForm.cs | 2 +-
+ KeePass/Forms/MainForm.cs | 2 +-
+ KeePass/Forms/MainForm_Functions.cs | 14 +++++++-------
+ 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 +-
+ 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 +-
+ 47 files changed, 54 insertions(+), 54 deletions(-)
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
@@ -83,7 +86,7 @@ Forwarded: not-needed
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
+@@ -133,7 +133,7 @@ namespace KeePass.Forms
m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
@@ -169,6 +172,39 @@ Forwarded: not-needed
FontUtil.AssignDefaultBold(m_cbAppendCopy);
FontUtil.AssignDefaultBold(m_cbFieldRefs);
+--- a/KeePass/Forms/EcasActionForm.cs
++++ b/KeePass/Forms/EcasActionForm.cs
+@@ -59,7 +59,7 @@ namespace KeePass.Forms
+ GlobalWindowManager.AddWindow(this);
+
+ this.Text = KPRes.Action;
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ m_lblParamHint.Text = KPRes.ParamDescHelp;
+
+--- a/KeePass/Forms/EcasConditionForm.cs
++++ b/KeePass/Forms/EcasConditionForm.cs
+@@ -56,7 +56,7 @@ namespace KeePass.Forms
+ GlobalWindowManager.AddWindow(this);
+
+ this.Text = KPRes.Condition;
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ m_lblParamHint.Text = KPRes.ParamDescHelp;
+
+--- a/KeePass/Forms/EcasEventForm.cs
++++ b/KeePass/Forms/EcasEventForm.cs
+@@ -56,7 +56,7 @@ namespace KeePass.Forms
+ GlobalWindowManager.AddWindow(this);
+
+ this.Text = KPRes.Event;
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ m_lblParamHint.Text = KPRes.ParamDescHelp;
+
--- a/KeePass/Forms/EcasTriggerForm.cs
+++ b/KeePass/Forms/EcasTriggerForm.cs
@@ -67,7 +67,7 @@ namespace KeePass.Forms
@@ -380,7 +416,7 @@ Forwarded: not-needed
int nWidth = m_lvLanguages.ClientRectangle.Width / 4;
--- a/KeePass/Forms/MainForm.cs
+++ b/KeePass/Forms/MainForm.cs
-@@ -140,7 +140,7 @@ namespace KeePass.Forms
+@@ -135,7 +135,7 @@ namespace KeePass.Forms
m_strNeverExpiresText = KPRes.NeverExpires;
this.Text = PwDefs.ProductName;
@@ -391,7 +427,7 @@ Forwarded: not-needed
// m_imgFileSaveAllEnabled = Properties.Resources.B16x16_File_SaveAll;
--- a/KeePass/Forms/MainForm_Functions.cs
+++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -404,12 +404,12 @@ namespace KeePass.Forms
+@@ -405,12 +405,12 @@ namespace KeePass.Forms
strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -406,7 +442,7 @@ Forwarded: not-needed
KPRes.Locked);
DwmUtil.EnableWindowPeekPreview(this, false);
}
-@@ -419,7 +419,7 @@ namespace KeePass.Forms
+@@ -420,7 +420,7 @@ namespace KeePass.Forms
strNtfText = strWindowText;
Icon icoDisposable, icoAssignable;
@@ -415,7 +451,7 @@ Forwarded: not-needed
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -449,7 +449,7 @@ namespace KeePass.Forms
+@@ -450,7 +450,7 @@ namespace KeePass.Forms
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -424,7 +460,7 @@ Forwarded: not-needed
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -465,7 +465,7 @@ namespace KeePass.Forms
+@@ -474,7 +474,7 @@ namespace KeePass.Forms
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
@@ -433,7 +469,7 @@ Forwarded: not-needed
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2530,7 +2530,7 @@ namespace KeePass.Forms
+@@ -2545,7 +2545,7 @@ namespace KeePass.Forms
m_bTaskbarButtonMessage = true;
}
// else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
@@ -442,7 +478,7 @@ Forwarded: not-needed
base.WndProc(ref m);
}
-@@ -3522,7 +3522,7 @@ namespace KeePass.Forms
+@@ -3539,7 +3539,7 @@ namespace KeePass.Forms
// wasn't fully constructed at that time yet)
// if(IsFileLocked(null))
// TaskbarList.SetOverlayIcon(this,
diff --git a/debian/patches/use-the-mono-signing-key.patch b/debian/patches/use-the-mono-signing-key.patch
index 4c45d94..f31ec6f 100644
--- a/debian/patches/use-the-mono-signing-key.patch
+++ b/debian/patches/use-the-mono-signing-key.patch
@@ -4,8 +4,8 @@ Subject: use the mono signing key
Forwarded: not-needed
---
- KeePass/KeePass.csproj | 2 +-
- KeePassLib/KeePassLib.csproj | 2 +-
+ KeePass/KeePass.csproj | 2 +-
+ KeePassLib/KeePassLib.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/KeePass/KeePass.csproj
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 97dbb6b..3c46dcc 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
@@ -4,7 +4,7 @@ Subject: work around issues with autotype and keyboard layouts
for some reason unicode codes works better
---
- KeePass/Util/SendInputEx.Unix.cs | 6 ++++--
+ KeePass/Util/SendInputEx.Unix.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/KeePass/Util/SendInputEx.Unix.cs
--
keepass2
More information about the Pkg-cli-apps-commits
mailing list