[med-svn] [SCM] Free software framework for ludic-therapeutic activities branch, master, updated. upstream/1.0.1-45-g4a9c923

[Luis Rivas Vañó]

The following commit has been merged in the master branch:
commit 5c95e63181622c78052bd5793d01cfe2c8cd3162
Author: Luis Rivas Vañó <luinix at gmail.com>
Date:   Mon Mar 5 16:23:15 2012 +0100

    Fixing build dependency on libconfig8-dev, disabled libconfig_workaround patch

diff --git a/debian/control b/debian/control
index 5047d17..aefe616 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Luis Rivas Vañó <luinix at gmail.com>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 8), cmake, libpoco-dev, libboost-dev,
  libboost-program-options-dev, libboost-thread-dev, libboost-system-dev,
- wx2.8-headers, libwxbase2.8-dev, libbluetooth-dev, libconfig8-dev, libsdl1.2-dev,
+ wx2.8-headers, libwxbase2.8-dev, libbluetooth-dev, libconfig-dev, libsdl1.2-dev,
  libcv-dev (>= 2.3.1-7), libcvaux-dev, libhighgui-dev, libv4l-dev, libportmidi-dev,
  libboost-filesystem-dev, asciidoc, libsdl-gfx1.2-dev, libsdl-image1.2-dev,
  libwxgtk2.8-dev, doxygen, libxtst-dev
diff --git a/debian/patches/libconfig_workaround.patch b/debian/patches/libconfig_workaround.patch
deleted file mode 100644
index d4c071f..0000000
--- a/debian/patches/libconfig_workaround.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 df5d5e4..f12da65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 spelling.diff
-libconfig_workaround.patch
 as-needed.patch

-- 
Free software framework for ludic-therapeutic activities