[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.18+dfsg-1-1-gb3650d3
Julian Taylor
jtaylor.debian at googlemail.com
Fri Jan 6 12:08:04 UTC 2012
The following commit has been merged in the master branch:
commit b3650d3603f404b8b51dd37ffb0e47c5854cd163
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Fri Jan 6 13:06:12 2012 +0100
remove the useless git hashs from the patches
done by refreshing all with:
QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
diff --git a/debian/patches/disable-autoupdate-dialog.patch b/debian/patches/disable-autoupdate-dialog.patch
index f078668..c30041d 100644
--- a/debian/patches/disable-autoupdate-dialog.patch
+++ b/debian/patches/disable-autoupdate-dialog.patch
@@ -8,11 +8,9 @@ Forwarded: not-needed
KeePass/App/Configuration/AceApplication.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/KeePass/App/Configuration/AceApplication.cs b/KeePass/App/Configuration/AceApplication.cs
-index 922c750..e61c025 100644
--- a/KeePass/App/Configuration/AceApplication.cs
+++ b/KeePass/App/Configuration/AceApplication.cs
-@@ -193,8 +193,8 @@ namespace KeePass.App.Configuration
+@@ -193,8 +193,8 @@
set { m_bCheckForUpdate = value; }
}
@@ -23,4 +21,3 @@ index 922c750..e61c025 100644
public bool CheckForUpdateConfigured
{
get { return m_bCheckForUpdateCfg; }
---
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 2652cfd..5d20ff3 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -7,8 +7,6 @@ Forwarded: not-needed
KeePass/Properties/Resources.resx | 56 ++++++++++++++++++------------------
1 files changed, 28 insertions(+), 28 deletions(-)
-diff --git a/KeePass/Properties/Resources.resx b/KeePass/Properties/Resources.resx
-index 165f24f..ec8b31b 100644
--- a/KeePass/Properties/Resources.resx
+++ b/KeePass/Properties/Resources.resx
@@ -416,43 +416,43 @@
@@ -159,4 +157,3 @@ index 165f24f..ec8b31b 100644
</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>
---
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
index 6ee0182..9a8ee58 100644
--- a/debian/patches/enable-local-help.patch
+++ b/debian/patches/enable-local-help.patch
@@ -9,11 +9,9 @@ Forwarded: not-needed
KeePass/App/AppHelp.cs | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
-diff --git a/KeePass/App/AppHelp.cs b/KeePass/App/AppHelp.cs
-index e6c2d61..0400844 100644
--- a/KeePass/App/AppHelp.cs
+++ b/KeePass/App/AppHelp.cs
-@@ -58,7 +58,7 @@ namespace KeePass.App
+@@ -58,7 +58,7 @@
{
if(m_strLocalHelpFile == null) return false;
@@ -22,7 +20,7 @@ index e6c2d61..0400844 100644
catch(Exception) { }
return false;
}
-@@ -114,14 +114,13 @@ namespace KeePass.App
+@@ -114,14 +114,13 @@
private static void ShowHelpLocal(string strTopic, string strSection)
{
Debug.Assert(m_strLocalHelpFile != null);
@@ -42,7 +40,7 @@ index e6c2d61..0400844 100644
if(strSection != null)
{
-@@ -129,12 +128,10 @@ namespace KeePass.App
+@@ -129,12 +128,10 @@
strCmd += @"#" + strSection;
}
@@ -57,4 +55,3 @@ index e6c2d61..0400844 100644
}
}
---
diff --git a/debian/patches/fix-XSL-search-path.patch b/debian/patches/fix-XSL-search-path.patch
index 9bc2ff0..6a81e55 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -10,11 +10,9 @@ Forwarded: not-needed
KeePass/Forms/AboutForm.cs | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
-diff --git a/KeePass/App/AppDefs.cs b/KeePass/App/AppDefs.cs
-index 8d3a12b..6de99da 100644
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
-@@ -36,6 +36,8 @@ namespace KeePass.App
+@@ -36,6 +36,8 @@
public static readonly Color ColorControlDisabled = SystemColors.Control;
public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
@@ -23,11 +21,9 @@ index 8d3a12b..6de99da 100644
public const string XslFilesDir = "XSL";
public const string XslFileHtmlLite = "KDB4_DetailsLite.xsl";
public const string XslFileHtmlFull = "KDB4_DetailsFull.xsl";
-diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index 63a72e2..2e7ff32 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
-@@ -92,8 +92,7 @@ namespace KeePass.Forms
+@@ -92,8 +92,7 @@
m_lvComponents.Items.Add(lvi);
lvi = new ListViewItem(KPRes.XslStylesheets);
@@ -37,4 +33,3 @@ index 63a72e2..2e7ff32 100644
strPath += AppDefs.XslFilesDir;
strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlLite);
---
diff --git a/debian/patches/remove-ToolsVersion-3.5.patch b/debian/patches/remove-ToolsVersion-3.5.patch
index bab483d..100f0c9 100644
--- a/debian/patches/remove-ToolsVersion-3.5.patch
+++ b/debian/patches/remove-ToolsVersion-3.5.patch
@@ -8,8 +8,6 @@ Forwarded: not-needed
KeePass/KeePass.csproj | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 3bcc038..73891d6 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -1,4 +1,4 @@
@@ -18,4 +16,3 @@ index 3bcc038..73891d6 100644
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
---
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index c1f57dc..36b9a0f 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -7,11 +7,9 @@ Forwarded: not-needed
KeePass/KeePass.csproj | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
-diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 7ee2266..3bcc038 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
-@@ -1241,7 +1241,4 @@
+@@ -1240,7 +1240,4 @@
<Target Name="AfterBuild">
</Target>
-->
@@ -20,4 +18,3 @@ index 7ee2266..3bcc038 100644
- </PropertyGroup>
</Project>
\ No newline at end of file
---
diff --git a/debian/patches/use-the-mono-signing-key.patch b/debian/patches/use-the-mono-signing-key.patch
index d699046..4c45d94 100644
--- a/debian/patches/use-the-mono-signing-key.patch
+++ b/debian/patches/use-the-mono-signing-key.patch
@@ -8,8 +8,6 @@ Forwarded: not-needed
KeePassLib/KeePassLib.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 9cd0069..7ee2266 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
@@ -21,8 +19,6 @@ index 9cd0069..7ee2266 100644
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
-diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
-index 016e0c1..caeae4d 100644
--- a/KeePassLib/KeePassLib.csproj
+++ b/KeePassLib/KeePassLib.csproj
@@ -10,7 +10,7 @@
@@ -34,4 +30,3 @@ index 016e0c1..caeae4d 100644
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
---
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
index 77c9d82..f9f634f 100644
--- a/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
+++ b/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
@@ -7,11 +7,9 @@ for some reason unicode codes works better
KeePass/Util/SendInputEx.Unix.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
-diff --git a/KeePass/Util/SendInputEx.Unix.cs b/KeePass/Util/SendInputEx.Unix.cs
-index e30599f..c9ee4a3 100644
--- a/KeePass/Util/SendInputEx.Unix.cs
+++ b/KeePass/Util/SendInputEx.Unix.cs
-@@ -181,9 +181,11 @@ namespace KeePass.Util
+@@ -181,9 +181,11 @@
if(strString.Length == 0) return;
if(kMod != Keys.None)
@@ -25,4 +23,3 @@ index e30599f..c9ee4a3 100644
ClearModifiers(ref kMod);
}
---
--
keepass2
More information about the Pkg-cli-apps-commits
mailing list