The following commit has been merged in the master branch:
commit 90a32ca3988a9f4b766771eae4ab335c44fe4edc
Author: Luis Rivas Vañó <[email protected]>
Date: Mon Mar 5 16:33:02 2012 +0100
Adding patch from Jonathan McCrohan
diff --git a/debian/changelog b/debian/changelog
index 9db2d36..9456a3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ sitplus (1.0.3-1) unstable; urgency=low
* New upstream version.
* Removed "lib_location_fix.diff" patch, no longer needed.
* Removed "packager.diff" patch, no longer needed.
- * Adding new dependencies
+ * Adding new dependencies.
+ * Adding Jonathan McCrohan patch for removing workaround for older libconfig
versions.
-- Luis Rivas Vañó <[email protected]> Mon, 05 Mar 2012 12:58:42 +0100
diff --git
a/debian/patches/0001-remove-workaround-for-older-libconfig-versions.patch
b/debian/patches/0001-remove-workaround-for-older-libconfig-versions.patch
new file mode 100644
index 0000000..8c13ba5
--- /dev/null
+++ b/debian/patches/0001-remove-workaround-for-older-libconfig-versions.patch
@@ -0,0 +1,33 @@
+From 5df79711071356262088e9a191b6abe0e0d209a9 Mon Sep 17 00:00:00 2001
+From: Jonathan McCrohan <[email protected]>
+Date: Thu, 1 Mar 2012 01:09:46 +0000
+Subject: [PATCH] Remove workaround for older libconfig versions.
+
+---
+ src/spcore/configurationimpl.h | 9 ---------
+ 1 files changed, 0 insertions(+), 9 deletions(-)
+
+diff --git a/src/spcore/configurationimpl.h b/src/spcore/configurationimpl.h
+index 4c8eb2d..bfd315d 100755
+--- a/src/spcore/configurationimpl.h
++++ b/src/spcore/configurationimpl.h
+@@ -141,16 +141,7 @@ public:
+ virtual bool ReadInt (const char* path, int* i) const {
+ 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 {
+--
+1.7.9
+
diff --git a/debian/patches/series b/debian/patches/series
index f12da65..7e3897f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
spelling.diff
as-needed.patch
+0001-remove-workaround-for-older-libconfig-versions.patch
--
Free software framework for ludic-therapeutic activities
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
