diff -Nru console-setup-1.57ubuntu12/debian/changelog console-setup-1.57ubuntu13/debian/changelog --- console-setup-1.57ubuntu12/debian/changelog 2011-03-18 06:28:35.000000000 -0500 +++ console-setup-1.57ubuntu13/debian/changelog 2011-03-18 22:02:15.000000000 -0500 @@ -1,3 +1,11 @@ +console-setup (1.57ubuntu13) natty; urgency=low + + * debian/rules, debian/console-setup.postinst: use update-alternatives + to allow other packages to install different console color values, + LP: #737948 + + -- Dustin Kirkland Fri, 18 Mar 2011 22:02:12 -0500 + console-setup (1.57ubuntu12) natty; urgency=low * Tolerate absence of setupcon in keyboard-configuration.postinst diff -Nru console-setup-1.57ubuntu12/debian/console-setup.postinst console-setup-1.57ubuntu13/debian/console-setup.postinst --- console-setup-1.57ubuntu12/debian/console-setup.postinst 2011-01-18 12:24:43.000000000 -0600 +++ console-setup-1.57ubuntu13/debian/console-setup.postinst 2011-03-18 21:18:09.000000000 -0500 @@ -10,6 +10,11 @@ if [ "$1" = "configure" ]; then + # Remove non-update-alternatives-maintained config file + md5=$(md5sum /usr/share/console-setup/vtrgb | awk '{print $1}') + [ -f /etc/vtrgb ] && [ ! -h /etc/vtrgb ] && (md5sum /etc/vtrgb | grep -qs $md5) && rm -f /etc/vtrgb + update-alternatives --install /etc/vtrgb vtrgb /usr/share/console-setup/vtrgb 50 + db_get console-setup/codesetcode codeset="$RET" db_get console-setup/fontface47 diff -Nru console-setup-1.57ubuntu12/debian/rules console-setup-1.57ubuntu13/debian/rules --- console-setup-1.57ubuntu12/debian/rules 2011-03-18 06:27:16.000000000 -0500 +++ console-setup-1.57ubuntu13/debian/rules 2011-03-18 20:38:57.000000000 -0500 @@ -71,7 +71,7 @@ dh_install -pconsole-setup Keyboard/pc105.tree \ usr/share/console-setup dh_installinit --name setvtrgb - install -m 644 debian/vtrgb debian/console-setup/etc/ + install -m 644 debian/vtrgb debian/console-setup/usr/share/console-setup/ install -d debian/keyboard-configuration/usr/share/console-setup/ rm debian/console-setup/etc/default/keyboard