diff -Nru debirf-0.32/debian/changelog debirf-0.33/debian/changelog --- debirf-0.32/debian/changelog 2011-12-05 21:32:14.000000000 +0000 +++ debirf-0.33/debian/changelog 2012-09-07 20:01:56.000000000 +0000 @@ -1,3 +1,23 @@ +debirf (0.33) unstable; urgency=low + + [ Jameson Rollins ] + * fix comments about default suite in example config files. Thanks, + Simon Elsbrock! (Closes: #656138) + + [ Matt Taggart ] + * ddrescue was dropped in favor of gddrescue (Closes: #685138) + + [ Daniel Kahn Gillmor ] + * removed scsitools from rescue module due to maintainer script breakage + under fakechroot (see #686881) + * work around flakey insserv under debootstrap --variant=fakechroot (see + #686965) + * the above two changes suffice to: (Closes: #655555) + * debian/changelog: bumped Standards-Version to 3.9.3 (no changes needed) + * only provisionally install smp-utils, since it was introduced in wheezy. + + -- Daniel Kahn Gillmor Fri, 07 Sep 2012 16:01:51 -0400 + debirf (0.32) unstable; urgency=low [ Daniel Kahn Gillmor ] diff -Nru debirf-0.32/debian/control debirf-0.33/debian/control --- debirf-0.32/debian/control 2011-12-05 21:32:14.000000000 +0000 +++ debirf-0.33/debian/control 2012-09-07 19:10:40.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Jameson Graef Rollins Uploaders: Daniel Kahn Gillmor Build-Depends: debhelper (>= 7.0) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://cmrg.fifthhorseman.net/wiki/debirf Vcs-Git: git://finestructure.net/debirf Dm-Upload-Allowed: yes diff -Nru debirf-0.32/doc/example-profiles/minimal/debirf.conf debirf-0.33/doc/example-profiles/minimal/debirf.conf --- debirf-0.32/doc/example-profiles/minimal/debirf.conf 2011-03-22 21:43:50.000000000 +0000 +++ debirf-0.33/doc/example-profiles/minimal/debirf.conf 2012-09-07 18:49:13.000000000 +0000 @@ -10,8 +10,8 @@ # #DEBIRF_BUILDD= -# What suite should be used? On Ubuntu systems the default it -# "karmic", otherwise the default is "squeeze". +# What suite should be used? The default is determined by +# lsb_release, and falls back to "sid". # #DEBIRF_SUITE= diff -Nru debirf-0.32/doc/example-profiles/rescue/debirf.conf debirf-0.33/doc/example-profiles/rescue/debirf.conf --- debirf-0.32/doc/example-profiles/rescue/debirf.conf 2011-03-22 21:43:50.000000000 +0000 +++ debirf-0.33/doc/example-profiles/rescue/debirf.conf 2012-09-07 18:49:13.000000000 +0000 @@ -10,8 +10,8 @@ # #DEBIRF_BUILDD= -# What suite should be used? On Ubuntu systems the default it -# "karmic", otherwise the default is "squeeze". +# What suite should be used? The default is determined by +# lsb_release, and falls back to "sid". # #DEBIRF_SUITE= diff -Nru debirf-0.32/doc/example-profiles/xkiosk/debirf.conf debirf-0.33/doc/example-profiles/xkiosk/debirf.conf --- debirf-0.32/doc/example-profiles/xkiosk/debirf.conf 2011-03-22 21:43:50.000000000 +0000 +++ debirf-0.33/doc/example-profiles/xkiosk/debirf.conf 2012-09-07 18:49:13.000000000 +0000 @@ -10,8 +10,8 @@ # #DEBIRF_BUILDD= -# What suite should be used? On Ubuntu systems the default it -# "karmic", otherwise the default is "squeeze". +# What suite should be used? The default is determined by +# lsb_release, and falls back to "sid". # #DEBIRF_SUITE= diff -Nru debirf-0.32/src/modules/a0_prep-root debirf-0.33/src/modules/a0_prep-root --- debirf-0.32/src/modules/a0_prep-root 2011-12-05 21:32:14.000000000 +0000 +++ debirf-0.33/src/modules/a0_prep-root 2012-09-07 18:22:35.000000000 +0000 @@ -65,3 +65,6 @@ # update/upgrade debirf_exec apt-get --yes --force-yes update debirf_exec apt-get --yes --force-yes upgrade + +# work around http://bugs.debian.org/686965 +debirf_exec sh -c 'cd /etc/init.d && insserv $(ls | grep -vFx -e rc -e rcS -e skeleton -e README)' diff -Nru debirf-0.32/src/modules/rescue debirf-0.33/src/modules/rescue --- debirf-0.32/src/modules/rescue 2011-12-05 21:32:14.000000000 +0000 +++ debirf-0.33/src/modules/rescue 2012-09-07 19:57:59.000000000 +0000 @@ -33,7 +33,7 @@ blktool \ bonnie++ \ cryptsetup \ - ddrescue \ + gddrescue \ dosfstools \ e2tools \ e2undel \ @@ -55,11 +55,9 @@ recover \ screen \ scrub \ - scsitools \ sdparm \ sg3-utils \ smartmontools \ - smp-utils \ testdisk \ testdisk \ tofrodos \ @@ -73,6 +71,11 @@ debirf_exec apt-get --no-install-recommends --assume-yes install partimage || true +# smp-utils was introduced only in wheezy, so we should be able to +# build a rescue image without it (e.g. a squeeze system): + +debirf_exec apt-get --no-install-recommends --assume-yes install smp-utils || true + # let's try some different configurations of uboot-related tools, since the # package names seem to be in flux right now: