[Pkg-cli-apps-commits] [keepass2] 02/02: New upstream release (Closes: #738056)
Julian Taylor
jtaylor.debian at googlemail.com
Sun Feb 16 13:12:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch master
in repository keepass2.
commit 28ca44f7633cd0717d6eea62137485465e73d8ae
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Feb 16 13:31:01 2014 +0100
New upstream release (Closes: #738056)
---
debian/changelog | 6 ++++++
debian/patches/do-not-use-the-non-free-icons.patch | 10 ++++++---
debian/patches/series | 1 -
debian/patches/skip-sgen-run-during-build.patch | 2 +-
debian/patches/use-installed-ico-files.patch | 18 ++++++++--------
...-issues-with-autotype-and-keyboard-layout.patch | 25 ----------------------
6 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f4e13ba..8daf1d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+keepass2 (2.25+dfsg-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #738056)
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Sun, 16 Feb 2014 13:29:51 +0100
+
keepass2 (2.24+dfsg-1) unstable; urgency=low
* New upstream release (LP: #1116512)
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 8e27bf3..8cf6de4 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 | 68 +++++++++++++++++++--------------------
- 1 file changed, 34 insertions(+), 34 deletions(-)
+ KeePass/Properties/Resources.resx | 70 +++++++++++++++++++--------------------
+ 1 file changed, 35 insertions(+), 35 deletions(-)
--- a/KeePass/Properties/Resources.resx
+++ b/KeePass/Properties/Resources.resx
@@ -178,13 +178,17 @@ 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>
-@@ -599,6 +599,6 @@
+@@ -599,9 +599,9 @@
<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>
+ <data name="B16x16_Imp_Dashlane" type="System.Resources.ResXFileRef, System.Windows.Forms">
+- <value>..\Resources\Images\B16x16_Imp_Dashlane.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/series b/debian/patches/series
index 8e07c9a..f2fef72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,4 @@ skip-sgen-run-during-build.patch
fix-XSL-search-path.patch
remove-ToolsVersion-3.5.patch
enable-local-help.patch
-work-around-issues-with-autotype-and-keyboard-layout.patch
disable-autoupdate-dialog.patch
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index beddcae..b147e72 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
-@@ -1268,7 +1268,4 @@
+@@ -1287,7 +1287,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index ce123d5..aa39eac 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -119,7 +119,7 @@ Forwarded: not-needed
// FontUtil.AssignDefaultBold(m_grpSyntax);
--- a/KeePass/Forms/DataEditorForm.cs
+++ b/KeePass/Forms/DataEditorForm.cs
-@@ -92,7 +92,7 @@ namespace KeePass.Forms
+@@ -93,7 +93,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -130,15 +130,15 @@ Forwarded: not-needed
string strRect = Program.Config.UI.DataEditorRect;
--- a/KeePass/Forms/DataViewerForm.cs
+++ b/KeePass/Forms/DataViewerForm.cs
-@@ -84,7 +84,7 @@ namespace KeePass.Forms
+@@ -91,7 +91,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+ string strTitle = PwDefs.ShortProductName + " " + KPRes.DataViewer;
if(m_strDataDesc.Length > 0)
- this.Text = m_strDataDesc + " - " + this.Text;
--- a/KeePass/Forms/DatabaseOperationsForm.cs
+++ b/KeePass/Forms/DatabaseOperationsForm.cs
@@ -61,7 +61,7 @@ namespace KeePass.Forms
@@ -427,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
-@@ -423,19 +423,19 @@ namespace KeePass.Forms
+@@ -412,19 +412,19 @@ namespace KeePass.Forms
strNtfText = strNtfPre + strFileDesc;
Icon icoDisposable, icoAssignable;
@@ -450,7 +450,7 @@ Forwarded: not-needed
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -459,7 +459,7 @@ namespace KeePass.Forms
+@@ -448,7 +448,7 @@ namespace KeePass.Forms
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -459,7 +459,7 @@ Forwarded: not-needed
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -483,7 +483,7 @@ namespace KeePass.Forms
+@@ -472,7 +472,7 @@ namespace KeePass.Forms
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
@@ -468,7 +468,7 @@ Forwarded: not-needed
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2556,7 +2556,7 @@ namespace KeePass.Forms
+@@ -2535,7 +2535,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);
}
-@@ -3573,7 +3573,7 @@ namespace KeePass.Forms
+@@ -3541,7 +3541,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
-@@ -586,7 +586,7 @@ namespace KeePass.Forms
+@@ -597,7 +597,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
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
deleted file mode 100644
index 3c46dcc..0000000
--- a/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Tue, 25 Oct 2011 21:08:14 +0200
-Subject: work around issues with autotype and keyboard layouts
-
-for some reason unicode codes works better
----
- KeePass/Util/SendInputEx.Unix.cs | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/KeePass/Util/SendInputEx.Unix.cs
-+++ b/KeePass/Util/SendInputEx.Unix.cs
-@@ -181,9 +181,11 @@ namespace KeePass.Util
- if(strString.Length == 0) return;
-
- if(kMod != Keys.None)
-- NativeMethods.RunXDoTool(@"type '" + strString + @"'");
-+ foreach(char c in strString)
-+ NativeMethods.RunXDoTool(@"key U" + ((int)c).ToString("x4"));
- else
-- NativeMethods.RunXDoTool(@"type --clearmodifiers '" + strString + @"'");
-+ foreach(char c in strString)
-+ NativeMethods.RunXDoTool(@"key --clearmodifiers U" + ((int)c).ToString("x4"));
-
- ClearModifiers(ref kMod);
- }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/keepass2.git
More information about the Pkg-cli-apps-commits
mailing list