[Pkg-cli-apps-commits] [keepass2] 04/04: dont-display-as-dev-version.patch: don't display as development snapshot due recompile

[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 89d3fb95dee48340f8531ec3997eab6c79cb3da9
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue Jan 10 17:01:51 2017 +0100

    dont-display-as-dev-version.patch: don't display as development snapshot due recompile
---
 debian/changelog                                 |  2 ++
 debian/patches/dont-display-as-dev-version.patch | 22 ++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0e2e10c..5414ea2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 keepass2 (2.35+dfsg-1) unstable; urgency=medium
 
   * New upstream release
+  * dont-display-as-dev-version.patch:
+    don't display as development snapshot due use of different signing key
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 10 Jan 2017 15:48:32 +0100
 
diff --git a/debian/patches/dont-display-as-dev-version.patch b/debian/patches/dont-display-as-dev-version.patch
new file mode 100644
index 0000000..acd2eb4
--- /dev/null
+++ b/debian/patches/dont-display-as-dev-version.patch
@@ -0,0 +1,22 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Tue, 10 Jan 2017 17:35:29 +0100
+Subject: dont-display-as-dev-version
+
+The debian key for signing the binaries is not the same as upstreams signig key.
+---
+ KeePass/Program.cs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: keepass2/KeePass/Program.cs
+===================================================================
+--- keepass2.orig/KeePass/Program.cs
++++ keepass2/KeePass/Program.cs
+@@ -779,7 +779,7 @@ namespace KeePass
+ 				Assembly asm = Assembly.GetExecutingAssembly();
+ 				byte[] pk = asm.GetName().GetPublicKeyToken();
+ 				string strPk = MemUtil.ByteArrayToHexString(pk);
+-				return !strPk.Equals("fed2ed7716aecf5c", StrUtil.CaseIgnoreCmp);
++				return false;
+ 			}
+ 			catch(Exception) { Debug.Assert(false); }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 575a03e..cc0894c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix-XSL-search-path.patch
 enable-local-help.patch
 disable-autoupdate-dialog.patch
 force_toolsversion_4
+dont-display-as-dev-version.patch

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