[tango] 01/05: fix FTBFS with gcc5

[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 175cee26766ee5f0e0e94ec3d66b9828b36334a1
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Sep 2 18:45:43 2015 +0200

    fix FTBFS with gcc5
---
 debian/changelog                               | 10 +++++
 debian/patches/0009-fix-gcc5-compilation.patch | 61 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 72 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5033d74..c58fea8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tango (8.1.2c+dfsg-6) UNRELEASED; urgency=medium
+
+  * Bump Standards-Version to 3.9.6 (nothing to do)
+  * debian/control
+    + Updated Vcs-Git
+  * debian/patches
+    + 0009-fix-gcc5-compilation.patch (Closes: #797285)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Wed, 02 Sep 2015 18:34:07 +0200
+
 tango (8.1.2c+dfsg-5) unstable; urgency=medium
 
   * Bump Standards-Version to 3.9.5 (nothing to do)
diff --git a/debian/patches/0009-fix-gcc5-compilation.patch b/debian/patches/0009-fix-gcc5-compilation.patch
new file mode 100644
index 0000000..3f371d7
--- /dev/null
+++ b/debian/patches/0009-fix-gcc5-compilation.patch
@@ -0,0 +1,61 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Wed, 2 Sep 2015 18:32:54 +0200
+Subject: fix gcc5 compilation
+
+---
+ lib/cpp/server/attribute.cpp   | 15 ---------------
+ lib/cpp/server/w_attribute.cpp | 15 +++++++++++++++
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/lib/cpp/server/attribute.cpp b/lib/cpp/server/attribute.cpp
+index 858d7af..c963217 100644
+--- a/lib/cpp/server/attribute.cpp
++++ b/lib/cpp/server/attribute.cpp
+@@ -56,21 +56,6 @@ static const char *RcsId = "$Id: attribute.cpp 22617 2013-05-05 12:53:58Z taurel
+ namespace Tango
+ {
+ 
+-RANGES_TYPE2CONST(Tango::DevDouble,DEV_DOUBLE)
+-RANGES_TYPE2CONST(Tango::DevFloat,DEV_FLOAT)
+-RANGES_TYPE2CONST(Tango::DevLong,DEV_LONG)
+-RANGES_TYPE2CONST(Tango::DevLong64,DEV_LONG64)
+-RANGES_TYPE2CONST(Tango::DevShort,DEV_SHORT)
+-RANGES_TYPE2CONST(Tango::DevUChar,DEV_UCHAR)
+-RANGES_TYPE2CONST(Tango::DevULong,DEV_ULONG)
+-RANGES_TYPE2CONST(Tango::DevULong64,DEV_ULONG64)
+-RANGES_TYPE2CONST(Tango::DevUShort,DEV_USHORT)
+-RANGES_TYPE2CONST(Tango::DevEncoded,DEV_ENCODED)
+-
+-RANGES_TYPE2CONST(Tango::DevBoolean,DEV_BOOLEAN)
+-RANGES_TYPE2CONST(Tango::DevString,DEV_STRING)
+-RANGES_TYPE2CONST(Tango::DevState,DEV_STATE)
+-
+ //
+ // A classical function which will be used as unary predicate for the find_if
+ // algo. It must be used with the bind2nd adapter to be transform as unary and
+diff --git a/lib/cpp/server/w_attribute.cpp b/lib/cpp/server/w_attribute.cpp
+index 6fbffd2..cb2011d 100644
+--- a/lib/cpp/server/w_attribute.cpp
++++ b/lib/cpp/server/w_attribute.cpp
+@@ -63,6 +63,21 @@ static const char *RcsId = "$Id: w_attribute.cpp 22302 2013-03-22 08:28:27Z taur
+ namespace Tango
+ {
+ 
++  RANGES_TYPE2CONST(Tango::DevDouble,DEV_DOUBLE)
++  RANGES_TYPE2CONST(Tango::DevFloat,DEV_FLOAT)
++  RANGES_TYPE2CONST(Tango::DevLong,DEV_LONG)
++  RANGES_TYPE2CONST(Tango::DevLong64,DEV_LONG64)
++  RANGES_TYPE2CONST(Tango::DevShort,DEV_SHORT)
++  RANGES_TYPE2CONST(Tango::DevUChar,DEV_UCHAR)
++  RANGES_TYPE2CONST(Tango::DevULong,DEV_ULONG)
++  RANGES_TYPE2CONST(Tango::DevULong64,DEV_ULONG64)
++  RANGES_TYPE2CONST(Tango::DevUShort,DEV_USHORT)
++  RANGES_TYPE2CONST(Tango::DevEncoded,DEV_ENCODED)
++
++  RANGES_TYPE2CONST(Tango::DevBoolean,DEV_BOOLEAN)
++  RANGES_TYPE2CONST(Tango::DevString,DEV_STRING)
++  RANGES_TYPE2CONST(Tango::DevState,DEV_STATE)
++
+ //+-------------------------------------------------------------------------
+ //
+ // method : 		WAttribute::WAttribute
diff --git a/debian/patches/series b/debian/patches/series
index 29c4cc4..4fab63f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-fix-upstream-p812_2.patch
 0007-fix-upstream-p812_3.patch
 0008-fix-upstream-p812_4.patch
+0009-fix-gcc5-compilation.patch

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