[Pkg-cli-apps-commits] [smuxi] 02/05: remove applied upstream patch

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository smuxi.

commit 41d259b94cd2c7fdc30e4f61b2b88f07d8e43d33
Author: Victor Seva <vseva at sipwise.com>
Date:   Fri Dec 18 23:42:10 2015 +0100

    remove applied upstream patch
---
 debian/patches/series                              |  4 ---
 ...ot-expose-the-user-s-realname-automatical.patch | 33 ----------------------
 2 files changed, 37 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index b56197f..c46fdca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-# upstream fixes
-# Closes: #779803
-upstream/0001-Engine-do-not-expose-the-user-s-realname-automatical.patch
-##
 fix_reautogen.patch
 build_Newtonsoft.Json_with_default_compiler.patch
 build_Twitterizer2_with_default_compiler.patch
diff --git a/debian/patches/upstream/0001-Engine-do-not-expose-the-user-s-realname-automatical.patch b/debian/patches/upstream/0001-Engine-do-not-expose-the-user-s-realname-automatical.patch
deleted file mode 100644
index 0ccf71b..0000000
--- a/debian/patches/upstream/0001-Engine-do-not-expose-the-user-s-realname-automatical.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f21cc42e087e93f621b1a368770f46e41d6cff2f Mon Sep 17 00:00:00 2001
-From: Mirco Bauer <meebey at meebey.net>
-Date: Tue, 25 Aug 2015 18:16:41 +0200
-Subject: [PATCH] Engine: do not expose the user's realname automatically
- (refs: #541)
-
-This is only a short term workaround. The user should have the option to use
-their realname obtained from the operating system, but only after reviewing and
-acknowledging that setting. This can be done using a dialog for the first start
-which #541 wants to do.
-
-This user information leak was also filed as [#779803][] in the Debian BTS.
-
- [#779803]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779803
----
- src/Engine/Config/Config.cs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Engine/Config/Config.cs b/src/Engine/Config/Config.cs
-index bc962a7..1ed1c1d 100644
---- a/src/Engine/Config/Config.cs
-+++ b/src/Engine/Config/Config.cs
-@@ -471,6 +471,7 @@ namespace Smuxi.Engine
-                 if (String.IsNullOrEmpty(realname)) {
-                     realname = "Your Name";
-                 }
-+                realname = "Your Name";
-                 LoadUserEntry(user, "Connection/Realname", realname);
-                 LoadUserEntry(user, "Connection/Encoding", String.Empty);
- 
--- 
-2.5.0
-

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