[Pkg-cli-apps-commits] [SCM] keepass2 branch, master-exp, updated. debian/2.20.1+dfsg-1-7-g04ee870

Julian Taylor jtaylor.debian at googlemail.com
Tue Feb 26 20:02:26 UTC 2013 

The following commit has been merged in the master-exp branch:
commit 890cd787d21ba7a699fb3fff97b7a7a395bb04f5
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue Feb 26 20:38:48 2013 +0100

    refresh patches

diff --git a/debian/patches/disable-autoupdate-dialog.patch b/debian/patches/disable-autoupdate-dialog.patch
index 3e7e721..871b0f7 100644
--- a/debian/patches/disable-autoupdate-dialog.patch
+++ b/debian/patches/disable-autoupdate-dialog.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/KeePass/App/Configuration/AceApplication.cs
 +++ b/KeePass/App/Configuration/AceApplication.cs
-@@ -293,8 +293,8 @@
+@@ -293,8 +293,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 6c02015..b797259 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -157,13 +157,16 @@ 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,6 +575,6 @@
+@@ -575,9 +575,9 @@
      <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">
 -    <value>..\Resources\Images\B16x16_Imp_DesktopKnox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
 +    <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
    </data>
--</root>
+   <data name="B16x16_Imp_LastPass" type="System.Resources.ResXFileRef, System.Windows.Forms">
+-    <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>
+ </root>
 \ No newline at end of file
-+</root>
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
index 8df732b..c1e8a37 100644
--- a/debian/patches/enable-local-help.patch
+++ b/debian/patches/enable-local-help.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
 
 --- a/KeePass/App/AppHelp.cs
 +++ b/KeePass/App/AppHelp.cs
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ namespace KeePass.App
  			{
  				if(m_strLocalHelpFile == null) return false;
  
@@ -20,7 +20,7 @@ Forwarded: not-needed
  				catch(Exception) { }
  				return false;
  			}
-@@ -114,14 +114,13 @@
+@@ -114,14 +114,13 @@ namespace KeePass.App
  		private static void ShowHelpLocal(string strTopic, string strSection)
  		{
  			Debug.Assert(m_strLocalHelpFile != null);
@@ -40,7 +40,7 @@ Forwarded: not-needed
  
  			if(strSection != null)
  			{
-@@ -129,12 +128,10 @@
+@@ -129,12 +128,10 @@ namespace KeePass.App
  				strCmd += @"#" + strSection;
  			}
  
diff --git a/debian/patches/fix-XSL-search-path.patch b/debian/patches/fix-XSL-search-path.patch
index 30af3aa..f7eafcc 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -12,7 +12,7 @@ Forwarded: not-needed
 
 --- a/KeePass/App/AppDefs.cs
 +++ b/KeePass/App/AppDefs.cs
-@@ -36,6 +36,8 @@
+@@ -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,7 +23,7 @@ Forwarded: not-needed
  		public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
 --- a/KeePass/Forms/AboutForm.cs
 +++ b/KeePass/Forms/AboutForm.cs
-@@ -92,8 +92,7 @@
+@@ -88,8 +88,7 @@ namespace KeePass.Forms
  			m_lvComponents.Items.Add(lvi);
  
  			lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 080d6c2..4b660a8 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- a/KeePass/KeePass.csproj
 +++ b/KeePass/KeePass.csproj
-@@ -1255,7 +1255,4 @@
+@@ -1253,7 +1253,4 @@
    <Target Name="AfterBuild">
    </Target>
    -->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index 1d68150..53b1eda 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -56,7 +56,7 @@ Forwarded: not-needed
 
 --- a/KeePass/Forms/AboutForm.cs
 +++ b/KeePass/Forms/AboutForm.cs
-@@ -56,11 +56,11 @@
+@@ -56,11 +56,11 @@ namespace KeePass.Forms
  			string strTitle = PwDefs.ProductName;
  			string strDesc = KPRes.Version + " " + PwDefs.VersionString;
  
@@ -72,7 +72,7 @@ Forwarded: not-needed
  			m_lvComponents.Columns.Add(KPRes.Version, 100, HorizontalAlignment.Left);
 --- a/KeePass/Forms/AutoTypeCtxForm.cs
 +++ b/KeePass/Forms/AutoTypeCtxForm.cs
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ namespace KeePass.Forms
  
  			m_lblText.Text = KPRes.AutoTypeEntrySelectionDescLong;
  			this.Text = KPRes.AutoTypeEntrySelection;
@@ -83,7 +83,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 @@
+@@ -106,7 +106,7 @@ namespace KeePass.Forms
  
  			m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
  
@@ -94,7 +94,7 @@ Forwarded: not-needed
  			m_secWord.Attach(m_tbSelected, OnSelectedTextChangedEx, true);
 --- a/KeePass/Forms/ColumnsForm.cs
 +++ b/KeePass/Forms/ColumnsForm.cs
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_View_Detailed,
  				KPRes.ConfigureColumns, KPRes.ConfigureColumnsDesc);
@@ -105,7 +105,7 @@ Forwarded: not-needed
  			int nWidth = (m_lvColumns.ClientRectangle.Width -
 --- a/KeePass/Forms/CsvImportForm.cs
 +++ b/KeePass/Forms/CsvImportForm.cs
-@@ -107,7 +107,7 @@
+@@ -108,7 +108,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -116,7 +116,7 @@ Forwarded: not-needed
  			// FontUtil.AssignDefaultBold(m_grpSyntax);
 --- a/KeePass/Forms/DataEditorForm.cs
 +++ b/KeePass/Forms/DataEditorForm.cs
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -127,7 +127,7 @@ Forwarded: not-needed
  			string strRect = Program.Config.UI.DataEditorRect;
 --- a/KeePass/Forms/DataViewerForm.cs
 +++ b/KeePass/Forms/DataViewerForm.cs
-@@ -76,7 +76,7 @@
+@@ -84,7 +84,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -138,7 +138,7 @@ Forwarded: not-needed
  				this.Text = m_strDataDesc + " - " + this.Text;
 --- a/KeePass/Forms/DatabaseOperationsForm.cs
 +++ b/KeePass/Forms/DatabaseOperationsForm.cs
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Package_Settings, KPRes.DatabaseMaintenance,
  				KPRes.DatabaseMaintenanceDesc);
@@ -149,7 +149,7 @@ Forwarded: not-needed
  			m_numHistoryDays.Value = m_pwDatabase.MaintenanceHistoryDays;
 --- a/KeePass/Forms/DatabaseSettingsForm.cs
 +++ b/KeePass/Forms/DatabaseSettingsForm.cs
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Ark, KPRes.DatabaseSettings,
  				KPRes.DatabaseSettingsDesc);
@@ -160,7 +160,7 @@ Forwarded: not-needed
  
 --- a/KeePass/Forms/DuplicationForm.cs
 +++ b/KeePass/Forms/DuplicationForm.cs
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ namespace KeePass.Forms
  		{
  			GlobalWindowManager.AddWindow(this);
  
@@ -171,7 +171,7 @@ Forwarded: not-needed
  			FontUtil.AssignDefaultBold(m_cbFieldRefs);
 --- a/KeePass/Forms/EcasTriggerForm.cs
 +++ b/KeePass/Forms/EcasTriggerForm.cs
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Run, strTitle, strDesc);
  			this.Text = strTitle;
@@ -182,7 +182,7 @@ Forwarded: not-needed
  			m_lvConditions.SmallImageList = m_ilIcons;
 --- a/KeePass/Forms/EcasTriggersForm.cs
 +++ b/KeePass/Forms/EcasTriggersForm.cs
-@@ -82,7 +82,7 @@
+@@ -82,7 +82,7 @@ namespace KeePass.Forms
  				Properties.Resources.B48x48_Make_KDevelop, KPRes.Triggers,
  				KPRes.TriggersDesc);
  			this.Text = KPRes.Triggers;
@@ -193,7 +193,7 @@ Forwarded: not-needed
  			m_lvTriggers.Columns.Add(KPRes.Triggers, nWidth);
 --- a/KeePass/Forms/EditAutoTypeItemForm.cs
 +++ b/KeePass/Forms/EditAutoTypeItemForm.cs
-@@ -97,7 +97,7 @@
+@@ -106,7 +106,7 @@ namespace KeePass.Forms
  					KPRes.ConfigureKeystrokeSeqDesc);
  			}
  
@@ -204,7 +204,7 @@ Forwarded: not-needed
  			// FontUtil.AssignDefaultBold(m_rbSeqDefault);
 --- a/KeePass/Forms/EditStringForm.cs
 +++ b/KeePass/Forms/EditStringForm.cs
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ namespace KeePass.Forms
  
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Font, strTitle, strDesc);
@@ -215,7 +215,7 @@ Forwarded: not-needed
  			UIUtil.PrepareStandardMultilineControl(m_richStringValue, true, true);
 --- a/KeePass/Forms/EntropyForm.cs
 +++ b/KeePass/Forms/EntropyForm.cs
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
  				KPRes.EntropyDesc);
@@ -226,7 +226,7 @@ Forwarded: not-needed
  			UpdateUIState();
 --- a/KeePass/Forms/EntryListForm.cs
 +++ b/KeePass/Forms/EntryListForm.cs
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ namespace KeePass.Forms
  				m_imgIcon, m_strTitle, m_strDescShort);
  			m_lblText.Text = m_strDescLong;
  			this.Text = m_strTitle;
@@ -237,7 +237,7 @@ Forwarded: not-needed
  			else m_ilIcons = new ImageList();
 --- a/KeePass/Forms/EntryReportForm.cs
 +++ b/KeePass/Forms/EntryReportForm.cs
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ namespace KeePass.Forms
  
  		private void OnFormLoad(object sender, EventArgs e)
  		{
@@ -248,7 +248,7 @@ Forwarded: not-needed
  			else m_strTitle = PwDefs.ShortProductName;
 --- a/KeePass/Forms/ExchangeDataForm.cs
 +++ b/KeePass/Forms/ExchangeDataForm.cs
-@@ -98,7 +98,7 @@
+@@ -100,7 +100,7 @@ namespace KeePass.Forms
  				Properties.Resources.B48x48_Folder_Download);
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				bmpBanner, strWndTitle, strWndDesc);
@@ -259,7 +259,7 @@ Forwarded: not-needed
  
 --- a/KeePass/Forms/FieldRefForm.cs
 +++ b/KeePass/Forms/FieldRefForm.cs
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -270,7 +270,7 @@ Forwarded: not-needed
  
 --- a/KeePass/Forms/FileBrowserForm.cs
 +++ b/KeePass/Forms/FileBrowserForm.cs
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@ namespace KeePass.Forms
  		{
  			GlobalWindowManager.AddWindow(this);
  
@@ -281,7 +281,7 @@ Forwarded: not-needed
  			m_nIconDim = m_tvFolders.ItemHeight;
 --- a/KeePass/Forms/GroupForm.cs
 +++ b/KeePass/Forms/GroupForm.cs
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Folder_Txt, KPRes.EditGroup,
  				KPRes.EditGroupDesc);
@@ -292,7 +292,7 @@ Forwarded: not-needed
  				Properties.Resources.B16x16_Wizard, true);
 --- a/KeePass/Forms/HelpSourceForm.cs
 +++ b/KeePass/Forms/HelpSourceForm.cs
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Folder_Download, KPRes.HelpSourceSelection,
  				KPRes.HelpSourceSelectionDesc);
@@ -303,7 +303,7 @@ Forwarded: not-needed
  			FontUtil.AssignDefaultBold(m_radioLocal);
 --- a/KeePass/Forms/IOConnectionForm.cs
 +++ b/KeePass/Forms/IOConnectionForm.cs
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ namespace KeePass.Forms
  
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				KeePass.Properties.Resources.B48x48_WWW, strTitle, strDesc);
@@ -314,7 +314,7 @@ Forwarded: not-needed
  			FontUtil.AssignDefaultBold(m_lblUrl);
 --- a/KeePass/Forms/IconPickerForm.cs
 +++ b/KeePass/Forms/IconPickerForm.cs
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -325,7 +325,7 @@ Forwarded: not-needed
  			FontUtil.AssignDefaultBold(m_radioCustom);
 --- a/KeePass/Forms/ImportMethodForm.cs
 +++ b/KeePass/Forms/ImportMethodForm.cs
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Folder_Download, KPRes.ImportBehavior,
  				KPRes.ImportBehaviorDesc);
@@ -336,7 +336,7 @@ Forwarded: not-needed
  
 --- a/KeePass/Forms/InternalBrowserForm.cs
 +++ b/KeePass/Forms/InternalBrowserForm.cs
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ namespace KeePass.Forms
  		{
  			GlobalWindowManager.AddWindow(this);
  
@@ -347,7 +347,7 @@ Forwarded: not-needed
  				m_webBrowser.Navigate(m_strInitialUrl);
 --- a/KeePass/Forms/KeyCreationForm.cs
 +++ b/KeePass/Forms/KeyCreationForm.cs
-@@ -81,7 +81,7 @@
+@@ -82,7 +82,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_KGPG_Sign, KPRes.CreateMasterKey,
  				m_ioInfo.GetDisplayName());
@@ -355,21 +355,21 @@ Forwarded: not-needed
 +			this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
  			this.Text = KPRes.CreateMasterKey;
  
- 			FontUtil.AssignDefaultBold(m_cbPassword);
+ 			FontUtil.SetDefaultFont(m_cbPassword);
 --- a/KeePass/Forms/KeyPromptForm.cs
 +++ b/KeePass/Forms/KeyPromptForm.cs
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ namespace KeePass.Forms
  			string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_KGPG_Key2, strBannerTitle, strBannerDesc);
 -			this.Icon = Properties.Resources.KeePass;
 +			this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
  
+ 			FontUtil.SetDefaultFont(m_cbPassword);
  			FontUtil.AssignDefaultBold(m_cbPassword);
- 			FontUtil.AssignDefaultBold(m_cbKeyFile);
 --- a/KeePass/Forms/LanguageForm.cs
 +++ b/KeePass/Forms/LanguageForm.cs
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_Keyboard_Layout,
  				KPRes.SelectLanguage, KPRes.SelectLanguageDesc);
@@ -380,7 +380,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 @@
+@@ -140,7 +140,7 @@ namespace KeePass.Forms
  			m_strNeverExpiresText = KPRes.NeverExpires;
  
  			this.Text = PwDefs.ProductName;
@@ -391,7 +391,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 @@
+@@ -404,12 +404,12 @@ namespace KeePass.Forms
  					strNtfPre.Length);
  
  				Icon icoDisposable, icoAssignable;
@@ -406,7 +406,7 @@ Forwarded: not-needed
  					KPRes.Locked);
  				DwmUtil.EnableWindowPeekPreview(this, false);
  			}
-@@ -419,7 +419,7 @@
+@@ -419,7 +419,7 @@ namespace KeePass.Forms
  				strNtfText = strWindowText;
  
  				Icon icoDisposable, icoAssignable;
@@ -415,7 +415,7 @@ Forwarded: not-needed
  					ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
  				m_ntfTray.Icon = icoAssignable;
  				if(icoDisposable != null) icoDisposable.Dispose();
-@@ -449,7 +449,7 @@
+@@ -449,7 +449,7 @@ namespace KeePass.Forms
  					m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
  
  				Icon icoDisposable, icoAssignable;
@@ -424,7 +424,7 @@ Forwarded: not-needed
  					ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
  				m_ntfTray.Icon = icoAssignable;
  				if(icoDisposable != null) icoDisposable.Dispose();
-@@ -464,7 +464,7 @@
+@@ -465,7 +465,7 @@ namespace KeePass.Forms
  			m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
  
  			Icon icoToDispose, icoToAssign;
@@ -433,7 +433,7 @@ Forwarded: not-needed
  				ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
  				this.Icon = icoToAssign;
  			if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2530,7 +2530,7 @@
+@@ -2530,7 +2530,7 @@ namespace KeePass.Forms
  				m_bTaskbarButtonMessage = true;
  			}
  			// else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
@@ -442,7 +442,7 @@ Forwarded: not-needed
  
  			base.WndProc(ref m);
  		}
-@@ -3521,7 +3521,7 @@
+@@ -3522,7 +3522,7 @@ namespace KeePass.Forms
  					// wasn't fully constructed at that time yet)
  					// if(IsFileLocked(null))
  					//	TaskbarList.SetOverlayIcon(this,
@@ -453,7 +453,7 @@ Forwarded: not-needed
  				if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
 --- a/KeePass/Forms/OptionsForm.cs
 +++ b/KeePass/Forms/OptionsForm.cs
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -464,7 +464,7 @@ Forwarded: not-needed
  			if(m_ilIcons != null)
 --- a/KeePass/Forms/PluginsForm.cs
 +++ b/KeePass/Forms/PluginsForm.cs
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_BlockDevice, KPRes.Plugins,
  				KPRes.PluginsDesc);
@@ -475,7 +475,7 @@ Forwarded: not-needed
  
 --- a/KeePass/Forms/PrintForm.cs
 +++ b/KeePass/Forms/PrintForm.cs
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -486,7 +486,7 @@ Forwarded: not-needed
  			UIUtil.SetButtonImage(m_btnConfigPrinter,
 --- a/KeePass/Forms/ProxyForm.cs
 +++ b/KeePass/Forms/ProxyForm.cs
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ namespace KeePass.Forms
  		{
  			GlobalWindowManager.AddWindow(this);
  
@@ -497,7 +497,7 @@ Forwarded: not-needed
  			if(pst == ProxyServerType.None) m_rbNoProxy.Checked = true;
 --- a/KeePass/Forms/PwEntryForm.cs
 +++ b/KeePass/Forms/PwEntryForm.cs
-@@ -580,7 +580,7 @@
+@@ -580,7 +580,7 @@ namespace KeePass.Forms
  
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
@@ -508,7 +508,7 @@ Forwarded: not-needed
  			m_imgPwGen = UIUtil.CreateDropDownImage(Properties.Resources.B16x16_Key_New);
 --- a/KeePass/Forms/PwGeneratorForm.cs
 +++ b/KeePass/Forms/PwGeneratorForm.cs
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_KGPG_Gen, KPRes.PasswordOptions,
  				KPRes.PasswordOptionsDesc);
@@ -519,7 +519,7 @@ Forwarded: not-needed
  				Properties.Resources.B16x16_FileSaveAs, false);
 --- a/KeePass/Forms/SearchForm.cs
 +++ b/KeePass/Forms/SearchForm.cs
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ namespace KeePass.Forms
  
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_XMag, strTitle, KPRes.SearchDesc);
@@ -530,7 +530,7 @@ Forwarded: not-needed
  
 --- a/KeePass/Forms/SingleLineEditForm.cs
 +++ b/KeePass/Forms/SingleLineEditForm.cs
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ namespace KeePass.Forms
  
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				m_imgIcon, m_strTitle, m_strDesc);
@@ -541,7 +541,7 @@ Forwarded: not-needed
  			m_lblLongDesc.Text = m_strLongDesc;
 --- a/KeePass/Forms/StatusLoggerForm.cs
 +++ b/KeePass/Forms/StatusLoggerForm.cs
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ namespace KeePass.Forms
  		{
  			GlobalWindowManager.AddWindow(this);
  
@@ -552,7 +552,7 @@ Forwarded: not-needed
  			m_pbProgress.Minimum = 0;
 --- a/KeePass/Forms/TanWizardForm.cs
 +++ b/KeePass/Forms/TanWizardForm.cs
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ namespace KeePass.Forms
  				KeePass.Properties.Resources.B48x48_Wizard, KPRes.TanWizard,
  				KPRes.TanWizardDesc);
  			
@@ -563,7 +563,7 @@ Forwarded: not-needed
  			if((m_pgStorage.Name != null) && (m_pgStorage.Name.Length > 0))
 --- a/KeePass/Forms/UpdateCheckForm.cs
 +++ b/KeePass/Forms/UpdateCheckForm.cs
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ namespace KeePass.Forms
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_WWW, KPRes.UpdateCheck,
  				KPRes.UpdateCheckResults);
@@ -574,7 +574,7 @@ Forwarded: not-needed
  			UIUtil.SetExplorerTheme(m_lvInfo, true);
 --- a/KeePass/Forms/UrlSchemeForm.cs
 +++ b/KeePass/Forms/UrlSchemeForm.cs
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -585,7 +585,7 @@ Forwarded: not-needed
  			m_tbScheme.Text = m_ovr.Scheme;
 --- a/KeePass/Forms/UrlSchemesForm.cs
 +++ b/KeePass/Forms/UrlSchemesForm.cs
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
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 5bfd5c6..97dbb6b 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
@@ -9,7 +9,7 @@ for some reason unicode codes works better
 
 --- a/KeePass/Util/SendInputEx.Unix.cs
 +++ b/KeePass/Util/SendInputEx.Unix.cs
-@@ -181,9 +181,11 @@
+@@ -181,9 +181,11 @@ namespace KeePass.Util
  			if(strString.Length == 0) return;
  
  			if(kMod != Keys.None)

-- 
keepass2

More information about the Pkg-cli-apps-commits mailing list