[tango] 19/21: added p910_1

[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 c1276c7bab00b75b66d3f755862e0c11c8f5aa78
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Oct 8 15:32:24 2015 +0200

    added p910_1
---
 debian/changelog                 |  2 ++
 debian/patches/0003-p910_1.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9d14e1a..546aa89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ tango (9.1.0+dfsg-1~exp1) experimental; urgency=medium
     - refreshed
       - 0001-debian-fix_database_scripts.patch
       - 0002-debian-my.cnf.in.patch
+    - added
+      + 0003-p910_1.patch
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Thu, 02 Jul 2015 10:48:59 +0200
 
diff --git a/debian/patches/0003-p910_1.patch b/debian/patches/0003-p910_1.patch
new file mode 100644
index 0000000..cf3b71c
--- /dev/null
+++ b/debian/patches/0003-p910_1.patch
@@ -0,0 +1,31 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Thu, 8 Oct 2015 15:31:05 +0200
+Subject: p910_1
+
+---
+ lib/cpp/server/pollring.tpp | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/lib/cpp/server/pollring.tpp b/lib/cpp/server/pollring.tpp
+index 28724c6..d111f76 100644
+--- a/lib/cpp/server/pollring.tpp
++++ b/lib/cpp/server/pollring.tpp
+@@ -340,8 +340,16 @@ void PollRing::get_attr_history(long n,T *ptr,long type)
+ 
+         if (ring[index].except == NULL)
+         {
+-            ptr->dates[seq_index].tv_sec = (*ring[index].attr_value_5)[0].time.tv_sec;
+-            ptr->dates[seq_index].tv_usec = (*ring[index].attr_value_5)[0].time.tv_usec;
++            if (vers == 4)
++            {
++                ptr->dates[seq_index].tv_sec = (*ring[index].attr_value_4)[0].time.tv_sec + DELTA_T;
++                ptr->dates[seq_index].tv_usec = (*ring[index].attr_value_4)[0].time.tv_usec;
++            }
++            else
++            {
++                ptr->dates[seq_index].tv_sec = (*ring[index].attr_value_5)[0].time.tv_sec + DELTA_T;
++                ptr->dates[seq_index].tv_usec = (*ring[index].attr_value_5)[0].time.tv_usec;
++            }
+         }
+         else
+         {
diff --git a/debian/patches/series b/debian/patches/series
index 40d07e3..11dbfd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-debian-fix_database_scripts.patch
 0002-debian-my.cnf.in.patch
+0003-p910_1.patch

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