[SCM] ORSA packaging branch, master, updated. debian/0.7.0-12-8-ga6bd558

[Frank S. Thomas]

The following commit has been merged in the master branch:
commit a6bd558e64b0345524f2df3f5cc2b9a5b22e24f4
Author: Frank S. Thomas <fst at debian.org>
Date:   Thu Mar 12 15:47:07 2009 +0100

    Use pkg-config instead of cln-config.
    
    CLN 1.2.0 dropped cln-config in favor of pkg-config, therefore:
    - Changed AM_PATH_CLN to PKG_CHECK_MODULES in configure.in.
    - Bumped build dependency on libcln-dev to ">= 1.2.0".

diff --git a/configure.in b/configure.in
index 9a0d933..5b14a8b 100644
--- a/configure.in
+++ b/configure.in
@@ -36,7 +36,14 @@ dnl checks for the GSL library
 AM_PATH_GSL([1.5])
 
 dnl checks for the cln library
-AC_PATH_CLN([1.1.6], ac_cv_have_cln=yes, ac_cv_have_cln=no)
+PKG_CHECK_MODULES(CLN, cln >= 1.1.6, ac_cv_have_cln=yes, ac_cv_have_cln=no)
+
+if test "x$ac_cv_have_cln" = "xyes"; then
+    CLN_CPPFLAGS=`pkg-config --cflags cln`
+    CLN_LIBS=`pkg-config --libs cln`
+    AC_SUBST(CLN_CPPFLAGS)
+    AC_SUBST(CLN_LIBS)
+fi
 
 dnl checks for the ginac library
 PKG_CHECK_MODULES(GiNaC, ginac >= 1.2.0, ac_cv_have_ginac=yes, ac_cv_have_ginac=no)
diff --git a/debian/changelog b/debian/changelog
index 9b027ac..6ed57b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ orsa (0.7.0-13) UNRELEASED; urgency=low
     destructor, or type conversion before ‘long’".
   * debian/copyright: Rewrote it in the machine-interpretable format which is
     specified in http://wiki.debian.org/Proposals/CopyrightFormat.
+  * CLN 1.2.0 dropped cln-config in favor of pkg-config, therefore:
+    - Changed AM_PATH_CLN to PKG_CHECK_MODULES in configure.in.
+    - Bumped build dependency on libcln-dev to ">= 1.2.0".
 
  -- Frank S. Thomas <fst at debian.org>  Mon, 28 Apr 2008 22:21:36 +0200
 
diff --git a/debian/control b/debian/control
index 535f2a9..ba83584 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.52), debhelper (>= 6.0.7), sharutils, docbook2x,
  docbook-xml, automake1.9, autoconf, libtool, pkg-config, libreadline5-dev |
  libreadline-dev, libqt3-mt-dev (>= 3:3.3), libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libgsl0-dev (>= 1.5), fftw-dev (>= 2.1),
- libcln-dev (>= 1.1.6), libginac-dev (>= 1.3.7), libgmp3-dev
+ libcln-dev (>= 1.2.0), libginac-dev (>= 1.3.7), libgmp3-dev
 Build-Depends-Indep: doxygen, graphviz
 Vcs-Git: git://git.debian.org/git/debian-science/packages/orsa.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/orsa.git

-- 
ORSA packaging