On Sun, Oct 28, 2012 at 12:39:28AM +0100, Roger Leigh wrote: > Please unblock package schroot > > I have uploaded schroot 1.6.4-1 to unstable. This contains some > documentation for wheezy upgrade issues, plus some fixes for > serious and important bugs in wheezy:
I had to make an additional 3 line change to fix building on hurd and kfreebsd (attached) Thanks, Roger unblock schroot/1.6.4-2 -- .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' schroot and sbuild http://alioth.debian.org/projects/buildd-tools `- GPG Public Key F33D 281D 470A B443 6756 147C 07B3 C8BC 4083 E800
diff -Nru schroot-1.6.4/debian/changelog schroot-1.6.4/debian/changelog --- schroot-1.6.4/debian/changelog 2012-10-27 23:39:05.000000000 +0100 +++ schroot-1.6.4/debian/changelog 2012-10-28 11:53:31.000000000 +0000 @@ -1,3 +1,12 @@ +schroot (1.6.4-2) unstable; urgency=low + + * sbuild::chroot_facet_session_clonable: Include + sbuild-chroot-block-device-base.h, which was missing on + kFreeBSD and Hurd builds (it's included indirectly on Linux + via the LVM snapshot header). + + -- Roger Leigh <rle...@debian.org> Sun, 28 Oct 2012 11:49:57 +0000 + schroot (1.6.4-1) unstable; urgency=low * New upstream stable release. diff -Nru schroot-1.6.4/debian/patches/1.6.4-2 schroot-1.6.4/debian/patches/1.6.4-2 --- schroot-1.6.4/debian/patches/1.6.4-2 1970-01-01 01:00:00.000000000 +0100 +++ schroot-1.6.4/debian/patches/1.6.4-2 2012-10-28 11:54:35.000000000 +0000 @@ -0,0 +1,23 @@ +Description: 1.6.4-2 + schroot (1.6.4-2) unstable; urgency=low + . + * sbuild::chroot_facet_session_clonable: Include + sbuild-chroot-block-device-base.h, which was missing on + kFreeBSD and Hurd builds (it's included indirectly on Linux + via the LVM snapshot header). +Author: Roger Leigh <rle...@debian.org> + +--- + +--- schroot-1.6.4.orig/sbuild/sbuild-chroot-facet-session-clonable.cc ++++ schroot-1.6.4/sbuild/sbuild-chroot-facet-session-clonable.cc +@@ -24,6 +24,9 @@ + #include "sbuild-chroot-facet-session-clonable.h" + #include "sbuild-chroot-facet-source-clonable.h" + #include "sbuild-chroot-plain.h" ++#ifdef SBUILD_FEATURE_BLOCKDEV ++#include "sbuild-chroot-block-device-base.h" ++#endif + #ifdef SBUILD_FEATURE_LVMSNAP + #include "sbuild-chroot-lvm-snapshot.h" + #endif // SBUILD_FEATURE_LVMSNAP diff -Nru schroot-1.6.4/debian/patches/series schroot-1.6.4/debian/patches/series --- schroot-1.6.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ schroot-1.6.4/debian/patches/series 2012-10-28 11:53:59.000000000 +0000 @@ -0,0 +1 @@ +1.6.4-2