[SCM] tango branch, experimental, updated. debian/7.2.6+dfsg-14-35-g57b4828

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the experimental branch:
commit 57b4828098c4ca4d5ab56a01f405ad62a4273201
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Sep 22 15:22:47 2012 +0200

    add LIBZMQ to libtango

diff --git a/debian/control b/debian/control
index 5c099f4..1faccc8 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,8 @@ Section: libdevel
 Depends: ${misc:Depends},
          libcos4-dev,
          liblog4tango4-dev,
-         libtango8 (= ${binary:Version})
+         libtango8 (= ${binary:Version}),
+         libzmq3-dev
 Conflicts: libtango7-dev
 Description: TANGO distributed control system - development library
  TANGO is an object-oriented distributed control system using CORBA. In
diff --git a/debian/patches/0005-fix-forwaded-upstream-add-LIBZMQ_LIBS-to-libtango.patch b/debian/patches/0005-fix-forwaded-upstream-add-LIBZMQ_LIBS-to-libtango.patch
new file mode 100644
index 0000000..601d655
--- /dev/null
+++ b/debian/patches/0005-fix-forwaded-upstream-add-LIBZMQ_LIBS-to-libtango.patch
@@ -0,0 +1,29 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 22 Sep 2012 10:37:02 +0200
+Subject: fix forwaded upstream add LIBZMQ_LIBS to libtango
+
+---
+ lib/cpp/server/Makefile.am |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/lib/cpp/server/Makefile.am b/lib/cpp/server/Makefile.am
+index 2f4d63e..7189995 100644
+--- a/lib/cpp/server/Makefile.am
++++ b/lib/cpp/server/Makefile.am
+@@ -10,10 +10,12 @@ INCLUDES = -I$(top_srcdir)/lib/cpp/client \
+ lib_LTLIBRARIES=libtango.la
+ 
+ # We need the libclient to link
+-libtango_la_LIBADD = ../client/libclient.la	\
+-						../log4tango/src/liblog4tango.la \
+-						jpeg/libjpeg.la \
+-						jpeg_mmx/libjpeg_mmx.la
++libtango_la_LIBADD = \
++	../client/libclient.la	\
++	../log4tango/src/liblog4tango.la \
++	jpeg/libjpeg.la \
++	jpeg_mmx/libjpeg_mmx.la \
++	$(LIBZMQ_LIBS)
+ 
+ # We need to set the -version-info for libtool so that libtool will
+ # generate the correct .so version
diff --git a/debian/patches/series b/debian/patches/series
index e04140d..c282b92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-debian-my.cnf.in.patch
 0003-debian-notify_daemon.patch
 0004-upstream-fix-p805_1.patch
+0005-fix-forwaded-upstream-add-LIBZMQ_LIBS-to-libtango.patch

-- 
TANGO distributed control system.