[Pkg-cli-apps-commits] [keepass2] 03/04: refresh patches
Julian Taylor
jtaylor.debian at googlemail.com
Sat Oct 21 12:31:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch master
in repository keepass2.
commit 2c882ae4b8245b8bfbeaf155951776b2977a7c6b
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sat Oct 21 13:46:29 2017 +0200
refresh patches
---
debian/patches/disable-clipboard-workaround.patch | 2 +-
debian/patches/do-not-use-the-non-free-icons.patch | 28 +++++++++++-----------
debian/patches/dont-display-as-dev-version.patch | 2 +-
debian/patches/force_toolsversion_4 | 4 ++--
debian/patches/skip-sgen-run-during-build.patch | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/debian/patches/disable-clipboard-workaround.patch b/debian/patches/disable-clipboard-workaround.patch
index 6f1f533..9cf8fe1 100644
--- a/debian/patches/disable-clipboard-workaround.patch
+++ b/debian/patches/disable-clipboard-workaround.patch
@@ -13,7 +13,7 @@ Index: keepass2/KeePassLib/Utility/MonoWorkarounds.cs
===================================================================
--- keepass2.orig/KeePassLib/Utility/MonoWorkarounds.cs
+++ keepass2/KeePassLib/Utility/MonoWorkarounds.cs
-@@ -174,7 +174,7 @@ namespace KeePassLib.Utility
+@@ -198,7 +198,7 @@ namespace KeePassLib.Utility
// g_fOwnWindow = fOwnWindow;
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 d836888..a8e9d23 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -4,14 +4,14 @@ Subject: do not use the non-free icons
Forwarded: not-needed
---
- KeePass/Properties/Resources.resx | 83 ++++++++++++++++++++-------------------
- 1 file changed, 43 insertions(+), 40 deletions(-)
+ KeePass/Properties/Resources.resx | 80 +++++++++++++++++++--------------------
+ 1 file changed, 40 insertions(+), 40 deletions(-)
Index: keepass2/KeePass/Properties/Resources.resx
===================================================================
--- keepass2.orig/KeePass/Properties/Resources.resx
+++ keepass2/KeePass/Properties/Resources.resx
-@@ -401,40 +404,40 @@
+@@ -401,40 +401,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>
-@@ -446,22 +449,22 @@
+@@ -446,22 +446,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>
-@@ -470,10 +473,10 @@
+@@ -470,10 +470,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>
-@@ -500,13 +503,13 @@
+@@ -500,13 +500,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>
-@@ -521,13 +524,13 @@
+@@ -521,13 +521,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>
-@@ -536,13 +539,13 @@
+@@ -536,13 +536,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>
-@@ -551,19 +554,19 @@
+@@ -551,19 +551,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>
-@@ -578,13 +581,13 @@
+@@ -578,13 +578,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">
@@ -197,7 +197,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</data>
<data name="B16x16_MenuCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\B16x16_MenuCheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -626,19 +629,19 @@
+@@ -626,19 +626,19 @@
<value>..\Resources\Nuvola_Derived\B16x16_Folder_New_Ex.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_NPassword" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -221,9 +221,9 @@ Index: keepass2/KeePass/Properties/Resources.resx
</data>
<data name="KeePass_G" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icons\KeePass_G.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -661,4 +664,4 @@
- <data name="KeePass" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Icons\KeePass.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+@@ -664,4 +664,4 @@
+ <data name="B48x35_WritingHand" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Images\B48x35_WritingHand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
-</root>
\ No newline at end of file
diff --git a/debian/patches/dont-display-as-dev-version.patch b/debian/patches/dont-display-as-dev-version.patch
index 82d7b21..acd2eb4 100644
--- a/debian/patches/dont-display-as-dev-version.patch
+++ b/debian/patches/dont-display-as-dev-version.patch
@@ -11,7 +11,7 @@ Index: keepass2/KeePass/Program.cs
===================================================================
--- keepass2.orig/KeePass/Program.cs
+++ keepass2/KeePass/Program.cs
-@@ -776,7 +776,7 @@ namespace KeePass
+@@ -779,7 +779,7 @@ namespace KeePass
Assembly asm = Assembly.GetExecutingAssembly();
byte[] pk = asm.GetName().GetPublicKeyToken();
string strPk = MemUtil.ByteArrayToHexString(pk);
diff --git a/debian/patches/force_toolsversion_4 b/debian/patches/force_toolsversion_4
index 264fc57..8cf624e 100644
--- a/debian/patches/force_toolsversion_4
+++ b/debian/patches/force_toolsversion_4
@@ -30,7 +30,7 @@ Index: keepass2/KeePass/KeePass.csproj
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -1407,4 +1407,4 @@
+@@ -1416,4 +1416,4 @@
<Target Name="AfterBuild">
</Target>
-->
@@ -47,7 +47,7 @@ Index: keepass2/KeePassLib/KeePassLib.csproj
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -161,4 +161,4 @@
+@@ -163,4 +163,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 1897c7b..f38307b 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
-@@ -1407,7 +1407,4 @@
+@@ -1416,7 +1416,4 @@
<Target Name="AfterBuild">
</Target>
-->
--
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