[alberta] 01/02: Build with pkg-config from wheezy.

[Ansgar Burchardt]

This is an automated email from the git hooks/post-receive script.

ansgar pushed a commit to branch wheezy-backports
in repository alberta.

commit 77c31ff018436370a8e77cd8be0e5d7e544bfe0b
Author: Ansgar Burchardt <burchardt at igpm.rwth-aachen.de>
Date:   Mon Nov 24 16:45:34 2014 +0100

    Build with pkg-config from wheezy.
---
 debian/control                                 |  2 +-
 debian/patches/build-with-old-pkg-config.patch | 19 +++++++++++++++++++
 debian/patches/series                          |  1 +
 debian/rules                                   |  2 ++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 9af3254..b615ea2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ansgar Burchardt <ansgar at debian.org>
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/alberta.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/alberta.git
 Homepage: http://www.alberta-fem.de/
-Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config (>= 0.28),
+Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config,
  clang [powerpc ppc64 ppc64el]
 
 Package: libalberta-dev
diff --git a/debian/patches/build-with-old-pkg-config.patch b/debian/patches/build-with-old-pkg-config.patch
new file mode 100644
index 0000000..c65a64d
--- /dev/null
+++ b/debian/patches/build-with-old-pkg-config.patch
@@ -0,0 +1,19 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Subject: build with pkg-config from wheezy
+
+The PKG_INSTALLDIR macro was introduced in pkg-config 0.28, but wheezy
+has an older version. Just set pkgconfigdir by hand to avoid having to
+backport pkg-config as well.
+
+--- alberta-3.0.1.orig/configure.ac
++++ alberta-3.0.1/configure.ac
+@@ -25,7 +25,8 @@ ALBERTA_SET_PREFIX
+ # pkgconfig stuff with greetings to Christoph
+ #
+ PKG_PROG_PKG_CONFIG
+-PKG_INSTALLDIR
++#PKG_INSTALLDIR
++AC_SUBST(pkgconfigdir, /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig)
+ 
+ #
+ # all CONFIG_FILES for the ALBERTA libraries are added through the
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ecdec88
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build-with-old-pkg-config.patch
diff --git a/debian/rules b/debian/rules
index d195617..e5ad804 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,8 @@ ifneq (,$(filter powerpc ppc64 ppc64el,$(DEB_HOST_ARCH)))
   CONFIGURE_FLAGS += CC=clang
 endif
 
+export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --parallel --with autoreconf
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/alberta.git