From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 2 Dec 2014 23:05:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'mfischer/daq' into next
X-Git-Tag: v2.17-core89~83^2~19
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=1a01c170110374afcc6b7cfe26e63623e4f3aabb;hp=17f0593aed127cbe72e28e3b788fc275f2004472

Merge remote-tracking branch 'mfischer/daq' into next
---

diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq
index b8a9fd4aca..6c156e3d9c 100644
--- a/config/rootfiles/common/daq
+++ b/config/rootfiles/common/daq
@@ -21,7 +21,7 @@ usr/lib/daq
 #usr/lib/libdaq.la
 #usr/lib/libdaq.so
 usr/lib/libdaq.so.2
-usr/lib/libdaq.so.2.0.2
+usr/lib/libdaq.so.2.0.4
 #usr/lib/libdaq_static.a
 #usr/lib/libdaq_static.la
 #usr/lib/libdaq_static_modules.a
diff --git a/lfs/daq b/lfs/daq
index fa8f2a89c5..c58995d575 100644
--- a/lfs/daq
+++ b/lfs/daq
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.2
+VER        = 2.0.4
 
 THISAPP    = daq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 865bf9b750a2a2ca632591a3c70b0ea0
+$(DL_FILE)_MD5 = 65e51d72e9d5d8b397e192e4e5857eff
 
 install : $(TARGET)