tags 577321 patch thanks I'm attaching a debdiff that gets gpib to build for me - I don't have time to test the built packages tonight, so I've not actually made the NMU upload yet.
Regards, -- Tim Retout <dioc...@debian.org>
diff -u gpib-3.2.11/debian/changelog gpib-3.2.11/debian/changelog --- gpib-3.2.11/debian/changelog +++ gpib-3.2.11/debian/changelog @@ -1,3 +1,13 @@ +gpib (3.2.11-2.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/rules: + + Move m-a includes after cdbs includes, but preserve + DEB_DESTDIR to work around bug #590157. (Closes: #577321) + + Use DESTDIR instead of PREFIX in libgpib-perl install target. + + -- Tim Retout <dioc...@debian.org> Fri, 15 Oct 2010 00:40:35 +0100 + gpib (3.2.11-2.1) unstable; urgency=low * Non-maintainer upload. diff -u gpib-3.2.11/debian/rules gpib-3.2.11/debian/rules --- gpib-3.2.11/debian/rules +++ gpib-3.2.11/debian/rules @@ -11,13 +11,6 @@ DEB_PYTHON_SYSTEM=pysupport -PACKAGE = gpib-modules -MA_DIR ?= /usr/share/modass --include $(MA_DIR)/include/generic.make --include $(MA_DIR)/include/common-rules.make -# save from environment -KPKG_DESTDIR := $(DEB_DESTDIR) - #"cdbs makefile.mk" include /usr/share/cdbs/1/class/makefile.mk DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//') @@ -50,6 +43,17 @@ DEB_DH_MAKESHLIBS_ARGS := -V DEB_SHLIBDEPS_INCLUDE := lib/.libs +# Work around #590157 +ORIG_DEB_DESTDIR := $(DEB_DESTDIR) + +PACKAGE = gpib-modules +MA_DIR ?= /usr/share/modass +-include $(MA_DIR)/include/generic.make +-include $(MA_DIR)/include/common-rules.make +# save from environment +KPKG_DESTDIR := $(DEB_DESTDIR) +DEB_DESTDIR := $(ORIG_DEB_DESTDIR) + # after the directories are created but before dh_compress is run. common-binary-post-install-arch:: dh_buildinfo @@ -67,7 +71,7 @@ install/libgpib-perl:: (cd $(DEB_BUILDDIR)/language/perl; \ - $(MAKE) install PREFIX=$(CURDIR)/debian/libgpib-perl/usr ) + $(MAKE) install DESTDIR=$(CURDIR)/debian/libgpib-perl ) binary-predeb/php5-gpib:: echo "php:Depends=phpapi-$(phpapiver)" >> debian/php5-gpib.substvars
signature.asc
Description: This is a digitally signed message part
