[tango] 01/04: apply the p812_3 upstream patch

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit 63df194c09bc3d9435586f044d8930d5206f20ee
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Feb 6 09:49:17 2014 +0100

    apply the p812_3 upstream patch
---
 debian/patches/0007-fix-upstream-p812_3.patch | 34 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/0007-fix-upstream-p812_3.patch b/debian/patches/0007-fix-upstream-p812_3.patch
new file mode 100644
index 0000000..0da6325
--- /dev/null
+++ b/debian/patches/0007-fix-upstream-p812_3.patch
@@ -0,0 +1,34 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Thu, 6 Feb 2014 09:48:28 +0100
+Subject: fix upstream p812_3
+
+---
+ lib/cpp/client/zmqeventconsumer.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/cpp/client/zmqeventconsumer.cpp b/lib/cpp/client/zmqeventconsumer.cpp
+index 6ebdfc8..3212100 100644
+--- a/lib/cpp/client/zmqeventconsumer.cpp
++++ b/lib/cpp/client/zmqeventconsumer.cpp
+@@ -1879,7 +1879,7 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
+     if (ev_name.find(MODIFIER_DBASE_NO) != string::npos)
+ 		no_db_dev = true;
+ 
+-    for (loop = 0;loop < env_var_fqdn_prefix.size();loop++)
++    for (loop = 0;loop < env_var_fqdn_prefix.size() + 1;loop++)
+     {
+ 
+ //
+@@ -1888,10 +1888,10 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
+ 
+ 		string new_tango_host;
+ 
+-		if (no_db_dev == true)
++		if (loop == 0 || no_db_dev == true)
+ 			new_tango_host = ev_name;
+ 		else
+-			new_tango_host = env_var_fqdn_prefix[loop] + canon_ev_name;
++			new_tango_host = env_var_fqdn_prefix[loop - 1] + canon_ev_name;
+ 
+         ipos = event_callback_map.find(new_tango_host);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e6aeb4c..e89d79e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-fix-upstream-p812_1.diff.patch
 0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
 0006-fix-upstream-p812_2.patch
+0007-fix-upstream-p812_3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git