[tango] 05/21: remove un-needed patches

Frédéric-Emmanuel Picca picca at moszumanska.debian.org
Fri Jan 15 15:59:40 UTC 2016


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

picca pushed a commit to branch master
in repository tango.

commit 48b6a9ad6952ad0e607b5fc85bcdef29e6aa515b
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Oct 8 15:16:12 2015 +0200

    remove un-needed patches
    
    Conflicts:
    	debian/patches/series
---
 debian/changelog                                   |   6 +
 debian/patches/0004-fix-upstream-p812_1.diff.patch |  63 -------
 debian/patches/0006-fix-upstream-p812_2.patch      | 146 ---------------
 debian/patches/0007-fix-upstream-p812_3.patch      |  34 ----
 debian/patches/0008-fix-upstream-p812_4.patch      | 205 ---------------------
 debian/patches/series                              |   5 -
 6 files changed, 6 insertions(+), 453 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d596c1..ce40084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,12 @@ tango (9.1.0~rc1+dfsg-1) UNRELEASED; urgency=medium
   * debian/copyright
     - updated for tango9
     - repack using Files-Excluded
+  * debian/patches
+    - deleted (applyed upstream)
+      - 0004-fix-upstream-p812_1.diff.patch
+      - 0006-fix-upstream-p812_2.patch
+      - 0007-fix-upstream-p812_3.patch
+      - 0008-fix-upsteam-p812_4.patch
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Thu, 02 Jul 2015 10:48:59 +0200
 
diff --git a/debian/patches/0004-fix-upstream-p812_1.diff.patch b/debian/patches/0004-fix-upstream-p812_1.diff.patch
deleted file mode 100644
index a87dae1..0000000
--- a/debian/patches/0004-fix-upstream-p812_1.diff.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Tue, 3 Sep 2013 20:10:47 +0200
-Subject: fix upstream p812_1.diff
-
----
- lib/cpp/server/eventcmds.cpp  |  4 +++-
- lib/cpp/server/pollthread.cpp | 10 ++++++++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/lib/cpp/server/eventcmds.cpp b/lib/cpp/server/eventcmds.cpp
-index cb3cc75..2d642cb 100644
---- a/lib/cpp/server/eventcmds.cpp
-+++ b/lib/cpp/server/eventcmds.cpp
-@@ -539,8 +539,8 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa
- 								(const char *)"DServer::zmq_event_subscription_change");
-     }
- 
--    Tango::DevVarLongStringArray *ret_data = new Tango::DevVarLongStringArray();
-     Tango::Util *tg = Tango::Util::instance();
-+	Tango::DevVarLongStringArray *ret_data;
- 
-     if (argin->length() == 1)
-     {
-@@ -561,6 +561,7 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa
- // It's just the call to help debugging. Returns event configuration
- //
- 
-+		ret_data = new Tango::DevVarLongStringArray();
-         ret_data->svalue.length(2);
- 
-         ZmqEventSupplier *ev;
-@@ -735,6 +736,7 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa
- // Init data returned by command
- //
- 
-+		ret_data = new Tango::DevVarLongStringArray();
-         ret_data->lvalue.length(6);
-         ret_data->svalue.length(2);
- 
-diff --git a/lib/cpp/server/pollthread.cpp b/lib/cpp/server/pollthread.cpp
-index bf67011..ffc3fde 100644
---- a/lib/cpp/server/pollthread.cpp
-+++ b/lib/cpp/server/pollthread.cpp
-@@ -1038,11 +1038,17 @@ void PollThread::tune_list(bool from_needed, long min_delta)
- 			WorkItem wo = *ite;
- 			Tango::DevULong64 next_work = ((Tango::DevULong64)wo.wake_up_date.tv_sec * 1000000LL) + (Tango::DevULong64)wo.wake_up_date.tv_usec;
- 
-+			Tango::DevULong64 next_prev;
- 			if (next_work < next_tuning)
- 			{
- 				Tango::DevULong64 prev_obj_work = ((Tango::DevULong64)ite_prev->wake_up_date.tv_sec * 1000000LL) + (Tango::DevULong64)ite_prev->wake_up_date.tv_usec;
--				Tango::DevULong64 n = (next_work - prev_obj_work) / ((Tango::DevULong64)ite_prev->update * 1000LL);
--				Tango::DevULong64 next_prev = prev_obj_work + (n * (ite_prev->update * 1000LL));
-+				if (next_work > prev_obj_work)
-+				{
-+					Tango::DevULong64 n = (next_work - prev_obj_work) / ((Tango::DevULong64)ite_prev->update * 1000LL);
-+					next_prev = prev_obj_work + (n * (ite_prev->update * 1000LL));
-+				}
-+				else
-+					next_prev = prev_obj_work;
- 
- 				wo.wake_up_date.tv_sec = (long)(next_prev / 1000000LL);
- 				wo.wake_up_date.tv_usec = (long)(next_prev % 1000000LL);
diff --git a/debian/patches/0006-fix-upstream-p812_2.patch b/debian/patches/0006-fix-upstream-p812_2.patch
deleted file mode 100644
index fafe50a..0000000
--- a/debian/patches/0006-fix-upstream-p812_2.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Mon, 25 Nov 2013 20:41:39 +0100
-Subject: fix upstream p812_2
-
----
- lib/cpp/client/api_util.cpp         |  4 ++++
- lib/cpp/client/event.cpp            | 11 ++++++-----
- lib/cpp/client/eventconsumer.h      |  1 +
- lib/cpp/client/eventkeepalive.cpp   |  9 +++++++++
- lib/cpp/client/zmqeventconsumer.cpp | 21 ++++++++++++++++-----
- 5 files changed, 36 insertions(+), 10 deletions(-)
-
-diff --git a/lib/cpp/client/api_util.cpp b/lib/cpp/client/api_util.cpp
-index 6e38825..3ed6d83 100644
---- a/lib/cpp/client/api_util.cpp
-+++ b/lib/cpp/client/api_util.cpp
-@@ -257,6 +257,10 @@ void ApiUtil::create_orb()
- 
- 	if (sigaction(SIGPIPE,NULL,&sa) == -1)
- 		sa.sa_handler = NULL;
-+#else
-+	WORD rel = 0x0202;
-+	WSADATA dat;
-+	WSAStartup(rel,&dat);
- #endif
- 
- //
-diff --git a/lib/cpp/client/event.cpp b/lib/cpp/client/event.cpp
-index 75b8c33..f3fecf1 100644
---- a/lib/cpp/client/event.cpp
-+++ b/lib/cpp/client/event.cpp
-@@ -202,12 +202,12 @@ EventConsumer::EventConsumer(ApiUtil *api_ptr)
-                         {
-                             break;
-                         }
-+					}
- 
--                        if (j == env_var_fqdn_prefix.size())
--                        {
--                            string prefix = "tango://" + vs[i] + '/';
--                            env_var_fqdn_prefix.push_back(prefix);
--                        }
-+                    if (j == env_var_fqdn_prefix.size())
-+                    {
-+                        string prefix = "tango://" + vs[i] + '/';
-+                        env_var_fqdn_prefix.push_back(prefix);
-                     }
- #endif
-                 }
-@@ -1441,6 +1441,7 @@ int EventConsumer::connect_event(DeviceProxy *device,
-             new_event_callback.device_idl = 0;
-     }
-     new_event_callback.ctr = 0;
-+	new_event_callback.discarded_event = false;
-     if (zmq_used == true)
- 		new_event_callback.endpoint = dvlsa->svalue[1].in();
- 
-diff --git a/lib/cpp/client/eventconsumer.h b/lib/cpp/client/eventconsumer.h
-index f403fb2..20c8604 100644
---- a/lib/cpp/client/eventconsumer.h
-+++ b/lib/cpp/client/eventconsumer.h
-@@ -298,6 +298,7 @@ typedef struct event_callback_zmq
-     DevLong                         device_idl;
-     DevULong                        ctr;
-     string							endpoint;
-+	bool							discarded_event;
- }EventCallBackZmq;
- 
- typedef struct event_callback: public EventCallBackBase, public EventCallBackZmq
-diff --git a/lib/cpp/client/eventkeepalive.cpp b/lib/cpp/client/eventkeepalive.cpp
-index e204fae..2d93241 100644
---- a/lib/cpp/client/eventkeepalive.cpp
-+++ b/lib/cpp/client/eventkeepalive.cpp
-@@ -452,6 +452,10 @@ void EventConsumerKeepAliveThread::reconnect_to_zmq_event(EvChanIte &ipos,EventC
- 
- 						event_consumer->connect_event_system(d_name,epos->second.attr_name,epos->second.event_name,vs,ipos,ecbs,dd);
- 
-+						const DevVarLongStringArray *dvlsa;
-+						dd >> dvlsa;
-+						epos->second.endpoint = dvlsa->svalue[1].in();
-+
- 						cout3 << "Reconnected to ZMQ event" << endl;
- 					}
- 					catch(...)
-@@ -588,6 +592,11 @@ void *EventConsumerKeepAliveThread::run_undetached(TANGO_UNUSED(void *arg))
- 					    {
-                             try
-                             {
-+								if (notifd_event_consumer == NULL)
-+								{
-+									ApiUtil::instance()->create_notifd_event_consumer();
-+									notifd_event_consumer = ApiUtil::instance()->get_notifd_event_consumer();
-+								}
-                                 notifd_event_consumer->connect_event(vpos->device,vpos->attribute,vpos->event_type,
- 																					vpos->callback,
- 																					vpos->ev_queue,
-diff --git a/lib/cpp/client/zmqeventconsumer.cpp b/lib/cpp/client/zmqeventconsumer.cpp
-index 8fa8ce0..6ebdfc8 100644
---- a/lib/cpp/client/zmqeventconsumer.cpp
-+++ b/lib/cpp/client/zmqeventconsumer.cpp
-@@ -859,6 +859,7 @@ bool ZmqEventConsumer::process_ctrl(zmq::message_t &received_ctrl,zmq::pollitem_
-                 event_sub_sock->setsockopt(ZMQ_RCVHWM,&sub_hwm,sizeof(sub_hwm));
- 
-                 event_sub_sock->connect(endpoint);
-+
-                 if (force_connect == 0)
-                     connected_pub.push_back(endpoint);
-             }
-@@ -935,9 +936,10 @@ bool ZmqEventConsumer::process_ctrl(zmq::message_t &received_ctrl,zmq::pollitem_
- 				vector<string>::iterator pos;
- 				pos = find(connected_pub.begin(),connected_pub.end(),endpoint_str);
- 				if (pos != connected_pub.end())
-+				{
- 					connected_pub.erase(pos);
--
--				event_sub_sock->disconnect(endpoint);
-+					event_sub_sock->disconnect(endpoint);
-+				}
- #endif
-             }
-             else
-@@ -1930,12 +1932,21 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
- 			if (missed_event >= 2)
-             {
-                 err_missed_event = true;
-+				evt_cb.discarded_event = false;
-             }
-             else if (missed_event == 0)
-             {
--                map_modification_lock.readerOut();
--                return;
--            }
-+				if (evt_cb.discarded_event == false)
-+				{
-+					evt_cb.discarded_event = true;
-+					map_modification_lock.readerOut();
-+					return;
-+				}
-+				else
-+					evt_cb.discarded_event = false;
-+			}
-+			else
-+				evt_cb.discarded_event = false;
- 
-             evt_cb.ctr = ds_ctr;
- 
diff --git a/debian/patches/0007-fix-upstream-p812_3.patch b/debian/patches/0007-fix-upstream-p812_3.patch
deleted file mode 100644
index 0da6325..0000000
--- a/debian/patches/0007-fix-upstream-p812_3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/0008-fix-upstream-p812_4.patch b/debian/patches/0008-fix-upstream-p812_4.patch
deleted file mode 100644
index 6be32c2..0000000
--- a/debian/patches/0008-fix-upstream-p812_4.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Thu, 17 Jul 2014 10:31:05 +0200
-Subject: fix upstream p812_4
-
----
- lib/cpp/client/event.cpp            |  3 ++-
- lib/cpp/client/eventconsumer.h      |  7 +++--
- lib/cpp/client/eventkeepalive.cpp   |  2 +-
- lib/cpp/client/zmqeventconsumer.cpp | 54 ++++++++++++++++++++++++++-----------
- 4 files changed, 46 insertions(+), 20 deletions(-)
-
-diff --git a/lib/cpp/client/event.cpp b/lib/cpp/client/event.cpp
-index f3fecf1..47625dd 100644
---- a/lib/cpp/client/event.cpp
-+++ b/lib/cpp/client/event.cpp
-@@ -1631,6 +1631,7 @@ void EventConsumer::unsubscribe_event(int event_id)
- 					delete epos->second.callback_monitor;
- 
- 					string deleted_channel_name = epos->second.channel_name;
-+					string deleted_event_endpoint = evt_cb.endpoint;
- 					event_callback_map.erase(epos);
- 
- //
-@@ -1689,7 +1690,7 @@ void EventConsumer::unsubscribe_event(int event_id)
- 								    }
- 								    else
- 								    {
--                                        disconnect_event_channel(deleted_channel_name,evt_ch.endpoint);
-+                                        disconnect_event_channel(deleted_channel_name,evt_ch.endpoint,deleted_event_endpoint);
- 								    }
- 
- 									delete evt_ch.adm_device_proxy;
-diff --git a/lib/cpp/client/eventconsumer.h b/lib/cpp/client/eventconsumer.h
-index 20c8604..7f65bc1 100644
---- a/lib/cpp/client/eventconsumer.h
-+++ b/lib/cpp/client/eventconsumer.h
-@@ -414,7 +414,7 @@ protected :
- 	void get_fire_sync_event(DeviceProxy *,CallBack *,EventQueue *,EventType,string &,const string &,EventCallBackStruct &);
- 
- 	virtual void connect_event_channel(string &,Database *,bool,DeviceData &) = 0;
--    virtual void disconnect_event_channel(TANGO_UNUSED(string &channel_name),TANGO_UNUSED(string &endpoint)) {}
-+    virtual void disconnect_event_channel(TANGO_UNUSED(string &channel_name),TANGO_UNUSED(string &endpoint),TANGO_UNUSED(string &endpoint_event)) {}
-     virtual void connect_event_system(string &,string &,string &e,const vector<string> &,EvChanIte &,EventCallBackStruct &,DeviceData &) = 0;
-     virtual void disconnect_event(string &,string &) {}
- 
-@@ -502,7 +502,7 @@ public :
- protected :
- 	ZmqEventConsumer(ApiUtil *ptr);
- 	virtual void connect_event_channel(string &,Database *,bool,DeviceData &);
--    virtual void disconnect_event_channel(string &channel_name,string &endpoint);
-+    virtual void disconnect_event_channel(string &channel_name,string &endpoint,string &endpoint_event);
-     virtual void connect_event_system(string &,string &,string &e,const vector<string> &,EvChanIte &,EventCallBackStruct &,DeviceData &);
-     virtual void disconnect_event(string &,string &);
- 
-@@ -530,6 +530,7 @@ private :
- 
-     int                                     old_poll_nb;
-     omni_mutex								subscription_mutex;
-+	bool									ctrl_socket_bound;
- 
- 	void *run_undetached(void *arg);
- 	void push_heartbeat_event(string &);
-@@ -540,6 +541,8 @@ private :
-     void process_event(zmq_msg_t &,zmq_msg_t &,zmq_msg_t &,zmq_msg_t &);
-     void multi_tango_host(zmq::socket_t *,SocketCmd,string &);
- 	void print_error_message(const char *mess) {ApiUtil *au=ApiUtil::instance();au->print_error_message(mess);}
-+	void set_ctrl_sock_bound() {subscription_mutex.lock();ctrl_socket_bound=true;subscription_mutex.unlock();}
-+	bool is_ctrl_sock_bound() {bool _b;subscription_mutex.lock();_b=ctrl_socket_bound;subscription_mutex.unlock();return _b;}
- 
-     friend class DelayEvent;
- };
-diff --git a/lib/cpp/client/eventkeepalive.cpp b/lib/cpp/client/eventkeepalive.cpp
-index 2d93241..e43c802 100644
---- a/lib/cpp/client/eventkeepalive.cpp
-+++ b/lib/cpp/client/eventkeepalive.cpp
-@@ -190,7 +190,7 @@ bool EventConsumerKeepAliveThread::reconnect_to_zmq_channel(EvChanIte &ipos,Even
- 					string adm_name = ipos->second.full_adm_name;
- 
- #ifdef ZMQ_HAS_DISCONNECT
--					event_consumer->disconnect_event_channel(adm_name,ipos->second.endpoint);
-+					event_consumer->disconnect_event_channel(adm_name,ipos->second.endpoint,epos->second.endpoint);
- #endif
- 					event_consumer->connect_event_channel(adm_name,
- 									      epos->second.device->get_device_db(),
-diff --git a/lib/cpp/client/zmqeventconsumer.cpp b/lib/cpp/client/zmqeventconsumer.cpp
-index 3212100..bb56814 100644
---- a/lib/cpp/client/zmqeventconsumer.cpp
-+++ b/lib/cpp/client/zmqeventconsumer.cpp
-@@ -65,7 +65,8 @@ ZmqEventConsumer *ZmqEventConsumer::_instance = NULL;
- /*		       															*/
- /************************************************************************/
- 
--ZmqEventConsumer::ZmqEventConsumer(ApiUtil *ptr) : EventConsumer(ptr),omni_thread((void *)ptr),zmq_context(1)
-+ZmqEventConsumer::ZmqEventConsumer(ApiUtil *ptr) : EventConsumer(ptr),
-+omni_thread((void *)ptr),zmq_context(1),ctrl_socket_bound(false)
- {
- 	cout3 << "calling Tango::ZmqEventConsumer::ZmqEventConsumer() \n";
- 
-@@ -161,6 +162,8 @@ void *ZmqEventConsumer::run_undetached(TANGO_UNUSED(void *arg))
- 	control_sock->setsockopt(ZMQ_LINGER,&linger,sizeof(linger));
- 	control_sock->bind(CTRL_SOCK_ENDPOINT);
- 
-+	set_ctrl_sock_bound();
-+
- //
- // Initialize poll set
- //
-@@ -784,6 +787,7 @@ bool ZmqEventConsumer::process_ctrl(zmq::message_t &received_ctrl,zmq::pollitem_
-             const char *event_name = &(tmp_ptr[1]);
- #ifdef ZMQ_HAS_DISCONNECT
-             const char *endpoint = &(tmp_ptr[1 + ::strlen(event_name) + 1]);
-+            const char *endpoint_event = &(tmp_ptr[1 + ::strlen(event_name) + ::strlen(endpoint) + 2]);
- #endif
- 
- //
-@@ -815,6 +819,17 @@ bool ZmqEventConsumer::process_ctrl(zmq::message_t &received_ctrl,zmq::pollitem_
- 				connected_heartbeat.erase(pos);
- 
- 			heartbeat_sub_sock->disconnect(endpoint);
-+
-+//
-+// Remove the event endpoint from the already connected event and disconnect the event socket
-+//
-+
-+			pos = find(connected_pub.begin(),connected_pub.end(),string(endpoint_event));
-+			if (pos != connected_pub.end())
-+			{
-+				connected_pub.erase(pos);
-+				event_sub_sock->disconnect(endpoint_event);
-+			}
- #endif
-         }
-         break;
-@@ -927,20 +942,6 @@ bool ZmqEventConsumer::process_ctrl(zmq::message_t &received_ctrl,zmq::pollitem_
-                     string base_name(event_name);
-                     multi_tango_host(event_sub_sock,UNSUBSCRIBE,base_name);
-                 }
--
--#ifdef ZMQ_HAS_DISCONNECT
--//
--// Remove the endpoint in the vector of already connected event and disconnect the socket to this endpoint
--//
--
--				vector<string>::iterator pos;
--				pos = find(connected_pub.begin(),connected_pub.end(),endpoint_str);
--				if (pos != connected_pub.end())
--				{
--					connected_pub.erase(pos);
--					event_sub_sock->disconnect(endpoint);
--				}
--#endif
-             }
-             else
-             {
-@@ -1384,10 +1385,11 @@ void ZmqEventConsumer::connect_event_channel(string &channel_name,TANGO_UNUSED(D
- //		in :
- //			- channel name : The event channel name (DS admin name)
- //			- endpoint : The ZMQ endpoint for the heartbeat publisher socket
-+//			- endpoint_event : The ZMQ endpoint for the event publisher socket
- //
- //--------------------------------------------------------------------------------------------------------------------
- 
--void ZmqEventConsumer::disconnect_event_channel(string &channel_name,string &endpoint)
-+void ZmqEventConsumer::disconnect_event_channel(string &channel_name,string &endpoint,string &endpoint_event)
- {
-     string unsub(channel_name);
-     unsub = unsub + '.' + HEARTBEAT_EVENT_NAME;
-@@ -1420,6 +1422,9 @@ void ZmqEventConsumer::disconnect_event_channel(string &channel_name,string &end
-         ::strcpy(&(buffer[length]),endpoint.c_str());
-         length = length + endpoint.size() + 1;
- 
-+		::strcpy(&(buffer[length]),endpoint_event.c_str());
-+		length = length + endpoint_event.size() + 1;
-+
- //
- // Send command to main ZMQ thread
- //
-@@ -2838,10 +2843,27 @@ DelayEvent::DelayEvent(EventConsumer *ec):released(false),eve_con(NULL)
- // I have tried with a yield call but it still failed in some cases (when running the DS with a file as database  for
- // instance). Replace the yield with a 15 mS sleep !!!
- //
-+// Since ZMQ 4, it's possible to connect to the remote socket even if it is not yet bound but the remote
-+// socket will hang in its recv call!!!!
-+// We still need the sleep call but not in the exception case 
-+//
- 
-             try
-             {
-                 sender.connect(CTRL_SOCK_ENDPOINT);
-+
-+				if (eve_con->is_ctrl_sock_bound() == false)
-+				{
-+#ifndef _TG_WINDOWS_
-+					struct timespec ts;
-+					ts.tv_sec = 0;
-+					ts.tv_nsec = 15000000;
-+
-+					nanosleep(&ts,NULL);
-+#else
-+					Sleep(20);
-+#endif
-+				}
-             }
-             catch (zmq::error_t &e)
-             {
diff --git a/debian/patches/series b/debian/patches/series
index 651fcd8..6d5412d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,4 @@
 0001-debian-fix_database_scripts.patch
 0002-debian-my.cnf.in.patch
 0003-debian-notify_daemon.patch
-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
-0008-fix-upstream-p812_4.patch
-0009-fix-forwarded-upstream-gcc5.patch

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



More information about the debian-science-commits mailing list