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

[Alexander Dreyer]

The following commit has been merged in the master branch:
commit fa271368041fb3481bfa6f0c215f7972641309c1
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Tue Mar 12 11:36:34 2013 +0100

    Added patch for generating clean .pc files from upstream

diff --git a/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch b/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch
new file mode 100644
index 0000000..aa505e8
--- /dev/null
+++ b/debian/patches/0002-Generate-clean-.pc-files-from-upstream.patch
@@ -0,0 +1,49 @@
+From: Alexander Dreyer <adreyer at gmx.de>
+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(-)
+
+diff --git a/SConstruct b/SConstruct
+index d13b8c3..64eceae 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -2027,9 +2027,12 @@ 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]
+             page = """
+ prefix=$PREFIX
+ exec_prefix=$${prefix}
+@@ -2040,13 +2043,15 @@ 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
+             """ % (env.File(target[0]).name.replace('.pc',''),
+                    pboriversion + '.' + pborirevision,
+-                   libs, libflags)
+-            page = localenv.subst_target_source(page).replace(env.subst("$DESTDIR"),'') + '\n'
++                   libflags)
++            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)
+ 
+             return None
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index ee3f738..906f230 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Added-libraries-symlinks-to-testsuite-dependencies-t.patch
+0002-Generate-clean-.pc-files-from-upstream.patch

-- 
polybori: Polynomials over Boolean Rings