diff -Nru partman-target-64ubuntu5/debian/changelog partman-target-64ubuntu6/debian/changelog
--- partman-target-64ubuntu5/debian/changelog	2009-10-27 15:15:03.000000000 +0000
+++ partman-target-64ubuntu6/debian/changelog	2010-02-02 23:41:11.000000000 +0000
@@ -1,3 +1,11 @@
+partman-target (64ubuntu6) lucid; urgency=low
+
+  * Stop adding removable devices to /etc/fstab, now that apt knows how to
+    find CD-ROM devices using libudev (LP: #33512).
+  * Update translations of Ubuntu-specific strings from Launchpad.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 02 Feb 2010 15:41:10 -0800
+
 partman-target (64ubuntu5) karmic; urgency=low
 
   * Fix clearing of subdirectories of /usr and /var (LP: #461698).
diff -Nru partman-target-64ubuntu5/debian/install partman-target-64ubuntu6/debian/install
--- partman-target-64ubuntu5/debian/install	2009-10-07 10:10:51.000000000 +0100
+++ partman-target-64ubuntu6/debian/install	2010-02-02 20:36:17.000000000 +0000
@@ -1,2 +1 @@
 choose_method lib/partman
-finish-install.d usr/lib
diff -Nru partman-target-64ubuntu5/debian/po/am.po partman-target-64ubuntu6/debian/po/am.po
--- partman-target-64ubuntu5/debian/po/am.po	2009-10-03 23:31:16.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/am.po	2010-02-02 23:36:39.000000000 +0000
@@ -280,7 +280,7 @@
 #. Description
 #: ../partman-target.templates:15001
 msgid "Do you want to return to the partitioner?"
-msgstr ""
+msgstr "ወደ መከፋፈያው መመልስ ይፈልጋሉ?"
 
 #. Type: boolean
 #. Description
diff -Nru partman-target-64ubuntu5/debian/po/ast.po partman-target-64ubuntu6/debian/po/ast.po
--- partman-target-64ubuntu5/debian/po/ast.po	2009-10-03 23:31:16.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/ast.po	2010-02-02 23:36:39.000000000 +0000
@@ -306,7 +306,6 @@
 #. Description
 #: ../partman-target.templates:15001
 #, fuzzy
-#| msgid "Do you want to resume partitioning?"
 msgid "Do you want to return to the partitioner?"
 msgstr "¿Quies resumir el particionáu?"
 
diff -Nru partman-target-64ubuntu5/debian/po/bs.po partman-target-64ubuntu6/debian/po/bs.po
--- partman-target-64ubuntu5/debian/po/bs.po	2009-08-25 12:27:03.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/bs.po	2010-02-02 23:36:39.000000000 +0000
@@ -299,7 +299,7 @@
 #. Description
 #: ../partman-target.templates:15001
 msgid "Do you want to return to the partitioner?"
-msgstr ""
+msgstr "Želite li se vratiti na particionisanje diska?"
 
 #. Type: boolean
 #. Description
diff -Nru partman-target-64ubuntu5/debian/po/cs.po partman-target-64ubuntu6/debian/po/cs.po
--- partman-target-64ubuntu5/debian/po/cs.po	2009-10-03 23:31:16.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/cs.po	2010-02-02 23:36:39.000000000 +0000
@@ -308,6 +308,10 @@
 "usr, /var, ...) that already exist under any defined mountpoint will be "
 "deleted during the install."
 msgstr ""
+"Souborový systém na ${PARTITION} přiřazený k ${MOUNTPOINT} nebyl označen pro "
+"zformátování. Adresáře obsahující systémové soubory (/etc, /lib, /usr, /"
+"var, ...), které již existují na libovolném přípojném bodu, budou během "
+"instalace vymazány."
 
 #. Type: boolean
 #. Description
diff -Nru partman-target-64ubuntu5/debian/po/cy.po partman-target-64ubuntu6/debian/po/cy.po
--- partman-target-64ubuntu5/debian/po/cy.po	2009-08-25 12:27:03.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/cy.po	2010-02-02 23:36:39.000000000 +0000
@@ -277,7 +277,7 @@
 #. Description
 #: ../partman-target.templates:13001
 msgid "Failed to remove conflicting files"
-msgstr ""
+msgstr "Methwyd i dileu ffeiliau sy'n gwrthdaro"
 
 #. Type: error
 #. Description
@@ -286,18 +286,20 @@
 "The installer needs to remove operating system files from the install "
 "target, but was unable to do so.  The install cannot continue."
 msgstr ""
+"Mae'r sefydlydd angen dileu ffeiliau system gweithredu o'r targed sefydlu, "
+"on ni ellir gwneud hynni. Ni all y sefydlu parhau."
 
 #. Type: text
 #. Description
 #: ../partman-target.templates:14001
 msgid "Removing conflicting operating system files..."
-msgstr ""
+msgstr "Yn dileu ffeiliau system gweithredu sy'n gwrthdaro..."
 
 #. Type: boolean
 #. Description
 #: ../partman-target.templates:15001
 msgid "Do you want to return to the partitioner?"
-msgstr ""
+msgstr "Ydych chi'n eisiau dychwelyd i'r rhaniadydd?"
 
 #. Type: boolean
 #. Description
@@ -308,6 +310,10 @@
 "usr, /var, ...) that already exist under any defined mountpoint will be "
 "deleted during the install."
 msgstr ""
+"Nid yw'r system ffeiliau ar ${PARTITION} sydd wedi aseinio i ${MOUNTPOINT} "
+"heb gael ei nodi am formadu. Bydd cyfeirlyfrau sy'n cynnwys ffeiliau system "
+"(/etc, /lib, /usr, /var, ...) sy'n bodoli yn parod o dan unrhyw pwynt clymu "
+"sydd wedi diffinio yn gael ei dileu yn ystod y sefydliad."
 
 #. Type: boolean
 #. Description
@@ -315,3 +321,5 @@
 msgid ""
 "Please ensure that you have backed up any critical data before installing."
 msgstr ""
+"Gwnewch yn siwr fod gennych copi wrth-gefn o unrhyw data hanfodol cyn "
+"sefydlu."
diff -Nru partman-target-64ubuntu5/debian/po/et.po partman-target-64ubuntu6/debian/po/et.po
--- partman-target-64ubuntu5/debian/po/et.po	2009-08-25 12:27:43.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/et.po	2010-02-02 23:36:40.000000000 +0000
@@ -279,7 +279,7 @@
 #. Description
 #: ../partman-target.templates:13001
 msgid "Failed to remove conflicting files"
-msgstr ""
+msgstr "Segavate failide eemaldamine ebaõnnestus"
 
 #. Type: error
 #. Description
@@ -288,18 +288,19 @@
 "The installer needs to remove operating system files from the install "
 "target, but was unable to do so.  The install cannot continue."
 msgstr ""
+"Paigaldamine ebaõnnestus, sest segavate operatsioonisüsteemi failide "
+"eemaldamine ebaõnnestus. Paigaldusega ei saa edasi minna."
 
 #. Type: text
 #. Description
 #: ../partman-target.templates:14001
 msgid "Removing conflicting operating system files..."
-msgstr ""
+msgstr "Segavate operatsioonisüsteemi failide eemaldamine..."
 
 #. Type: boolean
 #. Description
 #: ../partman-target.templates:15001
 #, fuzzy
-#| msgid "Do you want to resume partitioning?"
 msgid "Do you want to return to the partitioner?"
 msgstr "Kas soovid partitsioneerimist jätkata?"
 
@@ -312,6 +313,10 @@
 "usr, /var, ...) that already exist under any defined mountpoint will be "
 "deleted during the install."
 msgstr ""
+"Partitsioonil ${PARTITION}  asuv failisüsteem, mis on haagitud kohta "
+"${MOUNTPOINT} ei ole märgitud vormindamiseks. Kataloogid, mis sisaldavad "
+"süsteemifaile (/etc, /lib, /usr, /var, ...), mis juba asuvad haakepunktis, "
+"kustutatakse paigalduse käigus."
 
 #. Type: boolean
 #. Description
@@ -319,3 +324,5 @@
 msgid ""
 "Please ensure that you have backed up any critical data before installing."
 msgstr ""
+"Palun kontrollige enne paigaldamist, et olete kõik olulised andmed "
+"varundanud."
diff -Nru partman-target-64ubuntu5/debian/po/kk.po partman-target-64ubuntu6/debian/po/kk.po
--- partman-target-64ubuntu5/debian/po/kk.po	2009-08-25 12:28:11.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/kk.po	2010-02-02 23:36:41.000000000 +0000
@@ -299,7 +299,6 @@
 #. Description
 #: ../partman-target.templates:15001
 #, fuzzy
-#| msgid "Do you want to resume partitioning?"
 msgid "Do you want to return to the partitioner?"
 msgstr "Бөлуді жалғастыру керек пе?"
 
diff -Nru partman-target-64ubuntu5/debian/po/lt.po partman-target-64ubuntu6/debian/po/lt.po
--- partman-target-64ubuntu5/debian/po/lt.po	2009-08-25 12:27:05.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/lt.po	2010-02-02 23:36:41.000000000 +0000
@@ -283,7 +283,7 @@
 #. Description
 #: ../partman-target.templates:13001
 msgid "Failed to remove conflicting files"
-msgstr ""
+msgstr "Nepavyko pašalinti konfliktuojančių failų"
 
 #. Type: error
 #. Description
@@ -300,7 +300,7 @@
 #. Description
 #: ../partman-target.templates:14001
 msgid "Removing conflicting operating system files..."
-msgstr ""
+msgstr "Šalinami konfliktuojantys operacinės sistemos failai..."
 
 #. Type: boolean
 #. Description
@@ -317,6 +317,10 @@
 "usr, /var, ...) that already exist under any defined mountpoint will be "
 "deleted during the install."
 msgstr ""
+"${PARTITION} skirsnyje esanti failų sistema, kuri bus prijungiama "
+"${MOUNTPOINT}, nebuvo pažymėta formatavimui. Įdiegimo metu bus ištrinti "
+"failai iš operacinės sistemos pagrindinių aplankų (/etc, /lib, /usr, /"
+"var, ...), kurie jau egzistuoja jūsų pasirinktuose įdiegimui skirsniuose."
 
 #. Type: boolean
 #. Description
diff -Nru partman-target-64ubuntu5/debian/po/nn.po partman-target-64ubuntu6/debian/po/nn.po
--- partman-target-64ubuntu5/debian/po/nn.po	2009-08-25 12:27:06.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/nn.po	2010-02-02 23:36:42.000000000 +0000
@@ -313,6 +313,10 @@
 "usr, /var, ...) that already exist under any defined mountpoint will be "
 "deleted during the install."
 msgstr ""
+"Filsystemet på ${PARTITION} som er tilordna ${MOUNTPOINT} er ikkje merka for "
+"formatering.  Katalogar som inneheld systemfiler (/etc, /lib, /usr, /"
+"var, ...) og som allereie finns under eit kva som helst angitt "
+"monteringspunkt, vil bli sletta under installasjonen."
 
 #. Type: boolean
 #. Description
diff -Nru partman-target-64ubuntu5/debian/po/sr.po partman-target-64ubuntu6/debian/po/sr.po
--- partman-target-64ubuntu5/debian/po/sr.po	2009-08-25 12:27:08.000000000 +0100
+++ partman-target-64ubuntu6/debian/po/sr.po	2010-02-02 23:36:42.000000000 +0000
@@ -278,7 +278,7 @@
 #. Description
 #: ../partman-target.templates:13001
 msgid "Failed to remove conflicting files"
-msgstr ""
+msgstr "Неуспело уклањање конфликтних фајлова"
 
 #. Type: error
 #. Description
@@ -287,12 +287,14 @@
 "The installer needs to remove operating system files from the install "
 "target, but was unable to do so.  The install cannot continue."
 msgstr ""
+"Инсталациони програм треба да уклони оперативни систем са циља инсталације, "
+"али није успео у томе. Инсталација не може да настави даље."
 
 #. Type: text
 #. Description
 #: ../partman-target.templates:14001
 msgid "Removing conflicting operating system files..."
-msgstr ""
+msgstr "Уклањање конфликтних фајлова оперативног система..."
 
 #. Type: boolean
 #. Description
@@ -309,6 +311,10 @@
 "usr, /var, ...) that already exist under any defined mountpoint will be "
 "deleted during the install."
 msgstr ""
+"Фајл систем на ${PARTITION} који је додељен ${MOUNTPOIINT} није означен за "
+"форматирање. Директоријуми који садрже системске фајлове (/etc, /lib, /usr, /"
+"var, ...) и који већ постоје под било којом дефинисаном тачком монтирања ће "
+"бити обрисани у току инсталације."
 
 #. Type: boolean
 #. Description
@@ -316,3 +322,4 @@
 msgid ""
 "Please ensure that you have backed up any critical data before installing."
 msgstr ""
+"Молим да проверите да ли сте сачували све важне податке пре инсталације."
diff -Nru partman-target-64ubuntu5/finish.d/fstab_removable_media_entries partman-target-64ubuntu6/finish.d/fstab_removable_media_entries
--- partman-target-64ubuntu5/finish.d/fstab_removable_media_entries	2009-07-16 21:15:33.000000000 +0100
+++ partman-target-64ubuntu6/finish.d/fstab_removable_media_entries	2010-02-02 20:27:35.000000000 +0000
@@ -48,32 +48,6 @@
 	done
 }
 
-CDDEV=$(grep /cdrom /proc/mounts | cut -d ' ' -f 1 | grep -v ^/dev/loop)
-if [ -n "$CDDEV" ]; then
-	MAPCDDEV=$(mapdevfs $CDDEV)
-else
-	MAPCDDEV=''
-fi
-
-CDDEVICES=''
-for dev in $(list-devices cd); do
-	mapdev=$(mapdevfs $dev)
-	if [ -n "$mapdev" ] && [ "$mapdev" != "$MAPCDDEV" ]; then
-		CDDEVICES="$CDDEVICES $mapdev"
-	fi
-done
-if [ -n "$MAPCDDEV" ]; then
-	CDDEVICES="$MAPCDDEV $CDDEVICES" # first the mounted cdrom
-fi
-
-populate_media cdrom udf,iso9660 user,noauto,exec,utf8 $CDDEVICES
-# Compatability link to keep things working; etch is not migrated away
-# entirely from /cdrom.
-if [ -n "$CDDEVICES" ]; then
-	rm_dir_or_link /target/cdrom
-	ln -s media/cdrom /target/cdrom
-fi
-
 FDDEVICES=''
 for dev in $(list-devices floppy); do
 	mapdev=$(mapdevfs $dev)
@@ -83,60 +57,3 @@
 done
 
 populate_media floppy auto rw,user,noauto,exec,utf8 $FDDEVICES
-
-# See if a usb storage device is plugged in right now. If so, assume it is
-# removable media unless the disk is already listed in the fstab.
-HD_MEDIA=$(grep /hd-media /proc/mounts | cut -d ' ' -f 1)
-if [ -n "$HD_MEDIA" ]; then
-	HD_MEDIA="$(mapdevfs $HD_MEDIA)"
-fi
-founddevs=
-if [ -d /sys/block ]; then
-	if type udevadm >/dev/null 2>&1; then
-		device_info () {
-			udevadm info "$@"
-		}
-	elif type udevinfo >/dev/null 2>&1; then
-		device_info () {
-			udevinfo "$@"
-		}
-	fi
-fi
-if type device_info >/dev/null 2>&1; then
-	disk_containing () {
-		dirname "$(device_info -q path -n "$1")"
-	}
-	partitions="$(list-devices partition)"
-	for dev in $partitions; do
-		if ! device_info -q env -n "$dev" | grep -q '^ID_BUS=usb$'; then
-			continue
-		fi
-		disk="$(disk_containing "$dev")"
-		for otherdev in $partitions; do
-			if [ "$(disk_containing "$otherdev")" = "$disk" ] && \
-			   grep -q "^$otherdev " /target/etc/fstab; then
-				continue 2
-			fi
-		done
-		mapdev="$(mapdevfs $dev)"
-		founddevs="${founddevs:+$founddevs }$mapdev"
-	done
-fi
-USBDEVICES=
-for dev in $founddevs; do
-	if [ -z "$USBDEVICES" ]; then
-		USBDEVICES="$dev"
-	else
-		if [ "$dev" != "$HD_MEDIA" ]; then
-			USBDEVICES="$USBDEVICES $dev"
-		else
-			# If installing from usb, list that device first
-			USBDEVICES="$dev $USBDEVICES"
-		fi
-	fi
-done
-
-# See https://launchpad.net/bugs/60552
-if [ "$USBDEVICES" ]; then
-	logger -t partman-target "USB automounting disabled (would have handled: $USBDEVICES)"
-fi
diff -Nru partman-target-64ubuntu5/finish-install.d/02remove_broken_cdrom partman-target-64ubuntu6/finish-install.d/02remove_broken_cdrom
--- partman-target-64ubuntu5/finish-install.d/02remove_broken_cdrom	2009-05-12 12:28:27.000000000 +0100
+++ partman-target-64ubuntu6/finish-install.d/02remove_broken_cdrom	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#!/bin/sh
-while read line; do
-	set -- $line
-        if echo "$2" | grep -qs "\(/cdrom\|/media/cdrom\)"; then
-                fs="$(block-attr --type "$1" || true)"
-                if [ -n "$fs" ] && [ "$fs" != "iso9660" ] && [ "$fs" != "udf" ]; then
-                        :
-                else
-                        echo "$line"
-                fi
-        else
-                echo "$line"
-        fi
-done < /target/etc/fstab > /target/etc/fstab.new
-mv /target/etc/fstab.new /target/etc/fstab