[tango] 05/05: add the p812_1 upstream patch
Frédéric-Emmanuel Picca
picca at alioth.debian.org
Tue Sep 3 19:38:35 UTC 2013
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit b4f384ac4ad1e29a667f301d42fe1b86180976d0
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Tue Sep 3 20:13:38 2013 +0200
add the p812_1 upstream patch
---
debian/changelog | 2 +
.../patches/0001-debian-fix_database_scripts.patch | 2 +-
debian/patches/0002-debian-my.cnf.in.patch | 2 +-
debian/patches/0003-debian-notify_daemon.patch | 2 +-
debian/patches/0004-fix-upstream-p812_1.diff.patch | 63 ++++++++++++++++++++
debian/patches/series | 1 +
6 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4b396d7..abd18f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
tango (8.1.2c+dfsg-1) unstable; urgency=low
* Imported Upstream version 8.1.2c+dfsg
+ * debian/patch
+ + 0004-fix-upstream-p812_1.diff.patch
* Add debconf translation:
- Brazilian Portuguese, from Adriano Rafael Gomes (Closes: #721628)
diff --git a/debian/patches/0001-debian-fix_database_scripts.patch b/debian/patches/0001-debian-fix_database_scripts.patch
index 9c18417..a3b1973 100644
--- a/debian/patches/0001-debian-fix_database_scripts.patch
+++ b/debian/patches/0001-debian-fix_database_scripts.patch
@@ -10,7 +10,7 @@ update the database creation script to deal with the debian path
Signed-off-by: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
---
- cppserver/database/create_db.sql.in | 8 ++------
+ cppserver/database/create_db.sql.in | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/cppserver/database/create_db.sql.in b/cppserver/database/create_db.sql.in
diff --git a/debian/patches/0002-debian-my.cnf.in.patch b/debian/patches/0002-debian-my.cnf.in.patch
index 566494e..2392d37 100644
--- a/debian/patches/0002-debian-my.cnf.in.patch
+++ b/debian/patches/0002-debian-my.cnf.in.patch
@@ -9,7 +9,7 @@ set the right parameters for the mysql configuration file
Signed-off-by: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
---
- cppserver/database/my.cnf.in | 10 +++++-----
+ cppserver/database/my.cnf.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/cppserver/database/my.cnf.in b/cppserver/database/my.cnf.in
diff --git a/debian/patches/0003-debian-notify_daemon.patch b/debian/patches/0003-debian-notify_daemon.patch
index 2c5f45f..ceabce9 100644
--- a/debian/patches/0003-debian-notify_daemon.patch
+++ b/debian/patches/0003-debian-notify_daemon.patch
@@ -4,7 +4,7 @@ Date: Tue, 22 Mar 2011 15:25:38 +0100
Subject: debian/notify_daemon
---
- scripts/notify_daemon.in | 6 ++----
+ scripts/notify_daemon.in | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/scripts/notify_daemon.in b/scripts/notify_daemon.in
diff --git a/debian/patches/0004-fix-upstream-p812_1.diff.patch b/debian/patches/0004-fix-upstream-p812_1.diff.patch
new file mode 100644
index 0000000..fe3c2a3
--- /dev/null
+++ b/debian/patches/0004-fix-upstream-p812_1.diff.patch
@@ -0,0 +1,63 @@
+From: =?UTF-8?q?Picca=20Fr=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/series b/debian/patches/series
index 31d0855..4ce1f75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +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
--
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