[Pkg-cli-apps-commits] [keepass2] 02/02: New upstream release

[Julian Taylor]

This is an automated email from the git hooks/post-receive script.

jtaylor-guest pushed a commit to branch master
in repository keepass2.

commit 1b4b4376b619bd7414a882b0862aa323bfb0ad3b
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Apr 27 19:34:59 2014 +0200

    New upstream release
---
 debian/changelog                             |  6 ++++++
 debian/patches/use-installed-ico-files.patch | 26 +++++++++++++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8daf1d7..49b6254 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+keepass2 (2.26+dfsg-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 27 Apr 2014 19:34:35 +0200
+
 keepass2 (2.25+dfsg-1) unstable; urgency=medium
 
   * New upstream release (Closes: #738056)
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index aa39eac..6715b97 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -55,7 +55,8 @@ Forwarded: not-needed
  KeePass/Forms/UpdateCheckForm.cs        |  2 +-
  KeePass/Forms/UrlSchemeForm.cs          |  2 +-
  KeePass/Forms/UrlSchemesForm.cs         |  2 +-
- 47 files changed, 54 insertions(+), 54 deletions(-)
+ KeePass/Forms/XmlReplaceForm.cs         |  2 +-
+ 48 files changed, 55 insertions(+), 55 deletions(-)
 
 --- a/KeePass/Forms/AboutForm.cs
 +++ b/KeePass/Forms/AboutForm.cs
@@ -394,7 +395,7 @@ Forwarded: not-needed
  			FontUtil.SetDefaultFont(m_cbPassword);
 --- a/KeePass/Forms/KeyPromptForm.cs
 +++ b/KeePass/Forms/KeyPromptForm.cs
-@@ -116,7 +116,7 @@ namespace KeePass.Forms
+@@ -120,7 +120,7 @@ namespace KeePass.Forms
  			string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				Properties.Resources.B48x48_KGPG_Key2, strBannerTitle, strBannerDesc);
@@ -427,7 +428,7 @@ Forwarded: not-needed
  			// m_imgFileSaveAllEnabled = Properties.Resources.B16x16_File_SaveAll;
 --- a/KeePass/Forms/MainForm_Functions.cs
 +++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -412,19 +412,19 @@ namespace KeePass.Forms
+@@ -413,19 +413,19 @@ namespace KeePass.Forms
  				strNtfText = strNtfPre + strFileDesc;
  
  				Icon icoDisposable, icoAssignable;
@@ -450,7 +451,7 @@ Forwarded: not-needed
  					ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
  				m_ntfTray.Icon = icoAssignable;
  				if(icoDisposable != null) icoDisposable.Dispose();
-@@ -448,7 +448,7 @@ namespace KeePass.Forms
+@@ -449,7 +449,7 @@ namespace KeePass.Forms
  					m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
  
  				Icon icoDisposable, icoAssignable;
@@ -459,7 +460,7 @@ Forwarded: not-needed
  					ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
  				m_ntfTray.Icon = icoAssignable;
  				if(icoDisposable != null) icoDisposable.Dispose();
-@@ -472,7 +472,7 @@ namespace KeePass.Forms
+@@ -473,7 +473,7 @@ namespace KeePass.Forms
  			m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
  
  			Icon icoToDispose, icoToAssign;
@@ -468,7 +469,7 @@ Forwarded: not-needed
  				ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
  				this.Icon = icoToAssign;
  			if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2535,7 +2535,7 @@ namespace KeePass.Forms
+@@ -2544,7 +2544,7 @@ namespace KeePass.Forms
  				m_bTaskbarButtonMessage = true;
  			}
  			// else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
@@ -477,7 +478,7 @@ Forwarded: not-needed
  
  			base.WndProc(ref m);
  		}
-@@ -3541,7 +3541,7 @@ namespace KeePass.Forms
+@@ -3551,7 +3551,7 @@ namespace KeePass.Forms
  					// wasn't fully constructed at that time yet)
  					// if(IsFileLocked(null))
  					//	TaskbarList.SetOverlayIcon(this,
@@ -629,3 +630,14 @@ Forwarded: not-needed
  			this.Text = KPRes.UrlSchemeOverrides;
  
  			UIUtil.SetExplorerTheme(m_lvOverrides, false);
+--- a/KeePass/Forms/XmlReplaceForm.cs
++++ b/KeePass/Forms/XmlReplaceForm.cs
+@@ -62,7 +62,7 @@ namespace KeePass.Forms
+ 				KeePass.Properties.Resources.B48x48_Binary, KPRes.XmlReplace,
+ 				KPRes.XmlReplaceDesc);
+ 
+-			this.Icon = Properties.Resources.KeePass;
++			this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+ 			this.Text = KPRes.XmlReplace;
+ 
+ 			Bitmap bmpBig = SystemIcons.Warning.ToBitmap();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/keepass2.git