[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. debian/0.8.3-1_exp1-6-gf1d96ee

[Alexander Dreyer]

The following commit has been merged in the master branch:
commit f1d96ee99411d3412e8db84432fec6dad5316b74
Author: Alexander Dreyer <alexander.dreyer at itwm.fraunhofer.de>
Date:   Wed Mar 13 09:28:53 2013 +0100

    Improved .pc files once more

diff --git a/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch b/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch
index aa505e8..ee5ced7 100644
--- a/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch
+++ b/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch
@@ -3,45 +3,56 @@ Date: Tue, 12 Mar 2013 11:33:53 +0100
 Subject: Generate clean .pc files (from upstream)
 
 ---
- SConstruct |   19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
+ SConstruct |   30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
 
 diff --git a/SConstruct b/SConstruct
-index d13b8c3..64eceae 100644
+index d13b8c3..1bcca31 100644
 --- a/SConstruct
 +++ b/SConstruct
-@@ -2027,9 +2027,12 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
+@@ -2027,26 +2027,36 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
      if pkgconfigdirname:
          def build_pcfile(target, source, env):
              localenv = source[0].get_env()
 -            libflags = localenv.subst("$LINKFLAGS $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}");
 -            libs = ' '.join(set([l.replace('-l','') for l in libflags.split() 
 -                    if l.startswith('-l')]))
-+            libflags = localenv.subst("$LINKFLAGS ${LIBDIRPREFIX}$$$${libdir}${LIBDIRSUFFIX} "  + \
-+                                          source[0].path + " $_LIBFLAGS ")
-+            libs = ' '.join(set([l.replace(localenv.subst('$LIBLINKPREFIX'),'') for l in libflags.split() 
-+                    if l.startswith(localenv.subst('$LIBLINKPREFIX'))]))
 +            shsfx = localenv.subst('$SHLIBSUFFIX')
-+            versioning = (shsfx.split(env.subst('$SHLIBSUFFIX'))+['',''])[0]
++            versioning = (shsfx.split(env.subst('$SHLIBSUFFIX'))+[''])[0]
++            shsfx = shsfx.replace(versioning, '')
++            libpfx = localenv.subst('$LIBPREFIX')
++            libname = localenv.File(source[0]).name.replace(
++                libpfx,'').replace(shsfx, '')
++
++            import re
++            m = re.finditer('(?<='+ libpfx + ')' + libpb_name + '[^ ]*(?=' +\
++                                shsfx + ')', localenv.subst("$LIBS"))
++            localdeps = ' '.join([elt.group(0) for elt in m])
++ 
              page = """
  prefix=$PREFIX
  exec_prefix=$${prefix}
-@@ -2040,13 +2043,15 @@ Name: %s
+-includedir=$DEVEL_INCLUDE_PREFIX
++includedir=$${prefix}/include
+ libdir=$DEVEL_LIB_PREFIX
+ 
+ Name: %s
  Description: The PolyBoRi library
  URL: http://polybori.sourceforge.net
  Version: %s
 -Requires: %s
 -Cflags: $CXXFLAGS $CCFLAGS $_CCCOMCOM
-+Cflags: $CXXFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS  ${INCPREFIX}$${includedir}${INCSUFFIX}
- Libs: %s
+-Libs: %s
++Requires: gd m4ri png %s
++Cflags: ${INCPREFIX}$${includedir}${INCSUFFIX}
++Libs: ${LIBDIRPREFIX}$$$${libdir}${LIBDIRSUFFIX} ${LIBLINKPREFIX}%s${LIBLINKSUFFIX}
              """ % (env.File(target[0]).name.replace('.pc',''),
-                    pboriversion + '.' + pborirevision,
+-                   pboriversion + '.' + pborirevision,
 -                   libs, libflags)
 -            page = localenv.subst_target_source(page).replace(env.subst("$DESTDIR"),'') + '\n'
-+                   libflags)
++                   pboriversion + '.' + pborirevision, localdeps,
++                   libname)
 +            page = localenv.subst_target_source(page).replace(
-+               path.join(localenv.File(source[0]).dir.path, localenv.subst("$LIBPREFIX")),
-+               localenv.subst('$LIBLINKPREFIX')).replace(shsfx, versioning).replace(
 +                env.subst("$DESTDIR"),'') + '\n'
              open(str(target[0]), 'w').writelines(page)
  

-- 
polybori: Polynomials over Boolean Rings