[med-svn] [SCM] mia branch, master, updated. upstream/2.0.8-71-g67bbbd6

Gert Wollny gw.fossdev at gmail.com
Wed Mar 6 12:17:28 UTC 2013


The following commit has been merged in the master branch:
commit 39bc89829d67d21789679eeeafe724ce1814aed7
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Mon Mar 4 17:02:34 2013 +0100

    add patch to correct pkg-config include path

diff --git a/debian/changelog b/debian/changelog
index fa03dc2..12947ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mia (2.0.8-2) UNRELEASED; urgency=low
+
+  * correct tests on i386
+  * correct pkg-config provided include path
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Mon, 04 Mar 2013 17:01:25 +0100
+
 mia (2.0.8-1) unstable; urgency=low
 
   * Initial release (Closes: #694437)
diff --git a/debian/patches/06_correct_pkgconfig_include_path.patch b/debian/patches/06_correct_pkgconfig_include_path.patch
new file mode 100644
index 0000000..0d2d91c
--- /dev/null
+++ b/debian/patches/06_correct_pkgconfig_include_path.patch
@@ -0,0 +1,10 @@
+diff --git a/miacore.pc.cmake b/miacore.pc.cmake
+index 7b66318..feefd63 100644
+--- a/miacore.pc.cmake
++++ b/miacore.pc.cmake
+@@ -14,4 +14,4 @@ Version: @PACKAGE_VERSION@
+ Conflicts:
+ Requires: @PKG_CONFIG_DEPS@ 
+ Libs: -lmiacore- at VERSION@ @MIA_DEPEND_LIBRARIES@ -L${prefix}/@LIBRARY_INSTALL_PATH@
+-Cflags: -I${prefix}/@INCLUDE_INSTALL_PATH@ -I${prefix}/@LIB_INCLUDE_INSTALL_PATH@
++Cflags: -I${prefix}/@INCLUDE_INSTALL_PATH@ -I at LIB_INCLUDE_INSTALL_PATH@
diff --git a/debian/patches/series b/debian/patches/series
index cef166b..acc1723 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_fix_test_close_to_zero.patch
 04_silence_ambiguous_function_warning.patch
 05_relax_floating_point_test_comparisons.patch
+06_correct_pkgconfig_include_path.patch
diff --git a/miacore.pc.cmake b/miacore.pc.cmake
index 7b66318..feefd63 100644
--- a/miacore.pc.cmake
+++ b/miacore.pc.cmake
@@ -14,4 +14,4 @@ Version: @PACKAGE_VERSION@
 Conflicts:
 Requires: @PKG_CONFIG_DEPS@ 
 Libs: -lmiacore- at VERSION@ @MIA_DEPEND_LIBRARIES@ -L${prefix}/@LIBRARY_INSTALL_PATH@
-Cflags: -I${prefix}/@INCLUDE_INSTALL_PATH@ -I${prefix}/@LIB_INCLUDE_INSTALL_PATH@
+Cflags: -I${prefix}/@INCLUDE_INSTALL_PATH@ -I at LIB_INCLUDE_INSTALL_PATH@

-- 
Packaging of mia in Debian



More information about the debian-med-commit mailing list