diff -Nru espeak-1.47.11/debian/changelog espeak-1.47.11/debian/changelog --- espeak-1.47.11/debian/changelog 2013-06-19 19:01:55.000000000 +0000 +++ espeak-1.47.11/debian/changelog 2014-01-21 13:51:10.000000000 +0000 @@ -1,3 +1,15 @@ +espeak (1.47.11-1ubuntu1) trusty; urgency=medium + + * Add debian/espeak-data.preinst.in: Move aside + /usr/lib//espeak-data/voices/en for upgrades; this directory got + replaced with file, and triggers a bug in overlays when dist-upgrading + containers. Add some magic to debian/rules to create the .preinst with + filling out the particular architecture (as dpkg-architecure may not be + available in the preinst). This is a hackish workaround and can be + dropped again in trusty+1. (LP: #1220681) + + -- Martin Pitt Tue, 21 Jan 2014 14:48:33 +0100 + espeak (1.47.11-1) unstable; urgency=low * New upstream release diff -Nru espeak-1.47.11/debian/control espeak-1.47.11/debian/control --- espeak-1.47.11/debian/control 2012-06-06 23:21:07.000000000 +0000 +++ espeak-1.47.11/debian/control 2014-01-21 13:51:11.000000000 +0000 @@ -1,7 +1,8 @@ Source: espeak Section: sound Priority: optional -Maintainer: Debian Accessibility Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Accessibility Team Uploaders: Mario Lang , Samuel Thibault Vcs-Browser: http://git.debian.org/?p=pkg-a11y/espeak.git;a=summary Vcs-Git: git://git.debian.org/git/pkg-a11y/espeak.git diff -Nru espeak-1.47.11/debian/espeak-data.preinst.in espeak-1.47.11/debian/espeak-data.preinst.in --- espeak-1.47.11/debian/espeak-data.preinst.in 1970-01-01 00:00:00.000000000 +0000 +++ espeak-1.47.11/debian/espeak-data.preinst.in 2014-01-21 14:05:26.000000000 +0000 @@ -0,0 +1,14 @@ +#!/bin/sh +set -e + +# workaround for quantal → trusty upgrades where +# /usr/lib/*/espeak-data/voices/en changed from a directory to a file; this +# fails in containers sometimes (LP: #1220681): this can be dropped in +# trusty+1. + +if [ "$1" = "upgrade" ]; then + d=@DATADIR@/espeak-data/voices/en + if [ -d $d ]; then + rm -r $d || true + fi +fi diff -Nru espeak-1.47.11/debian/rules espeak-1.47.11/debian/rules --- espeak-1.47.11/debian/rules 2013-06-16 22:33:16.000000000 +0000 +++ espeak-1.47.11/debian/rules 2014-01-21 13:53:48.000000000 +0000 @@ -97,7 +97,10 @@ dh_fixperms dh_makeshlibs -V dh_shlibdeps -L libespeak1 -l debian/libespeak1/usr/lib + # workaround for LP#1220681; drop in trusty+1 + sed "s!@DATADIR@!$(ESPEAK_DATA)!g" debian/espeak-data.preinst.in > debian/espeak-data.preinst dh_installdeb -v + rm debian/espeak-data.preinst dh_gencontrol dh_md5sums dh_builddeb