[ppl] 45/68: Imported Debian patch 0.11.2-7

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ppl.

commit 4528e47b0ee03752ad31fb001c3fcb718472d429
Author: Matthias Klose <doko at debian.org>
Date:   Tue Aug 7 12:49:10 2012 +0200

    Imported Debian patch 0.11.2-7
---
 debian/changelog              | 10 ++++++++++
 debian/control                |  3 ++-
 debian/libppl0.11-dev.install |  4 ++--
 debian/rules                  | 14 ++++++++++++--
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee1b3b5..c4d2a11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ppl (0.11.2-7) unstable; urgency=low
+
+  * Mark libppl0.11-dev as Multi-Arch: same again, and install the header
+    files in the multiarch include path.
+    Needs a follow-up patch to split out the ppl-config binary.
+  * Disable the build of the swi prolog bindings for DEB_STAGE 1 builds.
+    Closes: #645003.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 07 Aug 2012 12:49:10 +0200
+
 ppl (0.11.2-6.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index a745804..0e65706 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
 Uploaders: Michael Tautschnig <mt at debian.org>, Arthur Loiret <aloiret at debian.org>, Matthias Klose <doko at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 6.0.7~), libgmp-dev, autoconf, libtool, autotools-dev, swi-prolog [!hurd-i386 !mips], chrpath,
  libncurses5-dev, libncursesw5-dev
 Build-Depends-Indep: doxygen-latex, graphviz, poppler-utils, ghostscript, texlive-math-extra
@@ -27,6 +27,7 @@ Description: Parma Polyhedra Library (runtime library)
 
 Package: libppl0.11-dev
 Architecture: any
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Section: libdevel
 Depends: libppl9 (= ${binary:Version}), libppl-c4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/libppl0.11-dev.install b/debian/libppl0.11-dev.install
index d93a2da..ef4dad2 100644
--- a/debian/libppl0.11-dev.install
+++ b/debian/libppl0.11-dev.install
@@ -1,5 +1,5 @@
-usr/include/ppl.hh
-usr/include/ppl_c.h
+usr/include/*/ppl.hh
+usr/include/*/ppl_c.h
 
 usr/lib/*/libppl.so
 usr/lib/*/libppl.a
diff --git a/debian/rules b/debian/rules
index 0f722f2..e249003 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,8 +26,16 @@ LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-# only build the C,C++,SWI-Prolog interfaces
-confflags += --enable-interfaces=c,cxx,swi_prolog --disable-ppl_lpsol --disable-ppl_lcdd
+confflags += --disable-ppl_lpsol --disable-ppl_lcdd
+
+## Disable the SWI-Prolog interface during architecture bootstrap
+ifeq ($(DEB_STAGE),stage1)
+confflags += --enable-interfaces=c,cxx
+DH_OPTIONS += -Nlibppl-swi
+export DH_OPTIONS
+else
+confflags += --enable-interfaces=c,cxx,swi_prolog
+endif
 
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
   with_check := disabled by DEB_BUILD_OPTIONS.
@@ -130,6 +138,8 @@ install-arch: build-arch check
 #	Add here commands to install the arch part of the package into
 # 	debian/tmp.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)
+	mv debian/tmp/usr/include/*.*h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/
 	$(MAKE) -C Watchdog install DESTDIR=$(CURDIR)/debian/tmp
 	-chrpath -d \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libppl.so.9.0.0 \

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