On Sun, 31 Oct 2010 09:04:43 +0000 Neil Williams <codehelp@debian.org> wrote: > Package: release.debian.org > Severity: normal > User: release.debian.org@packages.debian.org > Usertags: unblock > > Please unblock package emdebian-crush @ 2.2.5.1 > > As part of the fix for #540341 (and, in turn, #591457), > emdebian-crush 2.2.5.1 drops the dependency on apt-cross by removing > the emchain tool which is already deprecated in Emdebian. The package > also includes a fix for the internationalisation > of pdebuild-cross, ported from version 2.2.6 which is targeting > experimental. > > Attaching the relevant debdiff info. Let's try that again. (Not going well, this one - should have checked what reportbug actually attached.) Attaching the debdiff info from this version, not the last. -- Neil Williams ============= http://www.data-freedom.org/ http://www.linux.codehelp.co.uk/ http://e-mail.is-not-s.ms/
bash/emdebian-crush | 29 ----------------------------- buildd/pdebuild-cross | 2 +- buildd/pdebuild-cross-create | 4 ++-- buildd/pdebuild-cross-update | 6 +++--- debian/NEWS | 16 ++++++++++++++++ debian/changelog | 8 ++++++++ debian/control | 3 +-- debian/emdebian-crush.install | 1 - doc/po/emdebian-crush.pot | 2 +- po/pdebuild-cross.pot | 2 +- 10 files changed, 33 insertions(+), 40 deletions(-)
diff -Nru emdebian-crush-2.2.5/bash/emdebian-crush emdebian-crush-2.2.5.1/bash/emdebian-crush --- emdebian-crush-2.2.5/bash/emdebian-crush 2010-05-30 16:14:01.000000000 +0100 +++ emdebian-crush-2.2.5.1/bash/emdebian-crush 2010-10-30 20:39:01.000000000 +0100 @@ -17,35 +17,6 @@ # # Remember to always put a space at the end of a line of options. -_get_dpkg_cross_list() -{ - grep Choices: /var/lib/dpkg/info/dpkg-cross.templates \ - | cut -d':' -f2 | sed -e 's/None, //' | sed -e 's/,//g' -} - -_emchain() -{ - local cur prev opts cmds help arch quiet - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - help="-h -? --help --version " - cmds="-f --force -i --ignore -u --uclibc " - arch="-a --arch " - quiet="--verbose --quiet -v -q " - opts="-w --workdir -l --log " - help="-h -? --help --version " - case "$prev" in - -@(a|-arch)) - COMPREPLY=( $( _get_dpkg_cross_list $cur ) ) - ;; - *) - COMPREPLY=( $(compgen -W "${arch}${help}${opts}${quiet}${cmds}" -- ${cur}) ) - ;; - esac -} -complete -F _emchain -o default emchain - _emvendor() { local cur prev help cmds diff -Nru emdebian-crush-2.2.5/buildd/pdebuild-cross emdebian-crush-2.2.5.1/buildd/pdebuild-cross --- emdebian-crush-2.2.5/buildd/pdebuild-cross 2010-09-25 11:14:22.000000000 +0100 +++ emdebian-crush-2.2.5.1/buildd/pdebuild-cross 2010-10-30 20:09:33.000000000 +0100 @@ -24,7 +24,7 @@ export TEXTDOMAINDIR # use parsechangelog to ensure we're in a debian source tree if ! dpkg-parsechangelog >/dev/null 2>&1 ; then - echo gettext "You must run this from inside a debian source tree (debian/changelog not found)" + eval_gettext "You must run this from inside a debian source tree (debian/changelog not found)"; echo fi cfg="/etc/pdebuild-cross/pdebuild-cross.rc" diff -Nru emdebian-crush-2.2.5/buildd/pdebuild-cross-create emdebian-crush-2.2.5.1/buildd/pdebuild-cross-create --- emdebian-crush-2.2.5/buildd/pdebuild-cross-create 2010-09-25 11:14:22.000000000 +0100 +++ emdebian-crush-2.2.5.1/buildd/pdebuild-cross-create 2010-10-30 20:09:14.000000000 +0100 @@ -36,8 +36,8 @@ fi if [ -f $BASETGZ ]; then - eval_gettext "\$BASETGZ exists! If you want to create a new one, delete or move '\$BASETGZ'." - echo gettext "Otherwise, use 'pbuilder login --configfile /etc/pdebuild-cross/pdebuild-cross.rc --save-after-login'" + eval_gettext "\$BASETGZ exists! If you want to create a new one, delete or move '\$BASETGZ'."; echo + eval_gettext "Otherwise, use 'pbuilder login --configfile /etc/pdebuild-cross/pdebuild-cross.rc --save-after-login'"; echo eval_gettext "to make changes within the existing \$BASETGZ."; echo exit 3 fi diff -Nru emdebian-crush-2.2.5/buildd/pdebuild-cross-update emdebian-crush-2.2.5.1/buildd/pdebuild-cross-update --- emdebian-crush-2.2.5/buildd/pdebuild-cross-update 2010-09-25 11:14:22.000000000 +0100 +++ emdebian-crush-2.2.5.1/buildd/pdebuild-cross-update 2010-10-30 20:08:58.000000000 +0100 @@ -34,10 +34,10 @@ fi if [ ! -f $BASETGZ ]; then - echo gettext "Need to create a new pbuilder crossbuilding chroot first." - echo gettext "Use pdebuild-cross-create to create one." + eval_gettext "Need to create a new pbuilder crossbuilding chroot first."; echo + eval_gettext "Use pdebuild-cross-create to create one."; echo exit 2 fi -echo gettext "Enter your sudo password if prompted" +eval_gettext "Enter your sudo password if prompted"; echo sudo pbuilder update --configfile $cfg diff -Nru emdebian-crush-2.2.5/debian/changelog emdebian-crush-2.2.5.1/debian/changelog --- emdebian-crush-2.2.5/debian/changelog 2010-09-25 11:14:22.000000000 +0100 +++ emdebian-crush-2.2.5.1/debian/changelog 2010-10-30 20:31:28.000000000 +0100 @@ -1,3 +1,11 @@ +emdebian-crush (2.2.5.1) unstable; urgency=low + + * Drop apt-cross dependency - drop emchain. + * Port some changes from 2.2.6 to ensure localised strings are output + correctly. + + -- Neil Williams <codehelp@debian.org> Sat, 30 Oct 2010 20:31:04 +0100 + emdebian-crush (2.2.5) unstable; urgency=low * [i18n] Add French program translation (Closes: #595804) diff -Nru emdebian-crush-2.2.5/debian/control emdebian-crush-2.2.5.1/debian/control --- emdebian-crush-2.2.5/debian/control 2010-09-25 11:14:22.000000000 +0100 +++ emdebian-crush-2.2.5.1/debian/control 2010-10-30 20:57:49.000000000 +0100 @@ -12,8 +12,7 @@ Package: emdebian-crush Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, apt-cross (>= 0.12.6), - libconfig-auto-perl, libdebian-dpkgcross-perl, libfile-homedir-perl, +Depends: ${perl:Depends}, ${misc:Depends}, libconfig-auto-perl, dpkg-dev (>= 1.15.2), dpkg-cross (>= 2.3.3), emdebian-grip, fakeroot, lintian (>= 2.3.1), pdebuild-cross, realpath, sudo, perl-modules (>= 5.10.0) | libio-compress-zlib-perl (>= 2.011-1) diff -Nru emdebian-crush-2.2.5/debian/emdebian-crush.install emdebian-crush-2.2.5.1/debian/emdebian-crush.install --- emdebian-crush-2.2.5/debian/emdebian-crush.install 2010-07-08 10:35:08.000000000 +0100 +++ emdebian-crush-2.2.5.1/debian/emdebian-crush.install 2010-10-30 20:39:06.000000000 +0100 @@ -1,5 +1,4 @@ emvendor ./usr/bin -emchain ./usr/share/emdebian-crush/ emsource.sh ./usr/share/emdebian-crush/ wrap-lintian.pl ./usr/share/emdebian-crush/ toolchain.list ./usr/share/emdebian-crush/ diff -Nru emdebian-crush-2.2.5/debian/NEWS emdebian-crush-2.2.5.1/debian/NEWS --- emdebian-crush-2.2.5/debian/NEWS 2010-05-01 21:13:49.000000000 +0100 +++ emdebian-crush-2.2.5.1/debian/NEWS 2010-10-30 20:43:33.000000000 +0100 @@ -1,3 +1,19 @@ +emdebian-tools (2.2.5.1) unstable; urgency=low + + The emdebian-crush binary package has been slimmed down again for + Squeeze. This release removes support for apt-cross which has been + removed from Squeeze, drops emchain but retains + /usr/share/pdebuild-cross/xapt, which is used inside a pbuilder + chroot by the pdebuild-cross package. + + To use xapt outside a chroot, use version 2.2.6 or later. Debian + experimental will have 2.2.6 in due course. The Emdebian toolchain + repository already has 2.2.6 for unstable. + + http://www.emdebian.org/debian/pool/main/e/emdebian-crush/ + + -- Neil Williams <codehelp@debian.org> Sat, 30 Oct 2010 19:55:03 +0100 + emdebian-tools (2.2.0) experimental; urgency=low The source package and all binary packages have been greatly slimmed diff -Nru emdebian-crush-2.2.5/doc/po/emdebian-crush.pot emdebian-crush-2.2.5.1/doc/po/emdebian-crush.pot --- emdebian-crush-2.2.5/doc/po/emdebian-crush.pot 2010-09-25 11:18:53.000000000 +0100 +++ emdebian-crush-2.2.5.1/doc/po/emdebian-crush.pot 2010-10-30 20:57:57.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-09-25 11:18+0200\n" +"POT-Creation-Date: 2010-10-30 20:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff -Nru emdebian-crush-2.2.5/po/pdebuild-cross.pot emdebian-crush-2.2.5.1/po/pdebuild-cross.pot --- emdebian-crush-2.2.5/po/pdebuild-cross.pot 2010-09-25 11:18:53.000000000 +0100 +++ emdebian-crush-2.2.5.1/po/pdebuild-cross.pot 2010-10-30 20:57:57.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: emdebian-crush@packages.debian.org\n" -"POT-Creation-Date: 2010-09-25 11:18+0100\n" +"POT-Creation-Date: 2010-10-30 20:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
[The following lists of changes regard files as different if they have different names, permissions or owners.] Files in first .changes but not in second ----------------------------------------- -rwxr-xr-x root/root /usr/share/emdebian-crush/emchain Control files of package emdebian-crush: lines which differ (wdiff format) -------------------------------------------------------------------------- Depends: perl, [-apt-cross (>= 0.12.6),-] libconfig-auto-perl, [-libdebian-dpkgcross-perl, libfile-homedir-perl,-] dpkg-dev (>= 1.15.2), dpkg-cross (>= 2.3.3), emdebian-grip, fakeroot, lintian (>= 2.3.1), pdebuild-cross, realpath, sudo, perl-modules (>= 5.10.0) | libio-compress-zlib-perl (>= 2.011-1) Installed-Size: [-200-] {+168+} Version: [-2.2.5-] {+2.2.5.1+} Control files of package libemdebian-tools-perl: lines which differ (wdiff format) ---------------------------------------------------------------------------------- Version: [-2.2.5-] {+2.2.5.1+} Control files of package pdebuild-cross: lines which differ (wdiff format) -------------------------------------------------------------------------- Version: [-2.2.5-] {+2.2.5.1+}
Attachment:
pgpBmv1zdDZWh.pgp
Description: PGP signature