[Pkg-cli-apps-commits] [keepass2] 03/05: refresh patches
Julian Taylor
jtaylor.debian at googlemail.com
Sun Apr 26 17:53:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch master
in repository keepass2.
commit 2c5836536fe26b0f33be59ee514cf32c2a6991d1
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Apr 26 19:32:45 2015 +0200
refresh patches
---
debian/patches/do-not-use-the-non-free-icons.patch | 16 ++++++++--------
debian/patches/skip-sgen-run-during-build.patch | 2 +-
debian/patches/use-installed-ico-files.patch | 14 +++++++-------
3 files changed, 16 insertions(+), 16 deletions(-)
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 66eacb7..4925793 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -11,7 +11,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
===================================================================
--- keepass2.orig/KeePass/Properties/Resources.resx
+++ keepass2/KeePass/Properties/Resources.resx
-@@ -407,40 +407,40 @@
+@@ -404,40 +404,40 @@
<value>..\Resources\Nuvola\B48x48_Run.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_AmP" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -63,7 +63,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</data>
<data name="B16x16_File_SaveAll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola_Derived\B16x16_File_SaveAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -452,22 +452,22 @@
+@@ -449,22 +449,22 @@
<value>..\Resources\Nuvola_Derived\B16x16_File_Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_PwTresor" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -91,7 +91,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</data>
<data name="B16x16_Make_KDevelop" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola\B16x16_Make_KDevelop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -476,10 +476,10 @@
+@@ -473,10 +473,10 @@
<value>..\Resources\Nuvola\B48x48_Make_KDevelop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_OnePwPro" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -104,7 +104,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</data>
<data name="B16x16_FontBold" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\B16x16_FontBold.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -515,13 +515,13 @@
+@@ -503,13 +503,13 @@
<value>..\Resources\Images\B16x16_Imp_KeePassX.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_HandySafe" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -121,7 +121,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</data>
<data name="B48x48_View_Detailed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola\B48x48_View_Detailed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -536,13 +536,13 @@
+@@ -524,13 +524,13 @@
<value>..\Resources\Icons\LockOverlay.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_PwPrompter" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -138,7 +138,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -551,13 +551,13 @@
+@@ -539,13 +539,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">
@@ -155,7 +155,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -566,19 +566,19 @@
+@@ -554,19 +554,19 @@
<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">
@@ -180,7 +180,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -593,13 +593,13 @@
+@@ -581,13 +581,13 @@
<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">
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 1ca8c25..ab81aad 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -11,7 +11,7 @@ Index: keepass2/KeePass/KeePass.csproj
===================================================================
--- keepass2.orig/KeePass/KeePass.csproj
+++ keepass2/KeePass/KeePass.csproj
-@@ -1304,7 +1304,4 @@
+@@ -1315,7 +1315,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index 1059bb2..04f3555 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -93,7 +93,7 @@ Index: keepass2/KeePass/Forms/CharPickerForm.cs
===================================================================
--- keepass2.orig/KeePass/Forms/CharPickerForm.cs
+++ keepass2/KeePass/Forms/CharPickerForm.cs
-@@ -133,7 +133,7 @@ namespace KeePass.Forms
+@@ -134,7 +134,7 @@ namespace KeePass.Forms
m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
@@ -340,7 +340,7 @@ Index: keepass2/KeePass/Forms/FieldRefForm.cs
===================================================================
--- keepass2.orig/KeePass/Forms/FieldRefForm.cs
+++ keepass2/KeePass/Forms/FieldRefForm.cs
-@@ -68,7 +68,7 @@ namespace KeePass.Forms
+@@ -71,7 +71,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -496,7 +496,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
===================================================================
--- keepass2.orig/KeePass/Forms/MainForm_Functions.cs
+++ keepass2/KeePass/Forms/MainForm_Functions.cs
-@@ -427,18 +427,18 @@ namespace KeePass.Forms
+@@ -423,18 +423,18 @@ namespace KeePass.Forms
strNtfText = strNtfPre + strFileDesc;
Icon icoDisposable, icoAssignable;
@@ -518,7 +518,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -461,7 +461,7 @@ namespace KeePass.Forms
+@@ -457,7 +457,7 @@ namespace KeePass.Forms
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -527,7 +527,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -486,7 +486,7 @@ namespace KeePass.Forms
+@@ -482,7 +482,7 @@ namespace KeePass.Forms
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
@@ -551,7 +551,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
return;
}
-@@ -3700,7 +3700,7 @@ namespace KeePass.Forms
+@@ -3717,7 +3717,7 @@ namespace KeePass.Forms
// wasn't fully constructed at that time yet)
// if(IsFileLocked(null))
// TaskbarList.SetOverlayIcon(this,
@@ -616,7 +616,7 @@ Index: keepass2/KeePass/Forms/PwEntryForm.cs
===================================================================
--- keepass2.orig/KeePass/Forms/PwEntryForm.cs
+++ keepass2/KeePass/Forms/PwEntryForm.cs
-@@ -654,7 +654,7 @@ namespace KeePass.Forms
+@@ -652,7 +652,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
More information about the Pkg-cli-apps-commits
mailing list