[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.16+dfsg-2-4-gd3b83d4
Julian Taylor
jtaylor.debian at googlemail.com
Wed Oct 19 20:17:11 UTC 2011
The following commit has been merged in the master branch:
commit d3b83d44cae3188bb8d43e54d35b4fa67c3211bd
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Wed Oct 19 22:03:37 2011 +0200
New upstream release
refresh patches, drop applied explicitly-PUT-for-webdav-writes.patch
diff --git a/debian/changelog b/debian/changelog
index 0e58078..b053c77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+keepass2 (2.17+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - refresh patches, drop applied explicitly-PUT-for-webdav-writes.patch
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Wed, 19 Oct 2011 22:02:14 +0200
+
keepass2 (2.16+dfsg-2) unstable; urgency=medium
* debian/copyright: fix dep-5 syntax errors and wrong license tags
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 2e26c67..2652cfd 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/KeePass/Properties/Resources.resx b/KeePass/Properties/Resources.resx
-index e13ee0f..cd9967b 100644
+index 165f24f..ec8b31b 100644
--- a/KeePass/Properties/Resources.resx
+++ b/KeePass/Properties/Resources.resx
@@ -416,43 +416,43 @@
@@ -142,7 +142,7 @@ index e13ee0f..cd9967b 100644
</data>
<data name="B16x16_MenuRadio" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\B16x16_MenuRadio.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -563,12 +563,12 @@
+@@ -563,13 +563,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,6 +157,6 @@ index e13ee0f..cd9967b 100644
- <value>..\Resources\Images\B16x16_Imp_KasperskyPwMgr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- </root>
-\ No newline at end of file
+ <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>
--
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
index b8f5d1e..4bfd15a 100644
--- a/debian/patches/enable-local-help.patch
+++ b/debian/patches/enable-local-help.patch
@@ -6,14 +6,14 @@ 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 | 12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
+ KeePass/App/AppHelp.cs | 19 ++++++++-----------
+ 1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/KeePass/App/AppHelp.cs b/KeePass/App/AppHelp.cs
-index 3172a33..67d6419 100644
+index 335eb71..0400844 100644
--- a/KeePass/App/AppHelp.cs
+++ b/KeePass/App/AppHelp.cs
-@@ -56,7 +56,7 @@ namespace KeePass.App
+@@ -58,7 +58,7 @@ namespace KeePass.App
{
if(m_strLocalHelpFile == null) return false;
@@ -22,11 +22,16 @@ index 3172a33..67d6419 100644
catch(Exception) { }
return false;
}
-@@ -113,10 +113,12 @@ namespace KeePass.App
+@@ -114,14 +114,13 @@ namespace KeePass.App
+ private static void ShowHelpLocal(string strTopic, string strSection)
{
Debug.Assert(m_strLocalHelpFile != null);
-
-- string strCmd = @"ms-its:" + m_strLocalHelpFile;
+-
+- // Unblock CHM file for proper display of help contents
+- WinUtil.RemoveZoneIdentifier(m_strLocalHelpFile);
+-
+- string strCmd = "\"ms-its:" + m_strLocalHelpFile;
++
+ string strCmd = @"/usr/share/doc/keepass2/Chm/help/";
if(strTopic != null)
@@ -37,10 +42,12 @@ index 3172a33..67d6419 100644
if(strSection != null)
{
-@@ -124,10 +126,10 @@ namespace KeePass.App
+@@ -129,12 +128,10 @@ namespace KeePass.App
strCmd += @"#" + strSection;
}
+- strCmd += "\"";
+-
- try { Process.Start("hh.exe", strCmd); }
+ try { Process.Start("x-www-browser", strCmd); }
catch(Exception exStart)
diff --git a/debian/patches/explicitly-PUT-for-webdav-writes.patch b/debian/patches/explicitly-PUT-for-webdav-writes.patch
deleted file mode 100644
index ae0901c..0000000
--- a/debian/patches/explicitly-PUT-for-webdav-writes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Thu, 6 Oct 2011 21:59:57 +0200
-Subject: explicitly PUT for webdav writes
-
-mono does not set HttpRequets.Method to POST for writes so the changing
-to from POST to PUT is not done ConfigureWebRequest leading to failed
-saving and deletion of the database on the webdav storage when
-transactions are enabled
-Applied-Upstream: 2.17
-Bug: https://bugzilla.novell.com/show_bug.cgi?id=722581
----
- KeePassLib/Serialization/IOConnection.cs | 11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git a/KeePassLib/Serialization/IOConnection.cs b/KeePassLib/Serialization/IOConnection.cs
-index 5a93b76..a9b9cc9 100644
---- a/KeePassLib/Serialization/IOConnection.cs
-+++ b/KeePassLib/Serialization/IOConnection.cs
-@@ -243,7 +243,16 @@ namespace KeePassLib.Serialization
-
- if(ioc.IsLocalFile()) return OpenWriteLocal(ioc);
-
-- return CreateWebClient(ioc).OpenWrite(new Uri(ioc.Path));
-+ Uri uri = new Uri(ioc.Path);
-+
-+ // Mono does not set HttpWebRequest.Method to POST for writes,
-+ // so one needs to set the method to PUT explicitly
-+ if(NativeLib.IsUnix() && (uri.Scheme.Equals(Uri.UriSchemeHttp,
-+ StrUtil.CaseIgnoreCmp) || uri.Scheme.Equals(Uri.UriSchemeHttps,
-+ StrUtil.CaseIgnoreCmp)))
-+ return CreateWebClient(ioc).OpenWrite(uri, WebRequestMethods.Http.Put);
-+
-+ return CreateWebClient(ioc).OpenWrite(uri);
- }
- #else
- public static Stream OpenWrite(IOConnectionInfo ioc)
---
diff --git a/debian/patches/fix-XSL-search-path.patch b/debian/patches/fix-XSL-search-path.patch
index 4db5902..e232837 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 af4fae3..9f66f18 100644
+index ba9ed48..ad31ec8 100644
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
diff --git a/debian/patches/prefer-4.0-framework-if-available.patch b/debian/patches/prefer-4.0-framework-if-available.patch
index 2d49774..e697f39 100644
--- a/debian/patches/prefer-4.0-framework-if-available.patch
+++ b/debian/patches/prefer-4.0-framework-if-available.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Ext/KeePass.exe.config b/Ext/KeePass.exe.config
-index ecfec22..59ed454 100644
+index 193ac9d..497d8d5 100644
--- a/Ext/KeePass.exe.config
+++ b/Ext/KeePass.exe.config
@@ -1,7 +1,7 @@
diff --git a/debian/patches/remove-ToolsVersion-3.5.patch b/debian/patches/remove-ToolsVersion-3.5.patch
index a76aed5..feae95a 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 5ad0023..b32ac7e 100644
+index 486675a..0e1cd08 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -1,4 +1,4 @@
diff --git a/debian/patches/series b/debian/patches/series
index 86f1fc2..d0c70b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ fix-XSL-search-path.patch
remove-ToolsVersion-3.5.patch
prefer-4.0-framework-if-available.patch
enable-local-help.patch
-explicitly-PUT-for-webdav-writes.patch
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 8306c54..5ecee79 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -4,21 +4,20 @@ Subject: skip sgen run during build
Forwarded: not-needed
---
- KeePass/KeePass.csproj | 5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
+ KeePass/KeePass.csproj | 3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 68c0f5a..5ad0023 100644
+index cb7d0b4..486675a 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
-@@ -1202,7 +1202,4 @@
+@@ -1227,7 +1227,4 @@
<Target Name="AfterBuild">
</Target>
-->
- <PropertyGroup>
-- <PostBuildEvent>"$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_E6D8E2B3F89DA59B /compiler:/delaysign-</PostBuildEvent>
+- <PostBuildEvent>"$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-</PostBuildEvent>
- </PropertyGroup>
--</Project>
+ </Project>
\ No newline at end of file
-+</Project>
--
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index d4d2a51..25d8c4b 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -70,10 +70,10 @@ index cb405c7..56d8d76 100644
m_lvComponents.Columns.Add(KPRes.Components, 100, HorizontalAlignment.Left);
m_lvComponents.Columns.Add(KPRes.Version, 100, HorizontalAlignment.Left);
diff --git a/KeePass/Forms/CharPickerForm.cs b/KeePass/Forms/CharPickerForm.cs
-index 02386c1..202e84d 100644
+index fecd0df..e7343c3 100644
--- a/KeePass/Forms/CharPickerForm.cs
+++ b/KeePass/Forms/CharPickerForm.cs
-@@ -105,7 +105,7 @@ namespace KeePass.Forms
+@@ -106,7 +106,7 @@ namespace KeePass.Forms
m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
@@ -96,7 +96,7 @@ index e7ae02f..0fba326 100644
int nWidth = (m_lvColumns.ClientRectangle.Width -
diff --git a/KeePass/Forms/DataEditorForm.cs b/KeePass/Forms/DataEditorForm.cs
-index 7a4656c..224faeb 100644
+index 9a43427..b48ed83 100644
--- a/KeePass/Forms/DataEditorForm.cs
+++ b/KeePass/Forms/DataEditorForm.cs
@@ -92,7 +92,7 @@ namespace KeePass.Forms
@@ -109,7 +109,7 @@ index 7a4656c..224faeb 100644
string strRect = Program.Config.UI.DataEditorRect;
diff --git a/KeePass/Forms/DataViewerForm.cs b/KeePass/Forms/DataViewerForm.cs
-index 35995c6..6431f1c 100644
+index 782a381..1223200 100644
--- a/KeePass/Forms/DataViewerForm.cs
+++ b/KeePass/Forms/DataViewerForm.cs
@@ -71,7 +71,7 @@ namespace KeePass.Forms
@@ -174,10 +174,10 @@ 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 f6f65b0..9683773 100644
+index 4be77cb..1b7a2d5 100644
--- a/KeePass/Forms/EditAutoTypeItemForm.cs
+++ b/KeePass/Forms/EditAutoTypeItemForm.cs
-@@ -118,7 +118,7 @@ namespace KeePass.Forms
+@@ -121,7 +121,7 @@ namespace KeePass.Forms
KPRes.ConfigureKeystrokeSeqDesc);
}
@@ -187,7 +187,7 @@ index f6f65b0..9683773 100644
UIUtil.EnableAutoCompletion(m_cmbWindow, false);
diff --git a/KeePass/Forms/EditStringForm.cs b/KeePass/Forms/EditStringForm.cs
-index e8acc06..e76a0fa 100644
+index 8d15620..68d3349 100644
--- a/KeePass/Forms/EditStringForm.cs
+++ b/KeePass/Forms/EditStringForm.cs
@@ -94,7 +94,7 @@ namespace KeePass.Forms
@@ -213,7 +213,7 @@ index aa53f6b..33b808e 100644
UpdateUIState();
diff --git a/KeePass/Forms/EntryListForm.cs b/KeePass/Forms/EntryListForm.cs
-index c260656..2eed07e 100644
+index c9ae55c..f3bdaf4 100644
--- a/KeePass/Forms/EntryListForm.cs
+++ b/KeePass/Forms/EntryListForm.cs
@@ -87,7 +87,7 @@ namespace KeePass.Forms
@@ -252,7 +252,7 @@ index 869abc5..dfaf4bb 100644
this.Text = strWndTitle;
diff --git a/KeePass/Forms/FieldRefForm.cs b/KeePass/Forms/FieldRefForm.cs
-index 2ce5e06..a2842fc 100644
+index 2bbbe2c..d3edcbf 100644
--- a/KeePass/Forms/FieldRefForm.cs
+++ b/KeePass/Forms/FieldRefForm.cs
@@ -68,7 +68,7 @@ namespace KeePass.Forms
@@ -278,7 +278,7 @@ index a75cf76..9b0d31c 100644
m_nIconDim = m_tvFolders.ItemHeight;
diff --git a/KeePass/Forms/GroupForm.cs b/KeePass/Forms/GroupForm.cs
-index 969c788..1c0716a 100644
+index b3234a5..816484a 100644
--- a/KeePass/Forms/GroupForm.cs
+++ b/KeePass/Forms/GroupForm.cs
@@ -66,7 +66,7 @@ namespace KeePass.Forms
@@ -369,7 +369,7 @@ 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 d963bf1..05948b7 100644
+index a272c58..8c9e12e 100644
--- a/KeePass/Forms/KeyCreationForm.cs
+++ b/KeePass/Forms/KeyCreationForm.cs
@@ -79,7 +79,7 @@ namespace KeePass.Forms
@@ -382,7 +382,7 @@ index d963bf1..05948b7 100644
FontUtil.AssignDefaultBold(m_cbPassword);
diff --git a/KeePass/Forms/KeyPromptForm.cs b/KeePass/Forms/KeyPromptForm.cs
-index f261e5d..e3a89a4 100644
+index ff544e9..aadf223 100644
--- a/KeePass/Forms/KeyPromptForm.cs
+++ b/KeePass/Forms/KeyPromptForm.cs
@@ -115,7 +115,7 @@ namespace KeePass.Forms
@@ -408,10 +408,10 @@ index 4cf052f..1d9d009 100644
int nWidth = m_lvLanguages.ClientRectangle.Width / 4;
diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index c4cc042..3192dac 100644
+index aaeedba..30ed805 100644
--- a/KeePass/Forms/MainForm.cs
+++ b/KeePass/Forms/MainForm.cs
-@@ -126,7 +126,7 @@ namespace KeePass.Forms
+@@ -140,7 +140,7 @@ namespace KeePass.Forms
m_strNeverExpiresText = KPRes.NeverExpires;
this.Text = PwDefs.ProductName;
@@ -421,10 +421,10 @@ index c4cc042..3192dac 100644
m_imgFileSaveDisabled = Properties.Resources.B16x16_FileSave_Disabled;
// m_imgFileSaveAllEnabled = Properties.Resources.B16x16_File_SaveAll;
diff --git a/KeePass/Forms/MainForm_Functions.cs b/KeePass/Forms/MainForm_Functions.cs
-index 8756d22..813724b 100644
+index aefaa25..c9684a8 100644
--- a/KeePass/Forms/MainForm_Functions.cs
+++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -382,12 +382,12 @@ namespace KeePass.Forms
+@@ -402,12 +402,12 @@ namespace KeePass.Forms
strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -439,7 +439,7 @@ index 8756d22..813724b 100644
KPRes.Locked);
NativeMethods.EnableWindowPeekPreview(this.Handle, false);
}
-@@ -397,7 +397,7 @@ namespace KeePass.Forms
+@@ -417,7 +417,7 @@ namespace KeePass.Forms
strNtfText = strWindowText;
Icon icoDisposable, icoAssignable;
@@ -448,7 +448,7 @@ index 8756d22..813724b 100644
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -427,7 +427,7 @@ namespace KeePass.Forms
+@@ -447,7 +447,7 @@ namespace KeePass.Forms
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -457,7 +457,7 @@ index 8756d22..813724b 100644
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -442,7 +442,7 @@ namespace KeePass.Forms
+@@ -462,7 +462,7 @@ namespace KeePass.Forms
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
@@ -466,21 +466,21 @@ index 8756d22..813724b 100644
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -3377,7 +3377,7 @@ namespace KeePass.Forms
+@@ -3473,7 +3473,7 @@ namespace KeePass.Forms
// wasn't fully constructed at that time yet)
- if(IsFileLocked(null))
- TaskbarList.SetOverlayIcon(this,
-- Properties.Resources.LockOverlay, KPRes.Locked);
-+ new Icon("/usr/share/keepass2/LockOverlay.ico"), KPRes.Locked);
+ // if(IsFileLocked(null))
+ // TaskbarList.SetOverlayIcon(this,
+- // Properties.Resources.LockOverlay, KPRes.Locked);
++ // new Icon("/usr/share/keepass2/LockOverlay.ico"), KPRes.Locked);
}
if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
-index c0ba1d2..ed67e7d 100644
+index 23bcaa4..c67cacc 100644
--- a/KeePass/Forms/OptionsForm.cs
+++ b/KeePass/Forms/OptionsForm.cs
-@@ -104,7 +104,7 @@ namespace KeePass.Forms
- {
+@@ -107,7 +107,7 @@ namespace KeePass.Forms
+
GlobalWindowManager.AddWindow(this);
- this.Icon = Properties.Resources.KeePass;
@@ -502,10 +502,10 @@ 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 9f323ea..c9864bd 100644
+index 9012952..bcbdf1c 100644
--- a/KeePass/Forms/PrintForm.cs
+++ b/KeePass/Forms/PrintForm.cs
-@@ -94,7 +94,7 @@ namespace KeePass.Forms
+@@ -95,7 +95,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -528,7 +528,7 @@ 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 b79f7a2..42e282a 100644
+index 775f9df..63ff77c 100644
--- a/KeePass/Forms/PwEntryForm.cs
+++ b/KeePass/Forms/PwEntryForm.cs
@@ -550,7 +550,7 @@ namespace KeePass.Forms
@@ -541,7 +541,7 @@ index b79f7a2..42e282a 100644
UIUtil.SetButtonImage(m_btnTools,
diff --git a/KeePass/Forms/PwGeneratorForm.cs b/KeePass/Forms/PwGeneratorForm.cs
-index 22f0c8c..2e9043b 100644
+index 5f8f372..d3a79f4 100644
--- a/KeePass/Forms/PwGeneratorForm.cs
+++ b/KeePass/Forms/PwGeneratorForm.cs
@@ -90,7 +90,7 @@ namespace KeePass.Forms
@@ -554,18 +554,18 @@ index 22f0c8c..2e9043b 100644
UIUtil.SetButtonImage(m_btnProfileAdd,
Properties.Resources.B16x16_FileSaveAs, false);
diff --git a/KeePass/Forms/SearchForm.cs b/KeePass/Forms/SearchForm.cs
-index 9082a87..80130ca 100644
+index 56f4e1f..97df3bc 100644
--- a/KeePass/Forms/SearchForm.cs
+++ b/KeePass/Forms/SearchForm.cs
-@@ -89,7 +89,7 @@ namespace KeePass.Forms
+@@ -92,7 +92,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_XMag, strTitle, KPRes.SearchDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- SearchParameters sp = Program.Config.Defaults.SearchParameters;
- m_cbTitle.Checked = sp.SearchInTitles;
+ 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
@@ -619,7 +619,7 @@ index 4ff62a8..6b88f6d 100644
m_tbScheme.Text = m_ovr.Scheme;
diff --git a/KeePass/Forms/UrlSchemesForm.cs b/KeePass/Forms/UrlSchemesForm.cs
-index eadc777..c605501 100644
+index d0e87ae..6934c77 100644
--- a/KeePass/Forms/UrlSchemesForm.cs
+++ b/KeePass/Forms/UrlSchemesForm.cs
@@ -54,7 +54,7 @@ namespace KeePass.Forms
@@ -630,5 +630,5 @@ index eadc777..c605501 100644
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = KPRes.UrlSchemeOverrides;
- int nWidth = (m_lvOverrides.ClientSize.Width - UIUtil.GetVScrollBarWidth()) / 4;
+ 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 c3c5e62..09433eb 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 cddd7d2..68c0f5a 100644
+index 2175f7c..cb7d0b4 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
--
keepass2
More information about the Pkg-cli-apps-commits
mailing list