[Pkg-cli-apps-commits] [keepass2] 02/04: New upstream release (LP: #1116512)

[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 59e56620da4f4ece077fa2cfeb8f411cfff04bae
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Nov 3 20:03:00 2013 +0100

    New upstream release (LP: #1116512)
---
 debian/changelog                                   |    6 ++++++
 debian/patches/do-not-use-the-non-free-icons.patch |   11 +++++++----
 debian/patches/skip-sgen-run-during-build.patch    |    2 +-
 debian/patches/use-installed-ico-files.patch       |    8 ++++----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1d2f9c..3ccb103 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+keepass2 (2.24+dfsg-1) unstable; urgency=low
+
+  * New upstream release (LP: #1116512)
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 03 Nov 2013 20:00:42 +0100
+
 keepass2 (2.23+dfsg-1) unstable; urgency=low
 
   * New upstream release
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 24cba13..8e27bf3 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -4,8 +4,8 @@ Subject: do not use the non-free icons
 
 Forwarded: not-needed
 ---
- KeePass/Properties/Resources.resx | 66 +++++++++++++++++++--------------------
- 1 file changed, 33 insertions(+), 33 deletions(-)
+ KeePass/Properties/Resources.resx | 68 +++++++++++++++++++--------------------
+ 1 file changed, 34 insertions(+), 34 deletions(-)
 
 --- a/KeePass/Properties/Resources.resx
 +++ b/KeePass/Properties/Resources.resx
@@ -178,10 +178,13 @@ Forwarded: not-needed
    </data>
    <data name="B16x16_Folder_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
      <value>..\Resources\Nuvola_Derived\B16x16_Folder_2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -598,4 +598,4 @@
-   <data name="MostPopularPasswords" type="System.Resources.ResXFileRef, System.Windows.Forms">
+@@ -599,6 +599,6 @@
      <value>..\Resources\Data\MostPopularPasswords.txt.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </data>
+   <data name="B16x16_Imp_NortonIdSafe" type="System.Resources.ResXFileRef, System.Windows.Forms">
+-    <value>..\Resources\Images\B16x16_Imp_NortonIdSafe.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/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index b051c6f..beddcae 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
-@@ -1264,7 +1264,4 @@
+@@ -1268,7 +1268,4 @@
    <Target Name="AfterBuild">
    </Target>
    -->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index 334f995..ce123d5 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -108,7 +108,7 @@ Forwarded: not-needed
  			int nWidth = (m_lvColumns.ClientRectangle.Width -
 --- a/KeePass/Forms/CsvImportForm.cs
 +++ b/KeePass/Forms/CsvImportForm.cs
-@@ -108,7 +108,7 @@ namespace KeePass.Forms
+@@ -109,7 +109,7 @@ namespace KeePass.Forms
  
  			GlobalWindowManager.AddWindow(this);
  
@@ -468,7 +468,7 @@ Forwarded: not-needed
  				ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
  				this.Icon = icoToAssign;
  			if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2548,7 +2548,7 @@ namespace KeePass.Forms
+@@ -2556,7 +2556,7 @@ namespace KeePass.Forms
  				m_bTaskbarButtonMessage = true;
  			}
  			// else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
@@ -477,7 +477,7 @@ Forwarded: not-needed
  
  			base.WndProc(ref m);
  		}
-@@ -3546,7 +3546,7 @@ namespace KeePass.Forms
+@@ -3573,7 +3573,7 @@ namespace KeePass.Forms
  					// wasn't fully constructed at that time yet)
  					// if(IsFileLocked(null))
  					//	TaskbarList.SetOverlayIcon(this,
@@ -532,7 +532,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 @@ namespace KeePass.Forms
+@@ -586,7 +586,7 @@ namespace KeePass.Forms
  
  			BannerFactory.CreateBannerEx(this, m_bannerImage,
  				KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);

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