diff -Nru /tmp/253AjMSH5W/localechooser-0.27ubuntu21/debian/changelog /tmp/Su0ArbPynu/localechooser-0.27ubuntu22/debian/changelog --- /tmp/253AjMSH5W/localechooser-0.27ubuntu21/debian/changelog 2006-05-24 11:22:04.000000000 +0100 +++ /tmp/Su0ArbPynu/localechooser-0.27ubuntu22/debian/changelog 2006-05-30 23:13:05.000000000 +0100 @@ -1,3 +1,10 @@ +localechooser (0.27ubuntu22) dapper; urgency=low + + * Fix handling of debian-installer/locale preseeding to cope with + languages that only have ll_CC in shortlists (closes: Malone #43911). + + -- Colin Watson Tue, 30 May 2006 23:13:02 +0100 + localechooser (0.27ubuntu21) dapper; urgency=low * oem-config/locale: Fix /etc/environment modification to avoid diff -Nru /tmp/253AjMSH5W/localechooser-0.27ubuntu21/localechooser /tmp/Su0ArbPynu/localechooser-0.27ubuntu22/localechooser --- /tmp/253AjMSH5W/localechooser-0.27ubuntu21/localechooser 2006-05-12 15:12:34.000000000 +0100 +++ /tmp/Su0ArbPynu/localechooser-0.27ubuntu22/localechooser 2006-05-30 23:02:22.000000000 +0100 @@ -176,7 +176,16 @@ db_fset ${langname_all} seen $seenflag || true COUNTRY=$(locale2countrycode "$LOCALE") if [ -n "$COUNTRY" ] ; then - if grep -q "$LANGUAGE" $SHORTLISTS ; then + if grep -q "${LANGUAGE}_${COUNTRY}" $SHORTLISTS ; then + db_set $shortlist-${LANGUAGE}_${COUNTRY} "$COUNTRY" + log "Set $shortlist-${LANGUAGE}_${COUNTRY} = '$COUNTRY'" + db_register $shortlist-${LANGUAGE}_${COUNTRY} $shortlist + # cdebconf handles this as intended, but + # debconf needs us to set the registered + # question too. + db_set $shortlist "$COUNTRY" + db_fset $shortlist seen $seenflag || true + elif grep -q "$LANGUAGE" $SHORTLISTS ; then db_set $shortlist-$LANGUAGE "$COUNTRY" log "Set $shortlist-$LANGUAGE = '$COUNTRY'" db_register $shortlist-$LANGUAGE $shortlist