+++ Debian Bug Tracking System [2013-01-21 18:33 +0000]:
Attached is a patch to move zconf.h to a multiarch location. 

This solves the problem for me and stuff build-depending on zlib1g-dev
still builds OK, so this is probably the simplest fix, requiring no
changes upstream. 


Wookey
-- 
Principal hats:  Linaro, Emdebian, Wookware, Balloonboard, ARM
http://wookware.org/
diff -ur origs/zlib-1.2.7.dfsg/debian/rules zlib-1.2.7.dfsg/debian/rules
--- origs/zlib-1.2.7.dfsg/debian/rules	2012-05-22 14:06:22.000000000 +0100
+++ zlib-1.2.7.dfsg/debian/rules	2013-01-21 19:32:32.000000000 +0000
@@ -164,10 +164,11 @@
 
 	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
 
-	install -d debian/tmp/lib/$(DEB_HOST_MULTIARCH)
+	install -d debian/tmp/lib/$(DEB_HOST_MULTIARCH) debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)
 	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libz.so.* debian/tmp/lib/$(DEB_HOST_MULTIARCH)
 	ln -sf /lib/$(DEB_HOST_MULTIARCH)/$$(readlink debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libz.so) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libz.so
-
+	mv debian/tmp/usr/include/zconf.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/
+	
 install64: install build64-stamp
 	$(MAKE) -C debian/64 prefix=$(CURDIR)/debian/tmp install
 
diff -ur origs/zlib-1.2.7.dfsg/debian/zlib1g-dev.install zlib-1.2.7.dfsg/debian/zlib1g-dev.install
--- origs/zlib-1.2.7.dfsg/debian/zlib1g-dev.install	2012-05-03 10:08:00.000000000 +0100
+++ zlib-1.2.7.dfsg/debian/zlib1g-dev.install	2013-01-21 19:32:32.000000000 +0000
@@ -1,4 +1,5 @@
-usr/include/*
+usr/include/zlib.h
+usr/include/*/zconf.h
 usr/lib/*/libz.a
 usr/lib/*/libz.so
 usr/share/man/man3/*

Reply via email to