=== modified file 'debian/changelog' --- debian/changelog 2010-06-02 23:48:47 +0000 +++ debian/changelog 2010-06-13 09:26:48 +0000 @@ -1,3 +1,10 @@ +gcc-4.4 (4.4.4-4ubuntu2) UNRELEASED; urgency=low + + * debian/rules.d/binary-libstdcxx-cross.mk: remove debian/$(p_lib)-deps + before and after use to fix rebuilds. + + -- Loïc Minier Sun, 13 Jun 2010 11:26:00 +0200 + gcc-4.4 (4.4.4-4ubuntu1) maverick; urgency=low * Merge with Debian. === modified file 'debian/rules.d/binary-libstdcxx-cross.mk' --- debian/rules.d/binary-libstdcxx-cross.mk 2010-06-02 23:48:47 +0000 +++ debian/rules.d/binary-libstdcxx-cross.mk 2010-06-13 09:22:38 +0000 @@ -144,9 +144,11 @@ dh_makeshlibs -p$(p_lib) -n sed s/$(cross_lib_arch)//g < debian/$(p_lib)/DEBIAN/shlibs > debian/$(p_lib)/DEBIAN/shlibs.fixed mv debian/$(p_lib)/DEBIAN/shlibs.fixed debian/$(p_lib)/DEBIAN/shlibs + rm -rf debian/$(p_lib)-deps mkdir debian/$(p_lib)-deps ln -s "`readlink -e /usr/$(DEB_TARGET_GNU_TYPE)/lib`" debian/$(p_lib)-deps/lib $(SET_CROSS_LIB_PATH) ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_lib) -L$(p_lib)-deps + rm -rf debian/$(p_lib)-deps sed -i 's@[ =]lib[^ ,]*@&$(cross_lib_arch)@g' debian/$(p_lib).substvars dh_gencontrol -p$(p_lib) -- -v$(DEB_VERSION) $(common_substvars)