[med-svn] [SCM] Free software framework for ludic-therapeutic activities branch, debian, updated. upstream/1.0.1-13-g2b1b054

[Andreas Tille]

The following commit has been merged in the debian branch:
commit 9ae3f5c217f9238908e76b5c02f978691d3da09d
Author: Andreas Tille <tille at debian.org>
Date:   Tue Feb 28 21:22:35 2012 +0100

    Do not try wrong workarounds for FTBFS with libconfig according to advise given by upstream

diff --git a/debian/changelog b/debian/changelog
index 73bbeac..cac1100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sitplus (1.0.1-4) unstable; urgency=low
+
+  * debian/patches/libconfig_workaround.patch: Do not try wrong
+    workarounds for FTBFS with libconfig according to advise given
+    by upstream
+    Closes: #661403
+
+ -- Andreas Tille <tille at debian.org>  Tue, 28 Feb 2012 21:20:14 +0100
+
 sitplus (1.0.1-3) unstable; urgency=low
 
   * debian/control: Build-Depends: libcv-dev (>= 2.3.1-7)
diff --git a/debian/patches/libconfig_workaround.patch b/debian/patches/libconfig_workaround.patch
new file mode 100644
index 0000000..d4c071f
--- /dev/null
+++ b/debian/patches/libconfig_workaround.patch
@@ -0,0 +1,26 @@
+Author: Cesar Mauri <cesar at crea-si.com>
+Bug-Closed: http://bugs.debian.org/661403
+Description: Remove conditional compilation directives
+ I had to introduce a workaround to allow SITPLUS to compile with older
+ versions of libconfig. This is the relevant code snipped.
+ ...
+ So, to solve this, just remove the conditional compilation directives
+
+--- sitplus.orig/src/spcore/configurationimpl.h
++++ sitplus/src/spcore/configurationimpl.h
+@@ -142,15 +142,11 @@
+ 		std::string epath;
+ 		if (!GetEffectivePathTranslate(path, epath)) return false;
+ 		// Workaround for older versions of libconfig
+-#ifdef WIN32
+-		return (config_lookup_int (&m_config, epath.c_str(), i)== CONFIG_TRUE);
+-#else
+ 		long tmp;
+ 		int retval= config_lookup_int (&m_config, epath.c_str(), &tmp);
+ 		if (retval!= CONFIG_TRUE) return false;
+ 		*i= (int) tmp;
+ 		return true;
+-#endif
+ 	}
+ 	
+ 	virtual bool ReadInt64 (const char* path, long long* i) const {
diff --git a/debian/patches/series b/debian/patches/series
index ec63efe..b9d5a07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ lib_location_fix.diff
 packager.diff
 spelling.diff
 as-needed.patch
+libconfig_workaround.patch

-- 
Free software framework for ludic-therapeutic activities